Commit Graph

2432 Commits

Author SHA1 Message Date
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
caoqianming 758d403f5d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-08 14:55:28 +08:00
caoqianming f1aa402383 doc: drain view swagger 变动 2024-08-08 14:55:26 +08:00
zty 169a31da5a fix : apps/em /enm 更改缓存存储 2024-08-08 14:52:36 +08:00
caoqianming e2c44f06c4 feat: drain serializer增加返回序列化 2024-08-08 14:45:40 +08:00
caoqianming 3f32390fb2 feat: 自动生成物料时延续cate 2024-08-08 09:12:46 +08:00
caoqianming 1781dba630 feat: 更改testitem field type 2024-08-07 15:43:28 +08:00
caoqianming c64387e5bc Merge branch 'erp1' 2024-08-07 15:26:49 +08:00
caoqianming 1418141a67 feat: ftestwork返回material_cate 2024-08-07 15:25:48 +08:00
caoqianming fe61081ec7 feat: ftestworkcreateupdate 支持更改 2024-08-07 14:52:53 +08:00
caoqianming 9136f7e87f feat: 增加material cate 接口 2024-08-07 14:52:10 +08:00
caoqianming ab9b1b7f27 feat: 增加testitem筛选条件 2024-08-07 14:51:57 +08:00
caoqianming 239f01a4ca feat: qm添加字段2 2024-08-07 14:51:42 +08:00
caoqianming b8dceb03a3 feat: qm添加字段 2024-08-07 14:51:30 +08:00
caoqianming 15043bbb49 feat: ftestworkcreateupdate 支持更改 2024-08-07 11:07:48 +08:00
caoqianming 211fd1ac77 feat: 增加material cate 接口 2024-08-07 10:54:00 +08:00
caoqianming cf7007f8b8 feat: 增加testitem筛选条件 2024-08-07 10:18:11 +08:00
caoqianming be8fbec24e feat: edu添加字段 2024-08-07 10:01:41 +08:00
caoqianming 632c36edd0 feat: qm添加字段2 2024-08-07 10:01:22 +08:00
caoqianming 8aabf1fca0 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-07 09:46:20 +08:00
caoqianming 549ef24c70 feat: qm添加字段 2024-08-07 09:46:17 +08:00
zty 6bdc5a04aa fix :enm service.py 修改缓存不存在直接返回 2024-08-07 09:30:56 +08:00
zty 314b614c53 fix: cal_exp_duration_sec 还需要更新时间为None3 2024-08-06 19:00:38 +08:00
zty 1fe8c7ae76 feat: cal_exp_duration_sec 还需要更新时间为None2 2024-08-06 18:43:20 +08:00
zty 5461fb5f55 feat: cal_exp_duration_sec 还需要更新时间为None的 2024-08-06 18:40:34 +08:00
zty f97c99bf8a fix: cal_mpointstat_hour对于is_unit的计算错误 2024-08-06 17:52:21 +08:00
zty 91e9ac38f6 fix: db_insert_mplogx_batch bug 2024-08-06 17:22:28 +08:00
zty 679165cbd0 feat: db_insert_mplogx 添加限制参数 2024-08-06 17:12:58 +08:00
zty a24666b795 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2024-08-06 16:11:32 +08:00