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
							
						 | 
						
							
							
							
							
							
								
							
							
								af999467db
								
							
						 | 
						
							
							
								
								fix: 去除materialbatch的数据库约束
							
							
							
							
							
						 | 
						
							2025-02-21 17:23:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1525d1289
								
							
						 | 
						
							
							
								
								fix: mb create加锁
							
							
							
							
							
						 | 
						
							2025-02-21 17:05:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07473ddf90
								
							
						 | 
						
							
							
								
								feat: mio出入库支持选入mioitemw
							
							
							
							
							
						 | 
						
							2025-02-21 11:01:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74a7025f6c
								
							
						 | 
						
							
							
								
								feat: wm_in 在mlogbin时必填
							
							
							
							
							
						 | 
						
							2025-02-20 17:02:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7200bc45b3
								
							
						 | 
						
							
							
								
								fix: do_in xmaterial的type error
							
							
							
							
							
						 | 
						
							2025-02-20 14:48:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b484a65cd
								
							
						 | 
						
							
							
								
								feat: route添加document字段
							
							
							
							
							
						 | 
						
							2025-02-19 15:35:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c585f2fc11
								
							
						 | 
						
							
							
								
								feat: mlogbin支持mtask非必填
							
							
							
							
							
						 | 
						
							2025-02-19 14:29:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5f0d34f9c3
								
							
						 | 
						
							
							
								
								feat: route添加parent字段以支持子步骤
							
							
							
							
							
						 | 
						
							2025-02-19 14:02:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f741eda285
								
							
						 | 
						
							
							
								
								feat: 七车间入库_仓库执行人 remove None
							
							
							
							
							
						 | 
						
							2025-02-18 17:45:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f5229ab8cb
								
							
						 | 
						
							
							
								
								feat: ftestwork_submit 时根据工段配置生成不合格品
							
							
							
							
							
						 | 
						
							2025-02-18 11:09:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b062d7ef6b
								
							
						 | 
						
							
							
								
								fix: cal_material_count 挪到单独文件里
							
							
							
							
							
						 | 
						
							2025-02-18 11:03:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								56d49b4d26
								
							
						 | 
						
							
							
								
								fix: cal_material_count 只统计合格品
							
							
							
							
							
						 | 
						
							2025-02-18 10:56:09 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								7b87e79bf5
								
							
						 | 
						
							
							
								
								feat: 部分app model注释
							
							
							
							
							
						 | 
						
							2025-02-18 09:02:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								855ca9b054
								
							
						 | 
						
							
							
								
								feat: wpm和wpmw表添加doc2
							
							
							
							
							
						 | 
						
							2025-02-17 16:57:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12c6cc0d17
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-17 16:17:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								89642fb194
								
							
						 | 
						
							
							
								
								feat: wpm和wpmw表添加doc
							
							
							
							
							
						 | 
						
							2025-02-17 16:17:06 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7544efdc1e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-17 15:35:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								095a6f9d51
								
							
						 | 
						
							
							
								
								feat: enm/task view 修改校正测试 增加能修改 天和月的时间类型
							
							
							
							
							
						 | 
						
							2025-02-17 15:35:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9f558acedb
								
							
						 | 
						
							
							
								
								feat: base execute_raw_sql时允许不返回值
							
							
							
							
							
						 | 
						
							2025-02-17 14:37:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								57e6e23e95
								
							
						 | 
						
							
							
								
								feat: equip添加采集数据请求字段
							
							
							
							
							
						 | 
						
							2025-02-17 14:35:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8cbb921969
								
							
						 | 
						
							
							
								
								feat: 光子棒管综合统计添加数据
							
							
							
							
							
						 | 
						
							2025-02-17 11:24:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e6b27950b2
								
							
						 | 
						
							
							
								
								feat: ftestitem增加检测设备字段
							
							
							
							
							
						 | 
						
							2025-02-17 09:34:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								61525d236e
								
							
						 | 
						
							
							
								
								feat: qct detail是检测项按顺序返回
							
							
							
							
							
						 | 
						
							2025-02-14 10:56:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d7361a71df
								
							
						 | 
						
							
							
								
								perf: 优化has_envdata的sql查询2
							
							
							
							
							
						 | 
						
							2025-02-13 13:26:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								61f9dc3b51
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-13 11:26:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dbbdaa89b9
								
							
						 | 
						
							
							
								
								perf: 优化has_envdata的sql查询
							
							
							
							
							
						 | 
						
							2025-02-13 11:26:27 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5ecb3341e0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-12 17:34:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5f85d0273c
								
							
						 | 
						
							
							
								
								feat: 修改enm/task
							
							
							
							
							
						 | 
						
							2025-02-12 17:34:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9d27ccd1dc
								
							
						 | 
						
							
							
								
								fix: base get_user_route 路由重复的问题
							
							
							
							
							
						 | 
						
							2025-02-12 15:10:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								861bb03469
								
							
						 | 
						
							
							
								
								feat: wpmw添加字段
							
							
							
							
							
						 | 
						
							2025-02-12 15:10:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a88f7e282e
								
							
						 | 
						
							
							
								
								feat: Ptest不指定testitem
							
							
							
							
							
						 | 
						
							2025-02-11 14:53:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7dc11e032d
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-11 14:40:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac41f5a105
								
							
						 | 
						
							
							
								
								fix: 粗中细磨的统计要涵盖粗磨和粗中磨的数据
							
							
							
							
							
						 | 
						
							2025-02-11 14:40:38 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f7d6f59fcd
								
							
						 | 
						
							
							
								
								feat: 修改 enm 回转窑产量计算
							
							
							
							
							
						 | 
						
							2025-02-11 14:24:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								44486b64a3
								
							
						 | 
						
							
							
								
								feat: mlogbw的输出不允许删除
							
							
							
							
							
						 | 
						
							2025-02-11 11:12:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								edfc63a2e2
								
							
						 | 
						
							
							
								
								feat: base 修改系统名称
							
							
							
							
							
						 | 
						
							2025-02-10 18:19:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f8416d91b6
								
							
						 | 
						
							
							
								
								feat: 增加mio返回is_tested
							
							
							
							
							
						 | 
						
							2025-02-10 18:19:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8c0a9b420
								
							
						 | 
						
							
							
								
								fix: 车间执行人和仓库人问题
							
							
							
							
							
						 | 
						
							2025-02-10 15:57:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a3e428195
								
							
						 | 
						
							
							
								
								feat: do_in 支持wpr
							
							
							
							
							
						 | 
						
							2025-02-08 15:31:35 +08:00 |