caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								849e63da3e
								
							
						 | 
						
							
							
								
								feat: 尝试从个号追踪到历史记录的个号
							
							
							
							
							
						 | 
						
							2025-04-28 13:48:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								76a48d46ee
								
							
						 | 
						
							
							
								
								feat: 个到批时支持若是一个还是沿用原有批号
							
							
							
							
							
						 | 
						
							2025-04-28 11:28:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								76adab1571
								
							
						 | 
						
							
							
								
								feat: 批次追踪链条还是可以复用批次
							
							
							
							
							
						 | 
						
							2025-04-28 11:08:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9d634940d3
								
							
						 | 
						
							
							
								
								feat: mlog结合工序支持批到个
							
							
							
							
							
						 | 
						
							2025-04-28 10:24:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cd0045c561
								
							
						 | 
						
							
							
								
								feat: mlogbw支持批量创建
							
							
							
							
							
						 | 
						
							2025-04-27 14:12:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8a83f8b7d8
								
							
						 | 
						
							
							
								
								fix: cal_count_notok锁定mlogb以防止并发修改
							
							
							
							
							
						 | 
						
							2025-04-27 13:41:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2ca9b3ce02
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-04-27 12:17:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8697288d69
								
							
						 | 
						
							
							
								
								feat: mlogbwcreate校验增加wm所属
							
							
							
							
							
						 | 
						
							2025-04-27 12:17:13 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								89c8cac7c1
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-04-27 09:21:23 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0277ad9a6
								
							
						 | 
						
							
							
								
								feat: ichat 修改LLM 的接口
							
							
							
							
							
						 | 
						
							2025-04-27 09:21:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								139aa6de27
								
							
						 | 
						
							
							
								
								feat: wmaterial筛选条件优化来料已完成
							
							
							
							
							
						 | 
						
							2025-04-26 00:07:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cdb9083def
								
							
						 | 
						
							
							
								
								fix: batchst恢复成batch单一校验
							
							
							
							
							
						 | 
						
							2025-04-25 23:41:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c8d05bed68
								
							
						 | 
						
							
							
								
								feat: 获取该批次的dag数据需要传入version
							
							
							
							
							
						 | 
						
							2025-04-25 21:35:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								be57fec29f
								
							
						 | 
						
							
							
								
								fix: 获取batchst时默认使用version=1
							
							
							
							
							
						 | 
						
							2025-04-25 16:27:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d6fe5af39c
								
							
						 | 
						
							
							
								
								feat: 单填写mlog支持返工
							
							
							
							
							
						 | 
						
							2025-04-25 15:24:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6033216869
								
							
						 | 
						
							
							
								
								fix: mloginit在返工时不接收route
							
							
							
							
							
						 | 
						
							2025-04-25 14:21:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								439bfeb7d6
								
							
						 | 
						
							
							
								
								fix: 返工校验输入物料选择错误
							
							
							
							
							
						 | 
						
							2025-04-25 11:27:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								84380931fd
								
							
						 | 
						
							
							
								
								fix: 完善负数校验2
							
							
							
							
							
						 | 
						
							2025-04-24 16:12:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ca7d56a462
								
							
						 | 
						
							
							
								
								fix: 完善负数校验
							
							
							
							
							
						 | 
						
							2025-04-24 16:07:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9df6294617
								
							
						 | 
						
							
							
								
								feat: mlogbupdate支持变更批号
							
							
							
							
							
						 | 
						
							2025-04-24 13:44:30 +08:00 | 
						
					
				
					
						
							
							
								
								 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 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a8f9676ed0
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch_and_store时保存json数据采用DjangoJSONEncoder以处理decimal
							
							
							
							
							
						 | 
						
							2025-04-03 08:34:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2923fad2a8
								
							
						 | 
						
							
							
								
								feat: HTML_BASE_URL 前缀统一修改
							
							
							
							
							
						 | 
						
							2025-04-02 11:04:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c05c59b004
								
							
						 | 
						
							
							
								
								feat: handover数据库变动/初步更新批次数据关系链
							
							
							
							
							
						 | 
						
							2025-03-31 16:42:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb28f1d9ef
								
							
						 | 
						
							
							
								
								feat: 添加mio,mlog,handover关于batch的查询条件
							
							
							
							
							
						 | 
						
							2025-03-31 15:35:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								146fe6641f
								
							
						 | 
						
							
							
								
								feat: get_batch_dag节点排序改动
							
							
							
							
							
						 | 
						
							2025-03-31 15:11:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3c0e416735
								
							
						 | 
						
							
							
								
								feat: 支持退料交接
							
							
							
							
							
						 | 
						
							2025-03-31 14:17:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								88da422f54
								
							
						 | 
						
							
							
								
								feat: mlogchangeserializer增加生产设备选择
							
							
							
							
							
						 | 
						
							2025-03-31 13:36:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73f0e504c9
								
							
						 | 
						
							
							
								
								feat: batchst g_create 默认relation_type
							
							
							
							
							
						 | 
						
							2025-03-28 08:28:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c002017a84
								
							
						 | 
						
							
							
								
								feat: 工艺路线支持子图逻辑
							
							
							
							
							
						 | 
						
							2025-03-27 12:40:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eaa5d75b99
								
							
						 | 
						
							
							
								
								feat: 工艺路线校验
							
							
							
							
							
						 | 
						
							2025-03-26 16:36:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4e7757f64d
								
							
						 | 
						
							
							
								
								feat: 合批时的物料校验
							
							
							
							
							
						 | 
						
							2025-03-26 13:30:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0ddc6692ac
								
							
						 | 
						
							
							
								
								feat: handover 合并可指定现有库存
							
							
							
							
							
						 | 
						
							2025-03-26 13:19:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8bf3ad06d6
								
							
						 | 
						
							
							
								
								feat: mlog get_queryset bug
							
							
							
							
							
						 | 
						
							2025-03-25 15:40:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								546b020dae
								
							
						 | 
						
							
							
								
								feat: mloguserserializer handle_user_name
							
							
							
							
							
						 | 
						
							2025-03-25 14:59:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0e8cce0669
								
							
						 | 
						
							
							
								
								feat: get_batch_dag bug2
							
							
							
							
							
						 | 
						
							2025-03-25 09:54:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								11d7e1a772
								
							
						 | 
						
							
							
								
								feat: get_batch_dag bug
							
							
							
							
							
						 | 
						
							2025-03-25 09:51:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								52b96dc740
								
							
						 | 
						
							
							
								
								fix: batchst g_create bug
							
							
							
							
							
						 | 
						
							2025-03-25 09:48:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6f28056ed4
								
							
						 | 
						
							
							
								
								feat: 重构以下batchlog
							
							
							
							
							
						 | 
						
							2025-03-25 09:44:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b9a3427162
								
							
						 | 
						
							
							
								
								feat: batchst添加查询条件
							
							
							
							
							
						 | 
						
							2025-03-24 15:18:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d4df340c1c
								
							
						 | 
						
							
							
								
								feat: batchst添加字段以追踪material_start
							
							
							
							
							
						 | 
						
							2025-03-24 15:16:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b070b312a8
								
							
						 | 
						
							
							
								
								feat: batchst添加字段以追踪
							
							
							
							
							
						 | 
						
							2025-03-24 15:07:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e07f9c877c
								
							
						 | 
						
							
							
								
								feat: 添加mloguser字段及逻辑
							
							
							
							
							
						 | 
						
							2025-03-24 14:37:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1a4edf9e5
								
							
						 | 
						
							
							
								
								fix: handover 创建并提交的接口
							
							
							
							
							
						 | 
						
							2025-03-24 09:02:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								468cb7b658
								
							
						 | 
						
							
							
								
								feat: handover 创建并提交的接口
							
							
							
							
							
						 | 
						
							2025-03-24 08:42:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5ee10e7cc5
								
							
						 | 
						
							
							
								
								fix: handover 合批时创建关系链的bug
							
							
							
							
							
						 | 
						
							2025-03-24 08:41:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f57604492b
								
							
						 | 
						
							
							
								
								fix: batchst create bug
							
							
							
							
							
						 | 
						
							2025-03-21 17:54:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								108116342e
								
							
						 | 
						
							
							
								
								feat: batchlog数据链
							
							
							
							
							
						 | 
						
							2025-03-21 14:15:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5e3069b147
								
							
						 | 
						
							
							
								
								feat: mlog count_fields 可不带count_ok_full
							
							
							
							
							
						 | 
						
							2025-03-20 09:51:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fa66a9a4d5
								
							
						 | 
						
							
							
								
								fix: wmaterial search bug
							
							
							
							
							
						 | 
						
							2025-03-20 09:38:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ad7acafc9
								
							
						 | 
						
							
							
								
								fix: wmaterial search bug3
							
							
							
							
							
						 | 
						
							2025-03-20 09:37:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cde3d68d7f
								
							
						 | 
						
							
							
								
								fix: wmaterial search bug2
							
							
							
							
							
						 | 
						
							2025-03-20 09:34:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d136f96bcc
								
							
						 | 
						
							
							
								
								fix: wmaterial search bug
							
							
							
							
							
						 | 
						
							2025-03-20 09:33:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								48988d3237
								
							
						 | 
						
							
							
								
								fix: wmaterial 去除 material__process__exclude 字段
							
							
							
							
							
						 | 
						
							2025-03-20 09:09:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a0084f7825
								
							
						 | 
						
							
							
								
								feat: mgroup增加自产和外协字段及相关逻辑校验
							
							
							
							
							
						 | 
						
							2025-03-19 14:32:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								459fc3bbe8
								
							
						 | 
						
							
							
								
								feat: mgroup增加自产和外协字段及相关逻辑
							
							
							
							
							
						 | 
						
							2025-03-19 14:27:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1040e55a48
								
							
						 | 
						
							
							
								
								feat: wpr增加wpr_from的相关逻辑
							
							
							
							
							
						 | 
						
							2025-03-19 14:08:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da084e21cb
								
							
						 | 
						
							
							
								
								feat: wmaterial增加来源批次和物料
							
							
							
							
							
						 | 
						
							2025-03-19 13:35:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								982fa7f373
								
							
						 | 
						
							
							
								
								fix: mlogbupdate serializer
							
							
							
							
							
						 | 
						
							2025-03-18 14:35:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								70c415aa1f
								
							
						 | 
						
							
							
								
								feat: mlogbinserializer update也进行支持
							
							
							
							
							
						 | 
						
							2025-03-18 13:58:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								232ecb0f45
								
							
						 | 
						
							
							
								
								fix: MlogbSerializer mlog字段只读
							
							
							
							
							
						 | 
						
							2025-03-18 10:47:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6d6e4e88ae
								
							
						 | 
						
							
							
								
								fix: MlogbSerializer mlog字段取消
							
							
							
							
							
						 | 
						
							2025-03-18 10:36:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f7e3e7977d
								
							
						 | 
						
							
							
								
								feat: mlogb增加count_json
							
							
							
							
							
						 | 
						
							2025-03-18 10:30:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								53a3105f10
								
							
						 | 
						
							
							
								
								fix: 转成 小数后的to_representation bug
							
							
							
							
							
						 | 
						
							2025-03-17 10:33:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5bda6adf92
								
							
						 | 
						
							
							
								
								fix: mlogdefect 非必填
							
							
							
							
							
						 | 
						
							2025-03-17 10:06:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								10a5d3301e
								
							
						 | 
						
							
							
								
								feat: 日志变更模型以支持小数
							
							
							
							
							
						 | 
						
							2025-03-17 09:55:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								443a818aec
								
							
						 | 
						
							
							
								
								feat: 一次填写的也mlogb_from
							
							
							
							
							
						 | 
						
							2025-03-14 18:14:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8f079c9d5d
								
							
						 | 
						
							
							
								
								feat: 通过is_fix支持ftestwork转mlog
							
							
							
							
							
						 | 
						
							2025-03-14 17:07:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9489f80b3f
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug9
							
							
							
							
							
						 | 
						
							2025-03-14 16:32:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								42f5c20f86
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug8
							
							
							
							
							
						 | 
						
							2025-03-14 16:32:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								099fe4b18b
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug7
							
							
							
							
							
						 | 
						
							2025-03-14 16:10:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a66d47ec47
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug6
							
							
							
							
							
						 | 
						
							2025-03-14 16:06:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c8cde0a436
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug5
							
							
							
							
							
						 | 
						
							2025-03-14 16:01:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fa9c9182b
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug4
							
							
							
							
							
						 | 
						
							2025-03-14 15:35:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								82b4f39fed
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug3
							
							
							
							
							
						 | 
						
							2025-03-14 15:28:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								60a7827e1b
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug2
							
							
							
							
							
						 | 
						
							2025-03-14 15:20:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5ba937ecd8
								
							
						 | 
						
							
							
								
								fix: 个到个的拆分bug
							
							
							
							
							
						 | 
						
							2025-03-14 14:29:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7488900ac8
								
							
						 | 
						
							
							
								
								feat: mlogbw destory bug
							
							
							
							
							
						 | 
						
							2025-03-14 13:17:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b067ec2ea7
								
							
						 | 
						
							
							
								
								fix: handover validate handoverbw的bug
							
							
							
							
							
						 | 
						
							2025-03-14 09:57:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f58b84a4ee
								
							
						 | 
						
							
							
								
								feat: 物料编号允许非不同物料的重复
							
							
							
							
							
						 | 
						
							2025-03-13 17:37:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dafdb8f608
								
							
						 | 
						
							
							
								
								fix: 调整数据结构4
							
							
							
							
							
						 | 
						
							2025-03-13 17:13:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ef752cb05
								
							
						 | 
						
							
							
								
								fix: 调整数据结构3
							
							
							
							
							
						 | 
						
							2025-03-13 17:11:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a350d97202
								
							
						 | 
						
							
							
								
								fix: 调整数据结构2
							
							
							
							
							
						 | 
						
							2025-03-13 16:58:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ed80edbef8
								
							
						 | 
						
							
							
								
								fix: 调整数据结构
							
							
							
							
							
						 | 
						
							2025-03-13 16:46:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								38dc9199e2
								
							
						 | 
						
							
							
								
								feat: 调整数据结构
							
							
							
							
							
						 | 
						
							2025-03-13 16:33:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f43726a884
								
							
						 | 
						
							
							
								
								fix: mlogbin 删除时未对应删除mlogbout的bug
							
							
							
							
							
						 | 
						
							2025-03-13 12:48:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7cca8b7277
								
							
						 | 
						
							
							
								
								fix: handover需要进行3层校验
							
							
							
							
							
						 | 
						
							2025-03-13 12:02:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								31ef257a60
								
							
						 | 
						
							
							
								
								feat: attrs["count"] = len(attrs["handoverb"])
							
							
							
							
							
						 | 
						
							2025-03-13 10:58:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								64ca8b97ad
								
							
						 | 
						
							
							
								
								fix: mlogbw删除bug2
							
							
							
							
							
						 | 
						
							2025-03-12 14:55:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8bd3e120df
								
							
						 | 
						
							
							
								
								fix: mlogbw删除bug
							
							
							
							
							
						 | 
						
							2025-03-12 14:53:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e52b894603
								
							
						 | 
						
							
							
								
								fix: mlogbw delete bug3
							
							
							
							
							
						 | 
						
							2025-03-12 14:28:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								459d2348d4
								
							
						 | 
						
							
							
								
								fix: mlogbw delete bug2
							
							
							
							
							
						 | 
						
							2025-03-12 14:24:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d847b84fd8
								
							
						 | 
						
							
							
								
								fix: mlogbw delete bug
							
							
							
							
							
						 | 
						
							2025-03-12 14:21:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90e0e7ad3b
								
							
						 | 
						
							
							
								
								fix: mlogbin delete数据
							
							
							
							
							
						 | 
						
							2025-03-12 14:10:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d67c06e63
								
							
						 | 
						
							
							
								
								feat: 生成产出出错2的bug
							
							
							
							
							
						 | 
						
							2025-03-12 13:34:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								378648436f
								
							
						 | 
						
							
							
								
								fix: 生成产出出错3的bug
							
							
							
							
							
						 | 
						
							2025-03-12 11:22:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5a05710ff2
								
							
						 | 
						
							
							
								
								feat: 增加mlogbw_to以进行追踪
							
							
							
							
							
						 | 
						
							2025-03-12 09:23:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5bd17c4a37
								
							
						 | 
						
							
							
								
								feat: mio自动生成编号
							
							
							
							
							
						 | 
						
							2025-03-11 12:40:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f59cb2cbc2
								
							
						 | 
						
							
							
								
								feat: 个拆批2
							
							
							
							
							
						 | 
						
							2025-03-10 17:58:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								75ec24702c
								
							
						 | 
						
							
							
								
								feat: 个拆批
							
							
							
							
							
						 | 
						
							2025-03-10 17:48:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8f46507a6b
								
							
						 | 
						
							
							
								
								feat: mlogbin时从单个拆分为多个批次2
							
							
							
							
							
						 | 
						
							2025-03-10 16:03:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								85cc38c842
								
							
						 | 
						
							
							
								
								feat: mlogbin时从单个拆分为多个批次
							
							
							
							
							
						 | 
						
							2025-03-10 16:00:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f295956c69
								
							
						 | 
						
							
							
								
								fix: mlogbw cal_count_notok
							
							
							
							
							
						 | 
						
							2025-03-10 11:29:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fbb18ae990
								
							
						 | 
						
							
							
								
								feat: 部分bug修复
							
							
							
							
							
						 | 
						
							2025-03-09 11:36:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb45e0bab1
								
							
						 | 
						
							
							
								
								feat: 子任务可为空以及一些查询条件
							
							
							
							
							
						 | 
						
							2025-03-07 13:00:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								25d63c0b27
								
							
						 | 
						
							
							
								
								feat: fmlog update 更新是否可用字段
							
							
							
							
							
						 | 
						
							2025-03-07 11:00:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								456f05a83e
								
							
						 | 
						
							
							
								
								feat: 针对加工前不良的处理2
							
							
							
							
							
						 | 
						
							2025-03-07 10:42:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								330d44e2a3
								
							
						 | 
						
							
							
								
								feat: 优化一下mlogbdefect的代码结构
							
							
							
							
							
						 | 
						
							2025-03-07 10:09:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8a715ed136
								
							
						 | 
						
							
							
								
								feat: wpm revert支持加工强不良
							
							
							
							
							
						 | 
						
							2025-03-07 09:20:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								925bc2027c
								
							
						 | 
						
							
							
								
								feat: mlogb_submit支持加工前不良
							
							
							
							
							
						 | 
						
							2025-03-07 08:51:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2a9bd7ef6a
								
							
						 | 
						
							
							
								
								feat: mlogbdefect defect可为空代表合格品
							
							
							
							
							
						 | 
						
							2025-03-07 08:51:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1844fa7228
								
							
						 | 
						
							
							
								
								feat: mlogb添加字段
							
							
							
							
							
						 | 
						
							2025-03-06 19:00:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e2fbc63293
								
							
						 | 
						
							
							
								
								feat: 支持传入加工前不良的数据
							
							
							
							
							
						 | 
						
							2025-03-06 18:51:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73b3ab9377
								
							
						 | 
						
							
							
								
								feat: handover增加筛选条件
							
							
							
							
							
						 | 
						
							2025-03-06 16:36:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f7843621df
								
							
						 | 
						
							
							
								
								feat: wm 增加 来料/完成 筛选
							
							
							
							
							
						 | 
						
							2025-03-06 16:15:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74f0db77ed
								
							
						 | 
						
							
							
								
								feat: Handoverb 支持拆批
							
							
							
							
							
						 | 
						
							2025-03-06 14:15:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afdcc5374e
								
							
						 | 
						
							
							
								
								feat: 添加wmaterial检索字段
							
							
							
							
							
						 | 
						
							2025-03-06 09:02:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								33957216cd
								
							
						 | 
						
							
							
								
								feat: handover recive user可为空
							
							
							
							
							
						 | 
						
							2025-03-06 09:01:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								deb50efba1
								
							
						 | 
						
							
							
								
								feat: 添加wmaterial筛选条件
							
							
							
							
							
						 | 
						
							2025-03-06 09:01:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								df427d60b2
								
							
						 | 
						
							
							
								
								fix: mlog ftestwork submit关于合格b类的调整
							
							
							
							
							
						 | 
						
							2025-03-04 15:45:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aa32047bf7
								
							
						 | 
						
							
							
								
								fix: 一些bug调整
							
							
							
							
							
						 | 
						
							2025-03-04 12:33:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								46d586430e
								
							
						 | 
						
							
							
								
								fix: FmlogViewSet test
							
							
							
							
							
						 | 
						
							2025-03-03 19:09:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eca0f26623
								
							
						 | 
						
							
							
								
								fix: bulk create bug
							
							
							
							
							
						 | 
						
							2025-03-03 19:05:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07f60a1a29
								
							
						 | 
						
							
							
								
								feat: mlogbdefect返回defect_okcate
							
							
							
							
							
						 | 
						
							2025-03-03 19:00:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								de27865a3b
								
							
						 | 
						
							
							
								
								fix: swagger bug
							
							
							
							
							
						 | 
						
							2025-03-03 18:29:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9907bf7c43
								
							
						 | 
						
							
							
								
								feat: mlog填写支持defect定义
							
							
							
							
							
						 | 
						
							2025-03-03 18:21:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7e40596665
								
							
						 | 
						
							
							
								
								fix: mlogbupdate bug
							
							
							
							
							
						 | 
						
							2025-03-03 15:47:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								666fbd306b
								
							
						 | 
						
							
							
								
								fix: 获取qct提出到model
							
							
							
							
							
						 | 
						
							2025-03-03 15:13:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bbed6fa646
								
							
						 | 
						
							
							
								
								feat: mlogbdefect添加字段floor
							
							
							
							
							
						 | 
						
							2025-03-03 14:50:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ad6670a90
								
							
						 | 
						
							
							
								
								feat: mlogbdetail 增加返回mlogbdefect
							
							
							
							
							
						 | 
						
							2025-02-28 17:06:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7c7dcee194
								
							
						 | 
						
							
							
								
								fix: cal_count_notok bug2
							
							
							
							
							
						 | 
						
							2025-02-28 16:57:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2311e1773f
								
							
						 | 
						
							
							
								
								fix: cal_count_notok bug
							
							
							
							
							
						 | 
						
							2025-02-28 16:49:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								278e55c08a
								
							
						 | 
						
							
							
								
								fix: cal_count_notok 是一个类方法
							
							
							
							
							
						 | 
						
							2025-02-28 16:39:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12416a4f61
								
							
						 | 
						
							
							
								
								fix: mlogbw create bug2
							
							
							
							
							
						 | 
						
							2025-02-28 16:30:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9eb3abefc4
								
							
						 | 
						
							
							
								
								fix: mlogbw create bug
							
							
							
							
							
						 | 
						
							2025-02-28 16:27:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a2fb5598f8
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch 除0bug
							
							
							
							
							
						 | 
						
							2025-02-28 16:23:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								31e8b92d29
								
							
						 | 
						
							
							
								
								feat: mlogbin create时处理qct
							
							
							
							
							
						 | 
						
							2025-02-28 15:50:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c5bcfb4e53
								
							
						 | 
						
							
							
								
								feat: mlogboutupdate兼容性处理
							
							
							
							
							
						 | 
						
							2025-02-28 15:38:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								286a5306e3
								
							
						 | 
						
							
							
								
								feat: 批次处理做兼容性处理
							
							
							
							
							
						 | 
						
							2025-02-28 15:31:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								77f7a454a1
								
							
						 | 
						
							
							
								
								feat: mlogbw变更出发mlogbdefect
							
							
							
							
							
						 | 
						
							2025-02-28 11:28:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fb7fbb7388
								
							
						 | 
						
							
							
								
								fix: drf swagger bug
							
							
							
							
							
						 | 
						
							2025-02-28 09:41:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1bddfaa920
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch bug
							
							
							
							
							
						 | 
						
							2025-02-28 09:18:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b2f801deda
								
							
						 | 
						
							
							
								
								feat: 添加mlogbdefect
							
							
							
							
							
						 | 
						
							2025-02-28 09:14:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								39eef7d2b4
								
							
						 | 
						
							
							
								
								fix: material_out.tracking的比较bug
							
							
							
							
							
						 | 
						
							2025-02-26 12:07:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c71bb0d8f6
								
							
						 | 
						
							
							
								
								fix: 不能删除该产出明细更新限制条件
							
							
							
							
							
						 | 
						
							2025-02-26 11:27:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2010078665
								
							
						 | 
						
							
							
								
								perf: 优化mlog list速度3
							
							
							
							
							
						 | 
						
							2025-02-25 17:33:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4e6aa547b5
								
							
						 | 
						
							
							
								
								perf: 优化mlog list速度2
							
							
							
							
							
						 | 
						
							2025-02-25 17:30:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6653befcdb
								
							
						 | 
						
							
							
								
								perf: 优化mlog list速度
							
							
							
							
							
						 | 
						
							2025-02-25 16:33:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								32ba222523
								
							
						 | 
						
							
							
								
								fix: mlog_submit process获取bug
							
							
							
							
							
						 | 
						
							2025-02-24 17:29:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								63004f81ca
								
							
						 | 
						
							
							
								
								fix: mlog_submit tracking获取方式
							
							
							
							
							
						 | 
						
							2025-02-24 17:21:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								14cad30b2e
								
							
						 | 
						
							
							
								
								fix: mlog_submit is_fix bug
							
							
							
							
							
						 | 
						
							2025-02-24 17:14:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								debf07a7b9
								
							
						 | 
						
							
							
								
								feat: mlogbdetail 返回时携带tracking
							
							
							
							
							
						 | 
						
							2025-02-24 16:20:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e8ca4a14d
								
							
						 | 
						
							
							
								
								fix: mlogbin perform_create处理返工的bug
							
							
							
							
							
						 | 
						
							2025-02-24 16:12:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2941ebd7d6
								
							
						 | 
						
							
							
								
								fix: mlogbinserializer处理返工的错误
							
							
							
							
							
						 | 
						
							2025-02-24 16:06:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2663f20953
								
							
						 | 
						
							
							
								
								feat: 返修逻辑完成
							
							
							
							
							
						 | 
						
							2025-02-24 13:22:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								553fbcc826
								
							
						 | 
						
							
							
								
								feat: labelmat和wpr都加上返修Enum
							
							
							
							
							
						 | 
						
							2025-02-24 10:26:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0c5cc55b54
								
							
						 | 
						
							
							
								
								feat: 用于返修的mlog
							
							
							
							
							
						 | 
						
							2025-02-24 09:39:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74a7025f6c
								
							
						 | 
						
							
							
								
								feat: wm_in 在mlogbin时必填
							
							
							
							
							
						 | 
						
							2025-02-20 17:02:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c585f2fc11
								
							
						 | 
						
							
							
								
								feat: mlogbin支持mtask非必填
							
							
							
							
							
						 | 
						
							2025-02-19 14:29:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f741eda285
								
							
						 | 
						
							
							
								
								feat: 七车间入库_仓库执行人 remove None
							
							
							
							
							
						 | 
						
							2025-02-18 17:45:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b062d7ef6b
								
							
						 | 
						
							
							
								
								fix: cal_material_count 挪到单独文件里
							
							
							
							
							
						 | 
						
							2025-02-18 11:03:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								edac22b701
								
							
						 | 
						
							
							
								
								feat: cal_material_count 改为同步执行
							
							
							
							
							
						 | 
						
							2025-02-18 10:51:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b3d060b25a
								
							
						 | 
						
							
							
								
								feat: cal_material_count_from_mlog
							
							
							
							
							
						 | 
						
							2025-02-18 10:42:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								855ca9b054
								
							
						 | 
						
							
							
								
								feat: wpm和wpmw表添加doc2
							
							
							
							
							
						 | 
						
							2025-02-17 16:57:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								89642fb194
								
							
						 | 
						
							
							
								
								feat: wpm和wpmw表添加doc
							
							
							
							
							
						 | 
						
							2025-02-17 16:17:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8cbb921969
								
							
						 | 
						
							
							
								
								feat: 光子棒管综合统计添加数据
							
							
							
							
							
						 | 
						
							2025-02-17 11:24:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								861bb03469
								
							
						 | 
						
							
							
								
								feat: wpmw添加字段
							
							
							
							
							
						 | 
						
							2025-02-12 15:10:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac41f5a105
								
							
						 | 
						
							
							
								
								fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据
							
							
							
							
							
						 | 
						
							2025-02-11 14:40:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								44486b64a3
								
							
						 | 
						
							
							
								
								feat: mlogbw的输出不允许删除
							
							
							
							
							
						 | 
						
							2025-02-11 11:12:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8c0a9b420
								
							
						 | 
						
							
							
								
								fix: 车间执行人和仓库人问题
							
							
							
							
							
						 | 
						
							2025-02-10 15:57:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ff4bdf027f
								
							
						 | 
						
							
							
								
								fix: equip_last_mlog 添加运行状态
							
							
							
							
							
						 | 
						
							2025-02-08 10:53:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5b7b1bf276
								
							
						 | 
						
							
							
								
								fix: 获取可交接到的工段进行去重
							
							
							
							
							
						 | 
						
							2025-02-08 09:45:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								550a3281bc
								
							
						 | 
						
							
							
								
								fix: 获取可交接到的工段2
							
							
							
							
							
						 | 
						
							2025-02-07 13:34:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2488e500ce
								
							
						 | 
						
							
							
								
								fix: 获取可交接到的工段
							
							
							
							
							
						 | 
						
							2025-02-07 10:12:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b96846d2c0
								
							
						 | 
						
							
							
								
								feat: 获取可交接到的工段
							
							
							
							
							
						 | 
						
							2025-02-07 10:04:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								622d594795
								
							
						 | 
						
							
							
								
								feat: 优化mloginit报错提示
							
							
							
							
							
						 | 
						
							2025-02-06 16:56:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								821b88eb90
								
							
						 | 
						
							
							
								
								feat: handover submit支持改版
							
							
							
							
							
						 | 
						
							2025-02-05 10:55:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8a2e409c8a
								
							
						 | 
						
							
							
								
								feat: 增加改版交接类型
							
							
							
							
							
						 | 
						
							2025-02-05 09:54:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								89449eb7c6
								
							
						 | 
						
							
							
								
								feat: mlogbin 只校验主批是否重复
							
							
							
							
							
						 | 
						
							2025-01-22 10:14:49 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								4699b31f83
								
							
						 | 
						
							
							
								
								feat: ftest增加defect_main的后续逻辑变更
							
							
							
							
							
						 | 
						
							2025-01-17 16:52:14 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								d653caed1d
								
							
						 | 
						
							
							
								
								fix: 变更单件产品的属性问题2
							
							
							
							
							
						 | 
						
							2025-01-17 10:01:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8b7887ec43
								
							
						 | 
						
							
							
								
								fix: 变更单件产品的属性问题
							
							
							
							
							
						 | 
						
							2025-01-17 09:57:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e59a5894f3
								
							
						 | 
						
							
							
								
								fix: mlogbin allow_empty
							
							
							
							
							
						 | 
						
							2025-01-16 10:17:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ea24b6b1c
								
							
						 | 
						
							
							
								
								feat: MlogbInSerializer wm_in allow_blank False
							
							
							
							
							
						 | 
						
							2025-01-16 09:27:06 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								ced8692585
								
							
						 | 
						
							
							
								
								feat: handoverserializer 优化
							
							
							
							
							
						 | 
						
							2025-01-13 16:12:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								23b837c784
								
							
						 | 
						
							
							
								
								feat: festworkdefect submit操作
							
							
							
							
							
						 | 
						
							2025-01-13 14:05:00 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								8eddeb4f70
								
							
						 | 
						
							
							
								
								fix: mlogb质检
							
							
							
							
							
						 | 
						
							2025-01-08 10:29:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95b98df8cf
								
							
						 | 
						
							
							
								
								fix: mlogb找寻质检表
							
							
							
							
							
						 | 
						
							2025-01-07 15:41:04 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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
							
						 | 
						
							
							
							
							
							
								
							
							
								437501b668
								
							
						 | 
						
							
							
								
								feat: mioitemw等增加wpr字段
							
							
							
							
							
						 | 
						
							2025-01-03 16:53:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d0d5ebcd0
								
							
						 | 
						
							
							
								
								fix: 主要是wpmw change_or_new的修正
							
							
							
							
							
						 | 
						
							2025-01-03 14:37:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cd6e78961b
								
							
						 | 
						
							
							
								
								fix: def cal_mlogb_count bug
							
							
							
							
							
						 | 
						
							2025-01-02 17:14:56 +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 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba41228d69
								
							
						 | 
						
							
							
								
								fix: 生产提交支持单个物料
							
							
							
							
							
						 | 
						
							2025-01-02 14:01:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								def67ebac5
								
							
						 | 
						
							
							
								
								fix: base 添加wpmw并支持出入库提交
							
							
							
							
							
						 | 
						
							2025-01-02 10:32:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1fd76611b6
								
							
						 | 
						
							
							
								
								fix: make_sflogs if start_time的bug
							
							
							
							
							
						 | 
						
							2024-12-29 00:34:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afc910a805
								
							
						 | 
						
							
							
								
								fix: make_sflogs bug
							
							
							
							
							
						 | 
						
							2024-12-27 15:29:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cc8d9b1bf4
								
							
						 | 
						
							
							
								
								feat: enm/service 修改 service
							
							
							
							
							
						 | 
						
							2024-12-27 14:42:10 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c08dff56bf
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-12-18 14:16:14 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								0df2506f26
								
							
						 | 
						
							
							
								
								feat: 修改 enm/qua_data 排序问题
							
							
							
							
							
						 | 
						
							2024-12-18 14:16:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d2d74ee80
								
							
						 | 
						
							
							
								
								feat: 日志操作时对有ticket的进行处理
							
							
							
							
							
						 | 
						
							2024-12-17 13:37:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd644a527
								
							
						 | 
						
							
							
								
								fix: 日志撤销的同时将任务变更状态
							
							
							
							
							
						 | 
						
							2024-12-16 13:06:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc70177bb
								
							
						 | 
						
							
							
								
								fix: sflog work_date 默认start_time.date
							
							
							
							
							
						 | 
						
							2024-12-13 17:32:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ecf61706a
								
							
						 | 
						
							
							
								
								feat: 优化cal_exp_duration_sec
							
							
							
							
							
						 | 
						
							2024-12-11 18:16:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								41b27c0113
								
							
						 | 
						
							
							
								
								feat: sflog save 保存team leader
							
							
							
							
							
						 | 
						
							2024-12-11 13:03:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								13639568b1
								
							
						 | 
						
							
							
								
								feat: 回退make_sflogs中start_time缺班bug
							
							
							
							
							
						 | 
						
							2024-12-11 12:58:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6815babe0f
								
							
						 | 
						
							
							
								
								feat: get_team_x bug
							
							
							
							
							
						 | 
						
							2024-12-11 12:45:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								44af9bc494
								
							
						 | 
						
							
							
								
								feat : 修改排班规则
							
							
							
							
							
						 | 
						
							2024-12-11 12:18:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e0915676e3
								
							
						 | 
						
							
							
								
								feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。
							
							
							
							
							
						 | 
						
							2024-12-09 09:46:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6da1b14e7b
								
							
						 | 
						
							
							
								
								feat: stlog部分字段设置为非必填
							
							
							
							
							
						 | 
						
							2024-12-06 17:59:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								152b0b5a3a
								
							
						 | 
						
							
							
								
								feat: 忽略10s内的停机
							
							
							
							
							
						 | 
						
							2024-12-06 17:24:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								17622f230e
								
							
						 | 
						
							
							
								
								feat: 根据排班规则填入班组
							
							
							
							
							
						 | 
						
							2024-12-05 18:59:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4c732894df
								
							
						 | 
						
							
							
								
								feat: wpm 排班修改
							
							
							
							
							
						 | 
						
							2024-12-05 18:19:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								918df6b345
								
							
						 | 
						
							
							
								
								feat: 新增tkx 测点 聚合
							
							
							
							
							
						 | 
						
							2024-12-05 15:22:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5e9ebcdd36
								
							
						 | 
						
							
							
								
								feat: 产品规格还需在管料退火处处理
							
							
							
							
							
						 | 
						
							2024-12-04 13:04:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7ce9ed5a19
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch hanle_user bug
							
							
							
							
							
						 | 
						
							2024-12-04 12:42:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								784500bf5b
								
							
						 | 
						
							
							
								
								feat: get_alldata_with_batch 其他入库也需要记录产品规格
							
							
							
							
							
						 | 
						
							2024-12-04 12:37:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a69f718859
								
							
						 | 
						
							
							
								
								feat: mlog 支持handle_user 默认create_by
							
							
							
							
							
						 | 
						
							2024-12-04 12:22:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5533cc6967
								
							
						 | 
						
							
							
								
								fix: get_alldata_with_batch 加入检验备注统计
							
							
							
							
							
						 | 
						
							2024-12-04 11:18:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ffd7bc13b0
								
							
						 | 
						
							
							
								
								feat: get_alldata_with_batch 加入检验备注统计
							
							
							
							
							
						 | 
						
							2024-12-04 11:00:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bcbaba330d
								
							
						 | 
						
							
							
								
								feat: batchst增加batch__startswith__in筛选条件
							
							
							
							
							
						 | 
						
							2024-12-04 10:16:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b93c4bddeb
								
							
						 | 
						
							
							
								
								feat: 触发批次分析统计
							
							
							
							
							
						 | 
						
							2024-12-03 18:07:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67be714355
								
							
						 | 
						
							
							
								
								fix: 完善get_alldata_with_batch -改_
							
							
							
							
							
						 | 
						
							2024-12-03 11:41:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								91bc99a135
								
							
						 | 
						
							
							
								
								fix: 完善get_alldata_with_batch4
							
							
							
							
							
						 | 
						
							2024-12-03 11:13:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4253b39cc6
								
							
						 | 
						
							
							
								
								fix: 完善get_alldata_with_batch3
							
							
							
							
							
						 | 
						
							2024-12-03 11:06:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7e44cda500
								
							
						 | 
						
							
							
								
								fix: 完善get_alldata_with_batch
							
							
							
							
							
						 | 
						
							2024-12-03 11:02:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fb43bdde85
								
							
						 | 
						
							
							
								
								feat: 完善get_alldata_with_batch
							
							
							
							
							
						 | 
						
							2024-12-03 10:36:23 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0169d25ac
								
							
						 | 
						
							
							
								
								add : enm 增加峰谷平电量统计
							
							
							
							
							
						 | 
						
							2024-12-02 15:26:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d9a1512a92
								
							
						 | 
						
							
							
								
								feat: 定义batchst默认排序为batch
							
							
							
							
							
						 | 
						
							2024-12-02 14:33:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bc6baca698
								
							
						 | 
						
							
							
								
								fix: batchst last_time取用错误
							
							
							
							
							
						 | 
						
							2024-12-02 14:20:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								de6e5d315a
								
							
						 | 
						
							
							
								
								feat: 记录batchst 最后操作时间
							
							
							
							
							
						 | 
						
							2024-12-02 14:13:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								17697d6482
								
							
						 | 
						
							
							
								
								feat: 添加batchst路由
							
							
							
							
							
						 | 
						
							2024-12-02 13:39:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c3bd32ee68
								
							
						 | 
						
							
							
								
								feat: property改为classmethod
							
							
							
							
							
						 | 
						
							2024-12-02 13:13:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8435b35be6
								
							
						 | 
						
							
							
								
								feat: get_alldata_with_batch
							
							
							
							
							
						 | 
						
							2024-12-02 12:27:26 +08:00 |