Commit Graph

1669 Commits

Author SHA1 Message Date
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 06bd6a7544 feat: base 调整项目可自定义配置精简settings.py 2024-03-17 22:06:52 +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 8a388928f0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-03-13 17:41:14 +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 a891692b71 feat: base 提供监测celery的实例 2024-03-13 17:37:46 +08:00
caoqianming 33a0ddad4c Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-03-12 18:41:58 +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 6589364eb4 fix: base 支持从request.data中获取page和page_size 2024-03-08 18:15:58 +08:00
caoqianming 2d5e06241d fix: base 支持从request.data中获取page和page_size 2024-03-08 18:14:15 +08:00
caoqianming 78306f7a29 feat: base complexserializer 非必填 2024-03-08 17:59:35 +08:00
caoqianming c159409c3a feat: base complexserializer支持传入page或自行在url中传page 2024-03-08 17:56:47 +08:00
caoqianming 87cd39ee89 feat: base 支持从request.data中获取page和page_size 2024-03-08 17:56:04 +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
caoqianming c1d5ef86f1 fix: correct_tuihuo_log矫正退火日志 2024-03-04 14:58:36 +08:00
caoqianming 5aab22e9d9 fix: 工段删除同时更新route 2024-03-04 14:22:22 +08:00
caoqianming e99854b56f fix: mlog填写时进行更进一步校验 2024-03-04 13:54:31 +08:00
caoqianming eecda9e5a6 fix: material导入可更改count_safe 2024-03-04 10:44:42 +08:00
caoqianming 70b5a4d87e fix: material unit 忽略大小写2 2024-03-04 10:37:33 +08:00
caoqianming 9cd5bfc8f9 fix: material unit 忽略大小写 2024-03-04 10:25:58 +08:00
caoqianming fcc613170e feat: 物料信息导入功能 2024-03-04 09:58:09 +08:00
caoqianming 1c802eafb1 fix: check_same_allow_minute_and_raise_event 判断错误 2024-03-02 09:47:53 +08:00
caoqianming 652ee31f6f fix: check_same_allow_minute_and_raise_event 判断错误 2024-03-02 09:41:47 +08:00