Commit Graph

1730 Commits

Author SHA1 Message Date
caoqianming 196209d60c feat: 支持多种开停信号联动 2024-04-19 13:03:30 +08:00
caoqianming a8fb69d747 fix: 去除mpoint无用字段及相应逻辑变动 2024-04-18 15:01:18 +08:00
caoqianming aee63ef771 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-04-18 13:46:59 +08:00
caoqianming 17953a42aa style: 代码格式化 2024-04-18 13:46:58 +08:00
caoqianming f7d5375a5f fix: 优化物料批次导入 2024-04-17 22:46:05 +08:00
caoqianming 92bf0ac29e fix: enp drain2serializer sql查询优化 2024-04-17 11:18:15 +08:00
caoqianming fdc7ceff8d fix: 优化模拟数据生成generate_envdata 2024-04-16 15:23:27 +08:00
caoqianming ff035096e5 feat: update mplogx表结构 2024-04-16 15:11:40 +08:00
caoqianming dfaed5e5e5 feat: 采集逻辑整体重构 2024-04-16 15:03:59 +08:00
caoqianming 10632d9cae fix: 启动时无需缓存测点 2024-04-16 15:02:53 +08:00
caoqianming f9fc6f9d96 feat: equipment字段增加 2024-04-16 15:02:27 +08:00
caoqianming 86e9bf6776 feat: 设备运行状态改变触发函数 2024-04-16 15:02:07 +08:00
caoqianming e78511b556 style: 格式调整 2024-04-16 15:01:33 +08:00
caoqianming 640d1a1bce fix: 去除is_online字段引发的变动 2024-04-16 14:59:07 +08:00
caoqianming 6e84e70852 fix: 生成envdata数据2 2024-04-16 14:47:05 +08:00
caoqianming 67c0777fc9 fix: 生成envdata数据 2024-04-16 14:41:15 +08:00
caoqianming 153fca308e feat: base systemuser增加筛选条件 2024-04-12 16:43:48 +08:00
caoqianming 35387a8333 fix: envdata list filter bug 2024-04-12 16:38:24 +08:00
caoqianming 13c63a7aff feat: 调整独立运行的scripts的文件位置 2024-04-12 10:40:05 +08:00
caoqianming 2ea048cc53 fix: mqtt 包引入调整 2024-04-11 21:31:49 +08:00
caoqianming 3e75683ee1 fix: EnvDataSerializer round处理2 2024-04-11 16:59:18 +08:00
caoqianming 68933e3e16 fix: EnvDataSerializer round处理 2024-04-11 16:57:47 +08:00
caoqianming 99e4079c52 fix: equipment evdata add_info_for_list2 2024-04-11 16:38:24 +08:00
caoqianming d191a18f7b fix: equipment evdata add_info_for_list 2024-04-11 16:32:52 +08:00
caoqianming 0061285355 feat: 变更一下envdata表结构 2024-04-11 15:49:44 +08:00
caoqianming 74cbaa8497 refector: 修改函数名 2024-04-11 15:01:23 +08:00
caoqianming bd1897f6f6 feat: correct_material_cate 2024-04-11 11:29:21 +08:00
caoqianming 16417e0016 feat: 优化亚控测点批量存库及相应enm逻辑更改 2024-04-11 11:08:32 +08:00
caoqianming 6fde78574b fix: base period_dict错误修改 2024-04-11 10:59:13 +08:00
caoqianming 0fdb230822 feat: mplog视图层转mplogx 2024-04-11 10:58:33 +08:00
caoqianming 1139bb6119 feat: 优化make_sflog/get_sflog 2024-04-11 10:56:32 +08:00
caoqianming d8de59c3f2 feat: base 增加ctask_run将普通函数转celery执行 2024-04-11 10:53:39 +08:00
caoqianming 813301e7e1 feat: 变更mpoint字段 2024-04-11 10:52:13 +08:00
caoqianming 23eac91491 feat: enm启动时缓存测点 2024-04-11 10:47:06 +08:00
caoqianming 19f6e18154 feat: material的count改为对所有库存进行统计 2024-04-09 08:40:28 +08:00
caoqianming 9b2dbb8a01 feat: 增加矫正correct_material_count的task 2024-04-08 18:34:04 +08:00
caoqianming 8c798984f3 fix: correct_mb_count_notok 2024-04-08 17:08:08 +08:00
caoqianming fa3452088f fix: correct_mb_count_notok 2024-04-08 17:03:48 +08:00
caoqianming e8802c09b2 fix: 矫正mioitem count_notok错误的数据 2024-04-08 16:30:28 +08:00
caoqianming fe19847458 feat: mioitem增加扁不合格项字段 2024-04-08 13:53:12 +08:00
caoqianming 4f0ef8b4ac feat: kingclient兼容处理 2024-04-07 19:15:34 +08:00
caoqianming 3c1319d48f feat: material增加search字段 2024-04-07 19:15:10 +08:00
caoqianming 93022f7c40 feat: king_sync以d做name 2024-04-07 18:34:47 +08:00
caoqianming c6222c65f6 feat: 半成品检验有关库存消耗完的逻辑处理 2024-04-07 18:33:40 +08:00
caoqianming 29f085253c fix: MIOPurSerializer添加supplier 2024-04-07 15:18:41 +08:00
caoqianming 0cf9f14a5c fix: generate_envdata 优化 2024-04-04 01:03:06 +08:00
caoqianming 76f5d12b34 feat: envdata生成模拟数据 2024-04-03 16:45:33 +08:00
caoqianming 68fc7f4217 feat: 生产领料校验优化 2024-04-03 09:23:27 +08:00
caoqianming 0b193c6950 fix: correct_mb优化 2024-04-02 22:39:24 +08:00
caoqianming 2982bccf7f fix: 多了一次save调用 2024-04-02 17:22:56 +08:00
caoqianming 759bd3e149 feat: mio支持从明细批次号查询 2024-04-02 17:19:07 +08:00
caoqianming c5ae117436 feat: mioitem增加划伤字段 2024-04-02 17:11:02 +08:00
caoqianming 6254e251d3 feat: 生产领料半成品时需校验是否经过检验 2024-04-02 17:07:22 +08:00
caoqianming 462a25bb9a feat: 生产入库update_mb时记录production_dept 2024-04-02 16:46:13 +08:00
caoqianming aaa5545c30 feat: 增加correct_material_batch以矫正mb 2024-04-02 16:14:33 +08:00
caoqianming 3eb7b76095 fix: material create指定所到工序校验 2024-04-02 16:12:14 +08:00
caoqianming 5078a516d2 feat: mlog增加退火后碎字段 2024-04-02 15:44:19 +08:00
caoqianming c8bcbc62c3 feat: inm支持小数点后3位 2024-04-02 12:27:19 +08:00
caoqianming bec6644138 feat: enm mpoint增加third_info字段 2024-04-02 12:07:53 +08:00
caoqianming 2d8f546104 fix: cache_mpoints 标注错误 2024-04-02 11:40:46 +08:00
caoqianming 7d5b1223d5 feat: inm mioitem同步数据库 2024-04-02 11:40:07 +08:00
caoqianming 7e18ea572a feat: mioitem添加检验备注等字段 2024-04-02 10:21:22 +08:00
caoqianming 567c40e962 feat: 完善mqtt获取数据 2024-04-02 10:19:17 +08:00
caoqianming a104191341 feat: 从kioserver中获取数据 2024-04-02 10:18:42 +08:00
caoqianming 76ccb4dc55 feat: 性能测试提供search字段 2024-04-01 14:43:22 +08:00
caoqianming 7604ee9af3 feat: 更改供应商部分字段可不填 2024-03-29 09:44:47 +08:00
caoqianming 356ef262de feat: mpoint增加interval字段 2024-03-22 18:22:06 +08:00
caoqianming 4d524e3bf8 refector: mqtt优化 2024-03-22 18:21:41 +08:00
caoqianming 33dba0a30e refector: 重构一点third中的三方client代码 2024-03-22 15:30:00 +08:00
caoqianming 0e0262d170 feat: mioitem添加js,qx字段 2024-03-22 14:57:06 +08:00
caoqianming a737343d3a feat: 添加亚控restful接口 2024-03-21 18:44:02 +08:00
caoqianming 6e4298873f feat: 增加周预估消耗量字段 2024-03-20 17:39:44 +08:00
caoqianming fd8040b20e feat: bi exec 默认raise_exception 2024-03-20 15:24:22 +08:00
caoqianming de0b1ade8d refector: dataset list 排序 2024-03-19 17:13:02 +08:00
caoqianming bff47cbac3 feat: 优化dataset exec 2024-03-19 13:23:10 +08:00
caoqianming f548785014 fix: dataset exec query update逻辑变化 2024-03-19 13:15:41 +08:00
caoqianming d05ee1595c feat: bi dataset 表增加字段 2024-03-19 11:30:20 +08:00
caoqianming eaf1a5671f fix: 用于correct utask错误数据 2024-03-18 16:29:53 +08:00
caoqianming f456c7cbc8 fix: mtask_submit后不更改utask状态的bug 2024-03-18 16:13:04 +08:00
caoqianming 37d8baa875 fix: opeation filter暂不支持cates多对多in 2024-03-18 10:43:17 +08:00
caoqianming 370ae64299 feat: 添加mqtt脚本并增加require 2024-03-17 22:14:23 +08:00
caoqianming 077707f493 fix: celeryinfo取值错误 2024-03-15 16:41:13 +08:00
caoqianming c0567f5a55 feat: 返回redis和celery的一些监控数据 2024-03-15 16:01:26 +08:00
caoqianming 966edbacd4 feat: 添加celery监控信息2 2024-03-13 17:41:16 +08:00
caoqianming 0af253fb0b feat: 添加celery监控信息 2024-03-13 17:39:45 +08:00
caoqianming 718f594a4b feat: 添加是否新能源字段 2024-03-13 17:39:23 +08:00
caoqianming 38b7d0c586 feat: time_20_y 改为6点半 2024-03-11 15:38:09 +08:00
caoqianming a32cefb939 feat: operationlist增加筛选条件 2024-03-11 09:04:10 +08:00
caoqianming 7eba5a8e13 feat: base 从request.data获取page和size 2024-03-11 08:45:21 +08:00
caoqianming 779488589a fix: handover_submit针对混料特殊处理的bug3 2024-03-06 22:24:11 +08:00
caoqianming 2addfc8433 fix: handover_submit针对混料特殊处理的bug2 2024-03-06 21:52:55 +08:00
caoqianming 3ddb050330 fix: handover_submit针对混料特殊处理的bug 2024-03-06 21:45:17 +08:00
caoqianming b429ad9059 fix: 废弃一些接口 2024-03-06 18:01:24 +08:00
caoqianming 8a32690395 feat: handoverserializer返回更多数据 2024-03-06 17:44:50 +08:00
caoqianming abdee3d2d5 feat: 增加wmaterial查询条件 2024-03-06 17:21:48 +08:00
caoqianming 4c3610ac25 feat: 混料支持车间库存 2024-03-06 17:07:51 +08:00
caoqianming f6db92f815 feat: 增加wmaterial查询条件 2024-03-06 15:50:29 +08:00
caoqianming 02344da862 feat: 增加equipment设备类型 2024-03-06 09:53:16 +08:00
caoqianming 0de0489272 feat: 增加箱中破不合格字段 2024-03-05 10:11:33 +08:00
caoqianming 5c0c016872 fix: correct_tuihuo_log矫正退火日志2 2024-03-04 15:50:49 +08:00