Commit Graph

2460 Commits

Author SHA1 Message Date
caoqianming c8db1ad29b feat: base handle_parent报错调整 2024-08-15 15:53:42 +08:00
caoqianming 0aa0b051e9 fix: em ecate serializer 优化 2024-08-15 15:53:17 +08:00
caoqianming c71624def0 fix: em serializer 优化 2024-08-15 11:36:38 +08:00
caoqianming 3976e3834e Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 11:17:51 +08:00
caoqianming cb46d9bfc6 fix: ecate code 必填校验 2024-08-15 11:17:48 +08:00
zty 71dd916dbf Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 10:47:47 +08:00
zty 13fb91e83a fix:enm/service 修改稿last_val 2024-08-15 10:47:43 +08:00
caoqianming 7028fd31ee feat: wmaterial增加state字段并进行相应处理2 2024-08-15 10:43:45 +08:00
caoqianming ba6c30a745 feat: wmaterial增加state字段并进行相应处理 2024-08-15 10:41:36 +08:00
caoqianming 824dacf78d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-15 09:47:06 +08:00
caoqianming bcafe94e71 fix: base validate_password支持.号 2024-08-15 09:47:04 +08:00
zty f52b501aa1 feat : enm/service 增加测点采集系数 2024-08-15 09:19:19 +08:00
zty 29ba9647b4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-14 18:33:05 +08:00
zty 6a20445ddd fix : em/service 修改update_time 2024-08-14 18:33:01 +08:00
caoqianming 42769e3abe fix: mioitempurin bug 2024-08-14 18:17:31 +08:00
caoqianming db792a2de5 feat: ftestwork增加检验人及不合格项 2024-08-14 18:07:12 +08:00
caoqianming a9acf6d187 feat: 物料导入模板增加编号列 2024-08-14 17:42:27 +08:00
caoqianming 27c60ff973 feat: mio pur test 支持count_sampling自填 2024-08-13 17:28:39 +08:00
caoqianming 3bb3834c04 fix: miolist pu_order_number 2024-08-13 17:11:22 +08:00
caoqianming cc5dcc9685 fix: gen_material_out bug 2024-08-13 16:29:59 +08:00
caoqianming 58ddc8dd0b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-13 15:06:10 +08:00
caoqianming ad1d0680b1 feat: mlogbupdate 校验 2024-08-13 15:06:07 +08:00
zty 779bd763a1 fix : em/service 修改运行设备更新状态 根据最后一次时间修改 2024-08-13 15:00:09 +08:00
caoqianming bbac19c791 feat: notok option 其他 2024-08-13 14:47:26 +08:00
caoqianming bfad89bf2f feat: ftestwork_submit增加抽检逻辑 2024-08-13 14:31:38 +08:00
caoqianming 23dd745192 feat: ftestwork增加查询条件 2024-08-13 13:59:58 +08:00
caoqianming 0a0b6b72ba feat: ftestworkcreate type2处理 2024-08-13 13:42:00 +08:00
caoqianming 8e7e60c600 fix: ftestwork_submit bug2 2024-08-12 17:36:12 +08:00
caoqianming e6e4a61289 fix: ftestwork_submit bug 2024-08-12 17:31:19 +08:00
caoqianming 096ad540d4 feat: qm batch增加长度 2024-08-12 17:21:17 +08:00
caoqianming f6f84533d1 fix: notokoption 修改3 2024-08-12 17:18:09 +08:00
caoqianming 38f052c015 fix: notokoption 修改2 2024-08-12 17:15:23 +08:00
caoqianming cfbd79a206 fix: notokoption 修改 2024-08-12 17:12:22 +08:00
caoqianming 274a0df0eb feat: 检验工作增加查询条件 2024-08-12 16:57:22 +08:00
caoqianming b9dc211df3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-12 16:46:14 +08:00
caoqianming 5fc38eabaa fix: notokoption values 2024-08-12 16:46:12 +08:00
zty 7664dfefa4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-12 16:04:57 +08:00
zty 47acf9ceb4 fix: enm/service 修改service 2024-08-12 16:04:55 +08:00
caoqianming ba2368f59b feat: handover增加筛选条件 2024-08-12 15:05:47 +08:00
caoqianming c5dfb325dc feat: handover 增加查询条件 2024-08-12 14:39:44 +08:00
caoqianming 2108b1c33a feat: wmaterial增加查询条件 2024-08-12 14:35:33 +08:00
caoqianming 50c3efe39b feat: ftestwork提交并更新车间库存 2024-08-12 12:58:27 +08:00
caoqianming 5821b6b7df Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-12 11:07:31 +08:00
caoqianming 562372b0b9 feat: mlog添加不合格项目 2024-08-12 11:07:29 +08:00
zty 345588b611 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-12 10:32:39 +08:00
zty a6d5604acb fix: em.service.py 更改状态变动 2024-08-12 10:32:34 +08:00
caoqianming ae1099cbec fix: base wf 工段的字段获取处理人时没找到返回0 2024-08-09 15:19:21 +08:00
caoqianming 1a42cf34f0 feat: wmaterial增加count_xtest/handover增加检验交接 2024-08-09 15:09:26 +08:00
caoqianming a2b52e95a5 doc: drain view swagger 变动3 2024-08-08 15:07:05 +08:00
caoqianming fff6c76cc6 doc: drain view swagger 变动2 2024-08-08 15:03:15 +08:00