caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3683ddbdeb
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-06-20 11:11:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fec244765a
								
							
						 | 
						
							
							
								
								fix:  该交接单不支持撤销的bug
							
							
							
							
							
						 | 
						
							2025-06-20 11:11:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								6a5ec34ef8
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-06-20 09:44:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7942a5168b
								
							
						 | 
						
							
							
								
								fix: wpm/service 优化煤粉热值获取方式
							
							
							
							
							
						 | 
						
							2025-06-20 09:44:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								db2e8934ba
								
							
						 | 
						
							
							
								
								feat: 增加交接撤回功能
							
							
							
							
							
						 | 
						
							2025-06-19 17:25:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f08374ca6
								
							
						 | 
						
							
							
								
								feat: mlogbin的bug
							
							
							
							
							
						 | 
						
							2025-06-19 15:43:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a819566c23
								
							
						 | 
						
							
							
								
								fix: wmaterial添加can_handover字段
							
							
							
							
							
						 | 
						
							2025-06-18 10:56:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6af708d4f0
								
							
						 | 
						
							
							
								
								feat: wmaterial添加can_handover字段
							
							
							
							
							
						 | 
						
							2025-06-18 10:31:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d6f2bfd20
								
							
						 | 
						
							
							
								
								fix: mlogbinupdate时的bug
							
							
							
							
							
						 | 
						
							2025-06-17 08:36:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2b039dd4f7
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-06-16 17:43:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1366f432ee
								
							
						 | 
						
							
							
								
								feat: mlogbin的编辑与mlogbout的联动
							
							
							
							
							
						 | 
						
							2025-06-16 17:42:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								31421ca0aa
								
							
						 | 
						
							
							
								
								feat: mlogb首次创建需要更新count_ok_full
							
							
							
							
							
						 | 
						
							2025-06-15 22:19:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95b10371b9
								
							
						 | 
						
							
							
								
								feat: 支持从wpr处获取切片数4
							
							
							
							
							
						 | 
						
							2025-06-13 16:36:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a820d6803e
								
							
						 | 
						
							
							
								
								feat: 支持从wpr处获取切片数3
							
							
							
							
							
						 | 
						
							2025-06-13 16:25:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4955ad1f11
								
							
						 | 
						
							
							
								
								feat: 支持从wpr处获取切片数2
							
							
							
							
							
						 | 
						
							2025-06-13 16:23:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab0c962053
								
							
						 | 
						
							
							
								
								feat: mlogbin联动mlogbout
							
							
							
							
							
						 | 
						
							2025-06-13 16:22:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4bd6eab9f4
								
							
						 | 
						
							
							
								
								feat: mlogbin 和 update时cal_count_notok cal_mlog传False
							
							
							
							
							
						 | 
						
							2025-06-13 15:56:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b9a7138e72
								
							
						 | 
						
							
							
								
								feat: mlogbin 和 update时cal_count_notok
							
							
							
							
							
						 | 
						
							2025-06-13 15:24:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cf7673cd98
								
							
						 | 
						
							
							
								
								feat: 支持从wpr处获取切片数
							
							
							
							
							
						 | 
						
							2025-06-13 14:31:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								680608e16f
								
							
						 | 
						
							
							
								
								fix: mlogserializer需要同步count_real
							
							
							
							
							
						 | 
						
							2025-06-13 14:29:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6d87a69d8d
								
							
						 | 
						
							
							
								
								fix: cal_mlog_count_from_mlogb 需要传参触发
							
							
							
							
							
						 | 
						
							2025-06-13 11:23:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c02bb6d3db
								
							
						 | 
						
							
							
								
								fix: mlog 数值计算bug
							
							
							
							
							
						 | 
						
							2025-06-13 09:03:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dbad152218
								
							
						 | 
						
							
							
								
								fix: wmaterial get在传入query参数时完善can_do的逻辑
							
							
							
							
							
						 | 
						
							2025-06-12 10:37:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0719ef8f42
								
							
						 | 
						
							
							
								
								feat: gen_number_with_rule bug2
							
							
							
							
							
						 | 
						
							2025-06-11 11:02:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fea3c320a9
								
							
						 | 
						
							
							
								
								feat: gen_number_with_rule bug
							
							
							
							
							
						 | 
						
							2025-06-11 10:58:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5e0c515929
								
							
						 | 
						
							
							
								
								feat: batch_gxerp添加加工前缺陷
							
							
							
							
							
						 | 
						
							2025-06-10 10:05:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								84690e7b54
								
							
						 | 
						
							
							
								
								feat: 放开出入库的物料匹配
							
							
							
							
							
						 | 
						
							2025-06-09 15:50:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e3e8f997c
								
							
						 | 
						
							
							
								
								feat: 采购入库节点可复用2
							
							
							
							
							
						 | 
						
							2025-06-09 15:44:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d29b9c4eb
								
							
						 | 
						
							
							
								
								feat: 采购入库节点可复用
							
							
							
							
							
						 | 
						
							2025-06-09 15:37:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								77c4c54eb1
								
							
						 | 
						
							
							
								
								feat: inm 和 wpm添加wpr number的查询条件
							
							
							
							
							
						 | 
						
							2025-06-09 13:31:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								27b225face
								
							
						 | 
						
							
							
								
								feat: mlogb cal_count_pn_jgqbl
							
							
							
							
							
						 | 
						
							2025-06-06 17:44:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								be5dc161de
								
							
						 | 
						
							
							
								
								feat: mlogbw也进行mlogb.cal_count_notok()
							
							
							
							
							
						 | 
						
							2025-06-06 17:25:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								53c9afbca9
								
							
						 | 
						
							
							
								
								fix: mlog 的cal_count_notok_full的bug 4
							
							
							
							
							
						 | 
						
							2025-06-06 17:11:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								519672ef3f
								
							
						 | 
						
							
							
								
								fix: mlog 的cal_count_notok_full的bug 3
							
							
							
							
							
						 | 
						
							2025-06-06 16:50:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e93d7cd68
								
							
						 | 
						
							
							
								
								fix: mlog 的cal_count_notok_full的bug 2
							
							
							
							
							
						 | 
						
							2025-06-06 16:46:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c2770eed57
								
							
						 | 
						
							
							
								
								fix: mlog 的cal_count_notok_full的bug
							
							
							
							
							
						 | 
						
							2025-06-06 16:45:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cc28b3583
								
							
						 | 
						
							
							
								
								feat: cal_mlog_count_from_mlogb 添加count_ok_full
							
							
							
							
							
						 | 
						
							2025-06-06 16:39:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ff2b098210
								
							
						 | 
						
							
							
								
								feat: 优化batches_to
							
							
							
							
							
						 | 
						
							2025-06-06 16:26:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fa221218f9
								
							
						 | 
						
							
							
								
								feat: cal_count_notok 完全合格数有bug
							
							
							
							
							
						 | 
						
							2025-06-06 15:58:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bb9e2f337a
								
							
						 | 
						
							
							
								
								feat: batch_gxerp 全工段查询
							
							
							
							
							
						 | 
						
							2025-06-06 10:48:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d0491ac24
								
							
						 | 
						
							
							
								
								fix: 光芯批次统计"尺寸检验_完全合格率"
							
							
							
							
							
						 | 
						
							2025-06-05 14:16:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dff602abd1
								
							
						 | 
						
							
							
								
								fix: 光芯批次统计错误
							
							
							
							
							
						 | 
						
							2025-06-05 14:01:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f06ad961f7
								
							
						 | 
						
							
							
								
								feat: can_fix 排除维修完成品
							
							
							
							
							
						 | 
						
							2025-06-05 08:40:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9d1af24994
								
							
						 | 
						
							
							
								
								fix:  handover_submit batches获取bug2
							
							
							
							
							
						 | 
						
							2025-06-05 08:24:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								265a15c9fc
								
							
						 | 
						
							
							
								
								fix:  handover_submit batches获取bug
							
							
							
							
							
						 | 
						
							2025-06-04 15:23:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ede95a5d6
								
							
						 | 
						
							
							
								
								feat: batchst 添加first_time isnull筛选
							
							
							
							
							
						 | 
						
							2025-06-04 10:19:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a34514160d
								
							
						 | 
						
							
							
								
								feat: 获取first_time, last_time独立出一个方法
							
							
							
							
							
						 | 
						
							2025-06-04 10:05:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec42e70118
								
							
						 | 
						
							
							
								
								fix: 优化 gen_number_with_rule
							
							
							
							
							
						 | 
						
							2025-05-30 11:11:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7429b7d5fb
								
							
						 | 
						
							
							
								
								feat: 修改gen_number_with_rule 以获取的最后编号为准
							
							
							
							
							
						 | 
						
							2025-05-30 10:13:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8994b39917
								
							
						 | 
						
							
							
								
								fix: batches_to_limit 获取bug
							
							
							
							
							
						 | 
						
							2025-05-30 09:56:07 +08:00 |