Commit Graph

Select branches

Hide Pull Requests

base

gzerp

master

2.6.2025031919

2.6.2025033109

2.6.2025040115

2.6.2025040211

2.6.2025040316

2.6.2025040710

2.6.2025040813

2.6.2025040913

2.6.2025041113

2.6.2025041613

2.6.2025042311

2.6.2025042816

2.6.2025043014

2.6.2025050816

2.6.2025051208

2.6.2025051609

2.6.2025051913

2.6.2025052615

2.6.2025060409

2.6.2025060617

2.6.2025060913

2.6.2025061715

2.6.2025062015

2.7.2025062414

2.7.2025070310

2.7.2025071516

2.7.2025073110

2.7.2025080409

2.7.2025080716

2.7.2025081813

2.7.2025082616

2.7.2025082816

2.8.2025090815

2.8.2025091616

2.8.2025092816

2.8.2025101011

3.0.2025110710

3.0.2025122514

3.0.2026010716

3.1.2026031316

Mono Color

• fa18fee720 feat：remove 碳排放强度计算和字段 zty 2025-01-21 09:40:52 +0800
• bec6600089 feat: enm/model 增加碳排放强度 和 碳排放量字段与 task 计算逻辑 zty 2025-01-21 09:24:58 +0800
• 4927afa9b7 feat: 工艺路线复制按钮 caoqianming 2025-01-20 15:43:04 +0800
• 688b3fc3d1 feat: ftest增加筛选条件 caoqianming 2025-01-20 13:51:13 +0800
• fd5747f99c feat: wpr change时变更defectbug caoqianming 2025-01-20 11:03:25 +0800
• 4b7ee277f1 feat: 撤回时部分恢复缺陷项 caoqianming 2025-01-20 10:55:10 +0800
• 50f19291a0 fix: mlog revert bug caoqianming 2025-01-20 10:45:10 +0800
• 1eb990d3d5 fix: mlogbw submit错误 caoqianming 2025-01-20 10:33:44 +0800
• f004417d49 fix: ftest增加defect_main的后续逻辑变更 bug caoqianming 2025-01-17 17:18:26 +0800
• 4699b31f83 feat: ftest增加defect_main的后续逻辑变更 caoqianming 2025-01-17 16:52:14 +0800
• 6737d3f0f4 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-17 16:38:28 +0800
• d9a5720cc6 feat: ftest添加主要缺陷字段 caoqianming 2025-01-17 16:38:15 +0800
• cd652f3696 feat:enm/service 修改translate_eval_formula zty 2025-01-17 16:08:27 +0800
• 805d4ac4fe fix: 切分融合的单件生成2 caoqianming 2025-01-17 15:42:24 +0800
• 5b7f8e1359 fix: 切分融合的单件生成 caoqianming 2025-01-17 14:54:09 +0800
• 713c51bdbd feat: 切分融合的单件生成 caoqianming 2025-01-17 14:45:31 +0800
• 6bcafcad3a fix: 变更单件产品的属性问题3 caoqianming 2025-01-17 10:19:58 +0800
• d653caed1d fix: 变更单件产品的属性问题2 caoqianming 2025-01-17 10:01:02 +0800
• 8b7887ec43 fix: 变更单件产品的属性问题 caoqianming 2025-01-17 09:57:53 +0800
• 7605574f37 fix: update_mb_item bug caoqianming 2025-01-17 09:29:33 +0800
• 7382eed0b6 fix: 修改mioitemw的外键名字 caoqianming 2025-01-17 08:58:44 +0800
• 31f2fdde84 fix: 采购入库支持检验3 caoqianming 2025-01-16 17:30:53 +0800
• 2f259bd5f3 feat: 采购入库支持检验2 caoqianming 2025-01-16 17:15:38 +0800
• 8bcd6b4f69 feat: 采购入库支持检验 caoqianming 2025-01-16 17:09:01 +0800
• adf3341f4b feat: testitem添加process查询条件 caoqianming 2025-01-16 15:27:47 +0800
• ae2ba421f8 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-16 15:01:02 +0800
• 13418e9b1a feat: ftest增加筛选mlogbw_ftest__wpr caoqianming 2025-01-16 15:00:42 +0800
• ae5cf55e9b Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-01-16 13:56:24 +0800
• b8b1167f17 feat: 增加氨水液位计 绑定字段up_down 计算方式 zty 2025-01-16 13:56:20 +0800
• 7efdc2c316 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-16 11:30:40 +0800
• 161d72094f feat: testitemserializer返回process_name caoqianming 2025-01-16 11:28:35 +0800
• 9c3cf5a534 feat: enm/service 修改传入公式，校正计算测点 zty 2025-01-16 11:18:36 +0800
• 0dbbc9beb2 feat: testitem增加type筛选条件 caoqianming 2025-01-16 10:34:42 +0800
• e59a5894f3 fix: mlogbin allow_empty caoqianming 2025-01-16 10:17:35 +0800
• baef2c586a feat: testitem支持操作项 caoqianming 2025-01-16 10:01:00 +0800
• 6ea24b6b1c feat: MlogbInSerializer wm_in allow_blank False caoqianming 2025-01-16 09:27:06 +0800
• 24bdb818a5 feat: 采购入库才可进行检验 caoqianming 2025-01-16 08:34:59 +0800
• 923ac2276c feat: 隐式物料不可出入库 caoqianming 2025-01-15 17:13:28 +0800
• a7b14994b7 feat: mioitemw添加ftest字段 caoqianming 2025-01-15 16:07:53 +0800
• 84e1aca814 feat: ftest增加type选项 caoqianming 2025-01-15 15:20:12 +0800
• a2a89a0785 feat: 增加mioitemw的update caoqianming 2025-01-15 15:02:19 +0800
• 5409f5d55d feat: mioitemw test caoqianming 2025-01-15 13:37:28 +0800
• 5b977d4cf9 fix: pmservice cal_real_task_count caoqianming 2025-01-14 12:37:42 +0800
• 620ed2e19e fix: mioserializer add mio_user caoqianming 2025-01-14 11:35:34 +0800
• 8d4d0f7cbc fix: mlogbw create时进行wpr的校验 caoqianming 2025-01-14 11:27:40 +0800
• f4f17fd2b8 fix: handover submit合并批次bug caoqianming 2025-01-14 08:52:16 +0800
• e76b3dcd69 fix: ftestwork submit wm需要扣减bug3 caoqianming 2025-01-14 08:36:48 +0800
• f9bd8a3607 fix: ftestwork submit wm需要扣减bug2 caoqianming 2025-01-13 18:04:18 +0800
• f84b8b33b8 fix: ftestwork submit wm需要扣减bug caoqianming 2025-01-13 17:41:59 +0800
• 582cf99a58 fix: ftestwork create bug ins caoqianming 2025-01-13 17:36:13 +0800
• a333810dd9 fix: handover create bug caoqianming 2025-01-13 17:34:10 +0800
• f68d498dd3 feat: handover submit支持合并为单个新批次 caoqianming 2025-01-13 17:26:41 +0800
• 77faee5d1a fix: qm cal_count bug caoqianming 2025-01-13 17:21:39 +0800
• ced8692585 feat: handoverserializer 优化 caoqianming 2025-01-13 16:12:18 +0800
• 0931835708 feat: wpr返回详情 caoqianming 2025-01-13 16:10:11 +0800
• fbd424fce9 feat: labelmat返回defect_name caoqianming 2025-01-13 14:58:36 +0800
• 045183301b feat: labelmat添加字段 caoqianming 2025-01-13 14:36:27 +0800
• 23b837c784 feat: festworkdefect submit操作 caoqianming 2025-01-13 14:05:00 +0800
• 14d785656d feat: ftestworkdefect同步数据库 caoqianming 2025-01-13 11:32:26 +0800
• 69daa63ea6 feat: ftestwork的submit支持defect caoqianming 2025-01-13 11:23:42 +0800
• 942e54a7e4 feat: ftestwork支持ftestworkdefect caoqianming 2025-01-13 09:39:18 +0800
• 58b3863763 feat: 删除次批时无需删除输出2 caoqianming 2025-01-10 16:00:36 +0800
• 79cb50709e feat: 删除次批时无需删除输出 caoqianming 2025-01-10 15:51:49 +0800
• 155f305071 feat: mlogbin 在merge时向下取整 caoqianming 2025-01-10 14:55:45 +0800
• 18f39bff9c feat: get_alldata_with_batch_and_store caoqianming 2025-01-10 14:41:56 +0800
• ee3dc6a5a2 feat: mlog revert bug caoqianming 2025-01-10 14:30:04 +0800
• 4b327c0575 feat: mlog撤回 caoqianming 2025-01-10 13:47:39 +0800
• 695590589e fix: 追踪到个的才需要赋予质检表 caoqianming 2025-01-10 11:27:08 +0800
• b8fd5fd13b feat: 追踪到个的才需要赋予质检表 caoqianming 2025-01-10 10:34:59 +0800
• c03129ae81 feat: Handover正常交接不支持不合格品 caoqianming 2025-01-10 09:40:51 +0800
• 2da98efca8 feat: wpr list 返回 defect详情 caoqianming 2025-01-10 09:20:41 +0800
• e77dee956f feat: FtestProcessSerializer 更严谨 caoqianming 2025-01-10 08:49:25 +0800
• 533e3e09dc feat: wmserializer返回defect_name caoqianming 2025-01-10 08:43:00 +0800
• 8d923255fd fix: mlog_submit提交的bug caoqianming 2025-01-09 18:14:36 +0800
• ce7183ff17 fix: 不支持消耗物料的检验 caoqianming 2025-01-09 17:02:30 +0800
• 0429ac6988 feat: mlogbin无需加载qct caoqianming 2025-01-09 16:56:01 +0800
• 4f1bbaa574 feat: mlogbin初始化质检表的bug caoqianming 2025-01-09 16:37:30 +0800
• 7a290f9af6 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server caoqianming 2025-01-09 16:27:35 +0800
• 88535650a7 fix: mlog submit中提交wprbug caoqianming 2025-01-09 16:27:12 +0800
• d1bd74fd5d Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-01-09 16:19:43 +0800
• d60cc99b48 feat: wpm/sflog 增加enstat 数据 zty 2025-01-09 16:19:39 +0800
• aca5cd8a63 fix: mlog submit defect_qs caoqianming 2025-01-09 15:57:23 +0800
• 56808f21ca feat: mlog删除时同步删除ftest2 caoqianming 2025-01-09 15:42:12 +0800
• f241194c40 feat: mlog删除时同步删除ftest caoqianming 2025-01-09 15:36:19 +0800
• 37cce1664b feat: mlog submit支持质检 caoqianming 2025-01-09 15:28:31 +0800
• 180724bee5 Merge remote-tracking branch 'origin/master' caoqianming 2025-01-09 14:17:07 +0800
• 5b0063e42d fix: mlogbin delete bug caoqianming 2025-01-09 14:14:32 +0800
• 4a3934b4fd Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server zty 2025-01-09 13:36:58 +0800
• 07c996964d feat: wpm/sflog 增加 enstat 数据 zty 2025-01-09 13:36:54 +0800
• 348464598e fix：MlogbwCreateUpdateSerializer bug3 caoqianming 2025-01-09 12:28:55 +0800
• 58aa629648 fix：MlogbwCreateUpdateSerializer bug3 caoqianming 2025-01-09 11:36:18 +0800
• ef4a31c3a5 fix：MlogbwCreateUpdateSerializer bug2 caoqianming 2025-01-09 11:25:52 +0800
• d33678a603 fix：MlogbwCreateUpdateSerializer bug caoqianming 2025-01-09 11:15:15 +0800
• 6fbe0a7b1c fix: mlogbw删除的bug caoqianming 2025-01-09 10:51:04 +0800
• 868b37559f fix: FtestProcessSerializer的bug caoqianming 2025-01-09 10:18:44 +0800
• 3c6aa3ea18 feat: 去除mlogbdefects2 caoqianming 2025-01-09 10:12:01 +0800
• 860e2157b1 feat: 去除mlogbdefects2 caoqianming 2025-01-09 10:09:48 +0800
• 3751b2f2e2 feat: 去除mlogbdefect caoqianming 2025-01-09 10:07:51 +0800
• f209d1767d feat: mlogbin也需要找寻质检表 caoqianming 2025-01-09 09:37:57 +0800
• bc44d0335a feat: mlogbin删除时需要删除子集ftest记录2 caoqianming 2025-01-09 09:03:32 +0800