 caoqianming
|
1cb4128be2
|
fix: mlogbupdate时attrs遍历时修改的bug
|
2025-04-24 13:36:18 +08:00 |
|
caoqianming
|
0f728d8b29
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-24 09:18:05 +08:00 |
|
caoqianming
|
960787d7d8
|
feat: 6车间合格率统计decimal invalid
|
2025-04-24 09:18:03 +08:00 |
 zty
|
8183073026
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
合并
|
2025-04-23 16:49:00 +08:00 |
|
zty
|
b66157edb8
|
feat: model add note
|
2025-04-23 16:48:52 +08:00 |
|
caoqianming
|
dd4d958f86
|
fix: batchst的version字段bug
|
2025-04-23 13:02:11 +08:00 |
|
caoqianming
|
2987853afb
|
feat: 通过django settings延迟获取BASE_PROJECT_CODE
|
2025-04-23 12:42:50 +08:00 |
|
caoqianming
|
75503fc7e8
|
feat: 切分工序切分数量支持1
|
2025-04-23 10:59:59 +08:00 |
|
caoqianming
|
433d85456e
|
fix: mlog的need_inout逻辑3
|
2025-04-23 09:28:45 +08:00 |
|
caoqianming
|
32185abffd
|
fix: mlog的need_inout逻辑2
|
2025-04-22 16:33:52 +08:00 |
|
caoqianming
|
c2539185e2
|
feat: mlog增加team字段
|
2025-04-22 15:49:42 +08:00 |
|
caoqianming
|
3811c055f9
|
feat: mlog的need_inout逻辑
|
2025-04-22 15:27:02 +08:00 |
|
caoqianming
|
6e12ca3137
|
feat: 批次关系链时创建新批次支持使用已有批次号2
|
2025-04-22 14:30:19 +08:00 |
|
caoqianming
|
f22ba2752f
|
feat: 批次关系链时创建新批次支持使用已有批次号
|
2025-04-22 14:29:33 +08:00 |
|
caoqianming
|
ea00a38406
|
feat: mlogb返回test_user_name
|
2025-04-22 10:16:10 +08:00 |
|
caoqianming
|
3d0536745a
|
fix: count_working获取逻辑优化2
|
2025-04-22 09:56:23 +08:00 |
|
caoqianming
|
e329c8cbc8
|
fix: count_working获取逻辑优化
|
2025-04-22 09:34:34 +08:00 |
|
caoqianming
|
8ac3ad3477
|
feat: mlogb添加test_user/need_inout字段用于处理抽检逻辑
|
2025-04-22 09:19:19 +08:00 |
|
caoqianming
|
42c249330e
|
fix: mlogbin解决负值校验存在的bug
|
2025-04-22 09:14:11 +08:00 |
|
caoqianming
|
311e9e9e04
|
feat: 校验只有合并时才能提供新批次号
|
2025-04-22 08:43:05 +08:00 |
|
caoqianming
|
5cab0d018b
|
feat: 交接查询可查询子批次号
|
2025-04-21 16:27:31 +08:00 |
|
caoqianming
|
ced7515d80
|
feat: 日志完善负值校验
|
2025-04-21 15:43:54 +08:00 |
|
caoqianming
|
2ea3dc79cb
|
feat: 批号追加工段标识2
|
2025-04-21 13:22:39 +08:00 |
|
caoqianming
|
82587b1736
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-21 11:33:11 +08:00 |
|
caoqianming
|
786d178edc
|
feat: 批号追加工段标识
|
2025-04-21 11:32:57 +08:00 |
|
caoqianming
|
181d477425
|
fix: 日志和交接记录操作数正值校验
|
2025-04-19 23:40:42 +08:00 |
|
caoqianming
|
101a51050d
|
Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
|
2025-04-19 21:15:35 +08:00 |
|
caoqianming
|
9e4e5a28c6
|
fix:: 交接记录提交时校验count>0
|
2025-04-19 21:11:45 +08:00 |
|
caoqianming
|
00e352d8ef
|
feat: 改版交接需要触发统计数量
|
2025-04-18 14:52:03 +08:00 |
|
caoqianming
|
b44fec0695
|
feat: 合并的交接需要校验物料是否一致
|
2025-04-17 14:05:56 +08:00 |
|
caoqianming
|
6d904341a0
|
feat: 交接需要校验物料是否一致
|
2025-04-17 13:30:30 +08:00 |
|
caoqianming
|
369c452dd5
|
fix: 正常交接后的物料状态不变
|
2025-04-17 11:17:05 +08:00 |
|
caoqianming
|
fafe39c1bd
|
fix: 存在fmlog时将route带给mlog并进行物料校验
|
2025-04-17 11:16:40 +08:00 |
|
caoqianming
|
5f2385ccd1
|
fix: fmlog填写mtask或route即可
|
2025-04-17 09:06:34 +08:00 |
|
caoqianming
|
896be043f5
|
feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成
|
2025-04-16 19:14:18 +08:00 |
|
caoqianming
|
b5c21b7472
|
feat: fmlog添加工艺步骤字段及相应返回数据
|
2025-04-16 17:59:20 +08:00 |
|
caoqianming
|
300023ff81
|
fix: 交接分批bug/加工前不良的bug
|
2025-04-16 13:43:38 +08:00 |
|
caoqianming
|
e0217e86c4
|
feat: 添加count_json_from字段及相应逻辑
|
2025-04-16 11:31:23 +08:00 |
|
caoqianming
|
4c7f2b24f8
|
feat: 车间库存按任务筛选时count>0
|
2025-04-16 08:57:12 +08:00 |
|
caoqianming
|
c670bd69e1
|
feat: fmlog添加is_fix字段校验
|
2025-04-15 10:30:02 +08:00 |
|
caoqianming
|
cd294bc53c
|
fix: 返修交接后物料状态都变为返修品
|
2025-04-14 23:03:34 +08:00 |
|
caoqianming
|
88bf75baaf
|
feat: fmlog添加is_fix字段
|
2025-04-14 22:49:31 +08:00 |
|
caoqianming
|
1cbbade280
|
feat: 单个日志填写时带入wm_in的batch
|
2025-04-14 22:26:42 +08:00 |
|
caoqianming
|
c791bde5be
|
fix: handover拆批请选择车间库存2
|
2025-04-14 15:29:36 +08:00 |
|
caoqianming
|
22b6b1305f
|
fix: handover拆批请选择车间库存
|
2025-04-14 15:19:45 +08:00 |
|
caoqianming
|
fda9ecae94
|
fix: get_alldata_with_batch中小数计算异常捕获
|
2025-04-11 10:16:51 +08:00 |
|
caoqianming
|
4b87f6fe8e
|
Merge branch 'gzerp'
|
2025-04-09 15:30:58 +08:00 |
|
caoqianming
|
648aaa465c
|
fix: 光子综合查询对小数和None的处理
|
2025-04-09 15:30:17 +08:00 |
|
caoqianming
|
060c07abd7
|
fix: 来料加工和完成筛选完善
|
2025-04-09 13:19:12 +08:00 |
|
caoqianming
|
c0eacd7fa8
|
fix: decimal存入json字段时使用myjsondecoder
|
2025-04-09 13:18:42 +08:00 |