 caoqianming
|
3e93fce213
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-22 10:15:07 +08:00 |
|
caoqianming
|
89449eb7c6
|
feat: mlogbin 只校验主批是否重复
|
2025-01-22 10:14:49 +08:00 |
 zty
|
e0f7ce4636
|
feat: qm 合格率设置阈值
|
2025-01-21 15:15:24 +08:00 |
|
zty
|
4254e226d3
|
feat: enm/view 修改correct 增加不能校正当日或当月数据
|
2025-01-21 12:45:51 +08:00 |
|
zty
|
fa18fee720
|
feat：remove 碳排放强度计算和字段
|
2025-01-21 09:40:52 +08:00 |
|
zty
|
bec6600089
|
feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑
|
2025-01-21 09:24:58 +08:00 |
|
caoqianming
|
4927afa9b7
|
feat: 工艺路线复制按钮
|
2025-01-20 15:43:04 +08:00 |
|
caoqianming
|
688b3fc3d1
|
feat: ftest增加筛选条件
|
2025-01-20 13:51:13 +08:00 |
|
caoqianming
|
fd5747f99c
|
feat: wpr change时变更defectbug
|
2025-01-20 11:03:25 +08:00 |
|
caoqianming
|
4b7ee277f1
|
feat: 撤回时部分恢复缺陷项
|
2025-01-20 10:55:10 +08:00 |
|
caoqianming
|
50f19291a0
|
fix: mlog revert bug
|
2025-01-20 10:45:10 +08:00 |
|
caoqianming
|
1eb990d3d5
|
fix: mlogbw submit错误
|
2025-01-20 10:33:44 +08:00 |
|
caoqianming
|
f004417d49
|
fix: ftest增加defect_main的后续逻辑变更 bug
|
2025-01-17 17:18:26 +08:00 |
|
caoqianming
|
4699b31f83
|
feat: ftest增加defect_main的后续逻辑变更
|
2025-01-17 16:52:14 +08:00 |
|
caoqianming
|
6737d3f0f4
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-17 16:38:28 +08:00 |
|
caoqianming
|
d9a5720cc6
|
feat: ftest添加主要缺陷字段
|
2025-01-17 16:38:15 +08:00 |
|
zty
|
cd652f3696
|
feat:enm/service 修改translate_eval_formula
|
2025-01-17 16:08:27 +08:00 |
|
caoqianming
|
805d4ac4fe
|
fix: 切分融合的单件生成2
|
2025-01-17 15:42:24 +08:00 |
|
caoqianming
|
5b7f8e1359
|
fix: 切分融合的单件生成
|
2025-01-17 14:54:09 +08:00 |
|
caoqianming
|
713c51bdbd
|
feat: 切分融合的单件生成
|
2025-01-17 14:45:31 +08:00 |
|
caoqianming
|
6bcafcad3a
|
fix: 变更单件产品的属性问题3
|
2025-01-17 10:19:58 +08:00 |
|
caoqianming
|
d653caed1d
|
fix: 变更单件产品的属性问题2
|
2025-01-17 10:01:02 +08:00 |
|
caoqianming
|
8b7887ec43
|
fix: 变更单件产品的属性问题
|
2025-01-17 09:57:53 +08:00 |
|
caoqianming
|
7605574f37
|
fix: update_mb_item bug
|
2025-01-17 09:29:33 +08:00 |
|
caoqianming
|
7382eed0b6
|
fix: 修改mioitemw的外键名字
|
2025-01-17 08:58:44 +08:00 |
|
caoqianming
|
31f2fdde84
|
fix: 采购入库支持检验3
|
2025-01-16 17:30:53 +08:00 |
|
caoqianming
|
2f259bd5f3
|
feat: 采购入库支持检验2
|
2025-01-16 17:15:38 +08:00 |
|
caoqianming
|
8bcd6b4f69
|
feat: 采购入库支持检验
|
2025-01-16 17:09:01 +08:00 |
|
caoqianming
|
adf3341f4b
|
feat: testitem添加process查询条件
|
2025-01-16 15:27:47 +08:00 |
|
caoqianming
|
ae2ba421f8
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-16 15:01:02 +08:00 |
|
caoqianming
|
13418e9b1a
|
feat: ftest增加筛选mlogbw_ftest__wpr
|
2025-01-16 15:00:42 +08:00 |
|
zty
|
ae5cf55e9b
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-16 13:56:24 +08:00 |
|
zty
|
b8b1167f17
|
feat: 增加氨水液位计 绑定字段up_down 计算方式
|
2025-01-16 13:56:20 +08:00 |
|
caoqianming
|
7efdc2c316
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-16 11:30:40 +08:00 |
|
caoqianming
|
161d72094f
|
feat: testitemserializer返回process_name
|
2025-01-16 11:28:35 +08:00 |
|
zty
|
9c3cf5a534
|
feat: enm/service 修改传入公式，校正计算测点
|
2025-01-16 11:18:36 +08:00 |
|
caoqianming
|
0dbbc9beb2
|
feat: testitem增加type筛选条件
|
2025-01-16 10:34:42 +08:00 |
|
caoqianming
|
e59a5894f3
|
fix: mlogbin allow_empty
|
2025-01-16 10:17:35 +08:00 |
|
caoqianming
|
baef2c586a
|
feat: testitem支持操作项
|
2025-01-16 10:01:00 +08:00 |
|
caoqianming
|
6ea24b6b1c
|
feat: MlogbInSerializer wm_in allow_blank False
|
2025-01-16 09:27:06 +08:00 |
|
caoqianming
|
24bdb818a5
|
feat: 采购入库才可进行检验
|
2025-01-16 08:34:59 +08:00 |
|
caoqianming
|
923ac2276c
|
feat: 隐式物料不可出入库
|
2025-01-15 17:13:28 +08:00 |
|
caoqianming
|
a7b14994b7
|
feat: mioitemw添加ftest字段
|
2025-01-15 16:07:53 +08:00 |
|
caoqianming
|
84e1aca814
|
feat: ftest增加type选项
|
2025-01-15 15:20:12 +08:00 |
|
caoqianming
|
a2a89a0785
|
feat: 增加mioitemw的update
|
2025-01-15 15:02:19 +08:00 |
|
caoqianming
|
5409f5d55d
|
feat: mioitemw test
|
2025-01-15 13:37:28 +08:00 |
|
caoqianming
|
5b977d4cf9
|
fix: pmservice cal_real_task_count
|
2025-01-14 12:37:42 +08:00 |
|
caoqianming
|
620ed2e19e
|
fix: mioserializer add mio_user
|
2025-01-14 11:35:34 +08:00 |
|
caoqianming
|
8d4d0f7cbc
|
fix: mlogbw create时进行wpr的校验
|
2025-01-14 11:27:40 +08:00 |
|
caoqianming
|
f4f17fd2b8
|
fix: handover submit合并批次bug
|
2025-01-14 08:52:16 +08:00 |
|
caoqianming
|
e76b3dcd69
|
fix: ftestwork submit wm需要扣减bug3
|
2025-01-14 08:36:48 +08:00 |
|
caoqianming
|
f9bd8a3607
|
fix: ftestwork submit wm需要扣减bug2
|
2025-01-13 18:04:18 +08:00 |
|
caoqianming
|
f84b8b33b8
|
fix: ftestwork submit wm需要扣减bug
|
2025-01-13 17:41:59 +08:00 |
|
caoqianming
|
582cf99a58
|
fix: ftestwork create bug ins
|
2025-01-13 17:36:13 +08:00 |
|
caoqianming
|
a333810dd9
|
fix: handover create bug
|
2025-01-13 17:34:10 +08:00 |
|
caoqianming
|
f68d498dd3
|
feat: handover submit支持合并为单个新批次
|
2025-01-13 17:26:41 +08:00 |
|
caoqianming
|
77faee5d1a
|
fix: qm cal_count bug
|
2025-01-13 17:21:39 +08:00 |
|
caoqianming
|
ced8692585
|
feat: handoverserializer 优化
|
2025-01-13 16:12:18 +08:00 |
|
caoqianming
|
0931835708
|
feat: wpr返回详情
|
2025-01-13 16:10:11 +08:00 |
|
caoqianming
|
fbd424fce9
|
feat: labelmat返回defect_name
|
2025-01-13 14:58:36 +08:00 |
|
caoqianming
|
045183301b
|
feat: labelmat添加字段
|
2025-01-13 14:36:27 +08:00 |
|
caoqianming
|
23b837c784
|
feat: festworkdefect submit操作
|
2025-01-13 14:05:00 +08:00 |
|
caoqianming
|
14d785656d
|
feat: ftestworkdefect同步数据库
|
2025-01-13 11:32:26 +08:00 |
|
caoqianming
|
69daa63ea6
|
feat: ftestwork的submit支持defect
|
2025-01-13 11:23:42 +08:00 |
|
caoqianming
|
942e54a7e4
|
feat: ftestwork支持ftestworkdefect
|
2025-01-13 09:39:18 +08:00 |
|
caoqianming
|
58b3863763
|
feat: 删除次批时无需删除输出2
|
2025-01-10 16:00:36 +08:00 |
|
caoqianming
|
79cb50709e
|
feat: 删除次批时无需删除输出
|
2025-01-10 15:51:49 +08:00 |
|
caoqianming
|
155f305071
|
feat: mlogbin 在merge时向下取整
|
2025-01-10 14:55:45 +08:00 |
|
caoqianming
|
18f39bff9c
|
feat: get_alldata_with_batch_and_store
|
2025-01-10 14:41:56 +08:00 |
|
caoqianming
|
ee3dc6a5a2
|
feat: mlog revert bug
|
2025-01-10 14:30:04 +08:00 |
|
caoqianming
|
4b327c0575
|
feat: mlog撤回
|
2025-01-10 13:47:39 +08:00 |
|
caoqianming
|
695590589e
|
fix: 追踪到个的才需要赋予质检表
|
2025-01-10 11:27:08 +08:00 |
|
caoqianming
|
b8fd5fd13b
|
feat: 追踪到个的才需要赋予质检表
|
2025-01-10 10:34:59 +08:00 |
|
caoqianming
|
c03129ae81
|
feat: Handover正常交接不支持不合格品
|
2025-01-10 09:40:51 +08:00 |
|
caoqianming
|
2da98efca8
|
feat: wpr list 返回 defect详情
|
2025-01-10 09:20:41 +08:00 |
|
caoqianming
|
e77dee956f
|
feat: FtestProcessSerializer 更严谨
|
2025-01-10 08:49:25 +08:00 |
|
caoqianming
|
533e3e09dc
|
feat: wmserializer返回defect_name
|
2025-01-10 08:43:00 +08:00 |
|
caoqianming
|
8d923255fd
|
fix: mlog_submit提交的bug
|
2025-01-09 18:14:36 +08:00 |
|
caoqianming
|
ce7183ff17
|
fix: 不支持消耗物料的检验
|
2025-01-09 17:02:30 +08:00 |
|
caoqianming
|
0429ac6988
|
feat: mlogbin无需加载qct
|
2025-01-09 16:56:01 +08:00 |
|
caoqianming
|
4f1bbaa574
|
feat: mlogbin初始化质检表的bug
|
2025-01-09 16:37:30 +08:00 |
|
caoqianming
|
7a290f9af6
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 16:27:35 +08:00 |
|
caoqianming
|
88535650a7
|
fix: mlog submit中提交wprbug
|
2025-01-09 16:27:12 +08:00 |
|
zty
|
d1bd74fd5d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 16:19:43 +08:00 |
|
zty
|
d60cc99b48
|
feat: wpm/sflog 增加enstat 数据
|
2025-01-09 16:19:39 +08:00 |
|
caoqianming
|
aca5cd8a63
|
fix: mlog submit defect_qs
|
2025-01-09 15:57:23 +08:00 |
|
caoqianming
|
56808f21ca
|
feat: mlog删除时同步删除ftest2
|
2025-01-09 15:42:12 +08:00 |
|
caoqianming
|
f241194c40
|
feat: mlog删除时同步删除ftest
|
2025-01-09 15:36:19 +08:00 |
|
caoqianming
|
37cce1664b
|
feat: mlog submit支持质检
|
2025-01-09 15:28:31 +08:00 |
|
caoqianming
|
180724bee5
|
Merge remote-tracking branch 'origin/master'
|
2025-01-09 14:17:07 +08:00 |
|
caoqianming
|
5b0063e42d
|
fix: mlogbin delete bug
|
2025-01-09 14:14:32 +08:00 |
|
zty
|
4a3934b4fd
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-01-09 13:36:58 +08:00 |
|
zty
|
07c996964d
|
feat: wpm/sflog 增加 enstat 数据
|
2025-01-09 13:36:54 +08:00 |
|
caoqianming
|
348464598e
|
fix：MlogbwCreateUpdateSerializer bug3
|
2025-01-09 12:28:55 +08:00 |
|
caoqianming
|
58aa629648
|
fix：MlogbwCreateUpdateSerializer bug3
|
2025-01-09 11:36:18 +08:00 |
|
caoqianming
|
ef4a31c3a5
|
fix：MlogbwCreateUpdateSerializer bug2
|
2025-01-09 11:25:52 +08:00 |
|
caoqianming
|
d33678a603
|
fix：MlogbwCreateUpdateSerializer bug
|
2025-01-09 11:15:15 +08:00 |
|
caoqianming
|
6fbe0a7b1c
|
fix: mlogbw删除的bug
|
2025-01-09 10:51:04 +08:00 |
|
caoqianming
|
868b37559f
|
fix: FtestProcessSerializer的bug
|
2025-01-09 10:18:44 +08:00 |
|
caoqianming
|
3c6aa3ea18
|
feat: 去除mlogbdefects2
|
2025-01-09 10:12:01 +08:00 |
|
caoqianming
|
860e2157b1
|
feat: 去除mlogbdefects2
|
2025-01-09 10:09:48 +08:00 |
|
caoqianming
|
3751b2f2e2
|
feat: 去除mlogbdefect
|
2025-01-09 10:07:51 +08:00 |
|
caoqianming
|
f209d1767d
|
feat: mlogbin也需要找寻质检表
|
2025-01-09 09:37:57 +08:00 |
|
caoqianming
|
bc44d0335a
|
feat: mlogbin删除时需要删除子集ftest记录2
|
2025-01-09 09:03:32 +08:00 |
|
caoqianming
|
b20dee64df
|
feat: mlogbin删除时需要删除子集ftest记录
|
2025-01-09 08:58:24 +08:00 |
|
caoqianming
|
51123ee0c5
|
feat: mlogbw增加质检保存bug
|
2025-01-09 08:43:32 +08:00 |
|
caoqianming
|
a20b15abed
|
feat: mlogbw增加质检统计3
|
2025-01-08 16:43:47 +08:00 |
|
caoqianming
|
396fcdd7cc
|
feat: mlogbw增加质检统计2
|
2025-01-08 16:34:13 +08:00 |
|
caoqianming
|
5f88433a25
|
feat: mlogbw增加质检统计
|
2025-01-08 16:21:18 +08:00 |
|
caoqianming
|
2331bec13b
|
feat: 增加MlogbDefect以进行统计
|
2025-01-08 15:02:41 +08:00 |
|
caoqianming
|
22ff47a6ba
|
feat: init_by_qct
|
2025-01-08 12:17:59 +08:00 |
|
caoqianming
|
8eddeb4f70
|
fix: mlogb质检
|
2025-01-08 10:29:12 +08:00 |
|
caoqianming
|
95b98df8cf
|
fix: mlogb找寻质检表
|
2025-01-07 15:41:04 +08:00 |
|
caoqianming
|
38aa64df12
|
feat: 检测编号改为textfield
|
2025-01-07 15:37:14 +08:00 |
|
caoqianming
|
7c9feb23ac
|
feat: mlogb添加qct字段以便调用检验表
|
2025-01-07 15:29:19 +08:00 |
|
caoqianming
|
98f4af2f8c
|
fix: 如果是主要输入物料且是主批次，才需生成输出3
|
2025-01-07 14:38:34 +08:00 |
|
caoqianming
|
abd6ca53f1
|
feat: Mlogb返回增加树型结构
|
2025-01-07 14:31:10 +08:00 |
|
caoqianming
|
e333b84c1b
|
feat: Mlogb添加parent字段
|
2025-01-07 14:24:00 +08:00 |
|
caoqianming
|
d3a304b918
|
feat: Mlogb的排序
|
2025-01-07 14:08:32 +08:00 |
|
caoqianming
|
011df65e4c
|
fix: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 14:07:25 +08:00 |
|
caoqianming
|
c8594aaa99
|
feat: wm添加route查询条件
|
2025-01-07 13:52:31 +08:00 |
|
caoqianming
|
ccac1aea87
|
feat: 如果是主要输入物料且是主批次，才需生成输出2
|
2025-01-07 13:23:55 +08:00 |
|
caoqianming
|
0e428f6c9d
|
feat: 如果是主要输入物料且是主批次，才需生成输出
|
2025-01-07 11:10:07 +08:00 |
|
caoqianming
|
f8c72a1487
|
feat: 增加routemat表
|
2025-01-07 09:50:44 +08:00 |
|
caoqianming
|
3efeb746dc
|
feat: wprlist增加筛选条件
|
2025-01-07 08:38:47 +08:00 |
|
caoqianming
|
8afbc9a0b5
|
feat: wprlist默认排除已消耗的2
|
2025-01-06 17:08:48 +08:00 |
|
caoqianming
|
0673580d3b
|
feat: wprlist默认排除已消耗的
|
2025-01-06 17:06:00 +08:00 |
|
caoqianming
|
9f56968385
|
fix: change_or_new该物料编号已存在不可使用
|
2025-01-06 16:12:33 +08:00 |
|
caoqianming
|
561fb94930
|
fix: MlogbwCreateUpdateSerializer validate bug
|
2025-01-06 14:56:17 +08:00 |
|
caoqianming
|
afb3b23486
|
feat: mlogbin自动创建mlogbout数量2
|
2025-01-06 14:09:10 +08:00 |
|
caoqianming
|
b454972943
|
feat: mlogbin自动创建mlogbout数量
|
2025-01-06 13:46:23 +08:00 |
|
caoqianming
|
49d1b95968
|
feat: handoverbw的处理2
|
2025-01-06 11:34:03 +08:00 |
|
caoqianming
|
26c7652095
|
feat: handoverbw的处理
|
2025-01-06 11:02:08 +08:00 |
|
caoqianming
|
fc56ecea08
|
fix: mlogbin创建mlogbw的错误2
|
2025-01-06 10:40:33 +08:00 |
|
caoqianming
|
84723967dc
|
fix: mlogbin创建mlogbw的错误
|
2025-01-06 10:33:33 +08:00 |
|
caoqianming
|
d784ac8a3c
|
feat: 生产日志追踪到个完善
|
2025-01-06 10:23:51 +08:00 |
|
caoqianming
|
f8b056cadb
|
feat: mioitemw为1个时自动创建2
|
2025-01-03 17:50:05 +08:00 |
|
caoqianming
|
53f3f25030
|
feat: mioitemw为1个时自动创建
|
2025-01-03 17:46:18 +08:00 |
|
caoqianming
|
38978c9dea
|
feat: mioitem增加wm和mb字段
|
2025-01-03 17:33:08 +08:00 |
|
caoqianming
|
437501b668
|
feat: mioitemw等增加wpr字段
|
2025-01-03 16:53:42 +08:00 |
|
caoqianming
|
84525c03c8
|
feat: wpr增加返回信息及筛选条件
|
2025-01-03 15:39:13 +08:00 |
|
caoqianming
|
a151baaedd
|
feat: 增加清洗数据的接口
|
2025-01-03 15:21:16 +08:00 |
|
caoqianming
|
2790bddefa
|
feat: wpr注册到路由
|
2025-01-03 15:20:29 +08:00 |
|
caoqianming
|
86007d0ad4
|
fix: MIOItemwSerializer修改
|
2025-01-03 15:19:44 +08:00 |
|
caoqianming
|
8d0d5ebcd0
|
fix: 主要是wpmw change_or_new的修正
|
2025-01-03 14:37:57 +08:00 |
|
caoqianming
|
726946979c
|
Merge remote-tracking branch 'origin/master'
|
2025-01-02 17:16:16 +08:00 |
|
caoqianming
|
cd6e78961b
|
fix: def cal_mlogb_count bug
|
2025-01-02 17:14:56 +08:00 |
|
zty
|
f2e5ce1d8d
|
feat: enm 修改测点缓存 已存在
|
2025-01-02 16:33:27 +08:00 |
|
caoqianming
|
70e344ed68
|
feat: mlogrever支持单件回退
|
2025-01-02 16:29:09 +08:00 |
|
caoqianming
|
426be9d805
|
feat: 添加mlogbw接口
|
2025-01-02 15:36:55 +08:00 |