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
							
						 | 
						
							
							
							
							
							
								
							
							
								fac85d17d2
								
							
						 | 
						
							
							
								
								feat: defect code设置为非必填
							
							
							
							
							
						 | 
						
							2025-02-28 09:50:30 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								d69d4568f6
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2025-02-27 16:59:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c4b11d9c9
								
							
						 | 
						
							
							
								
								feat: mb添加查询条件state
							
							
							
							
							
						 | 
						
							2025-02-27 16:59:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ea5e041575
								
							
						 | 
						
							
							
								
								feat: enm/task 修改班时校正
							
							
							
							
							
						 | 
						
							2025-02-27 14:28:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf35064f6e
								
							
						 | 
						
							
							
								
								feat: 优化em增加采集数据方法
							
							
							
							
							
						 | 
						
							2025-02-27 12:37:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d30ecabd16
								
							
						 | 
						
							
							
								
								feat: em增加采集数据方法2
							
							
							
							
							
						 | 
						
							2025-02-27 12:24:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1925e3e5d6
								
							
						 | 
						
							
							
								
								feat: em增加采集数据方法
							
							
							
							
							
						 | 
						
							2025-02-27 11:34:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1dbb07ddcb
								
							
						 | 
						
							
							
								
								feat: route支持传入material_out_tracking 2
							
							
							
							
							
						 | 
						
							2025-02-26 17:37:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d1c15b0b2e
								
							
						 | 
						
							
							
								
								feat: route支持传入material_out_tracking
							
							
							
							
							
						 | 
						
							2025-02-26 17:36:52 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								ccce92f9f6
								
							
						 | 
						
							
							
								
								feat: testitem添加采集表达式
							
							
							
							
							
						 | 
						
							2025-02-26 09:19:48 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								571e11cc8c
								
							
						 | 
						
							
							
								
								feat: wpr修改排序按number
							
							
							
							
							
						 | 
						
							2025-02-25 15:57:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73bc1bac2e
								
							
						 | 
						
							
							
								
								fix: wpr number需要唯一
							
							
							
							
							
						 | 
						
							2025-02-25 15:42:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ce03827bf
								
							
						 | 
						
							
							
								
								fix: 出入库change_or_new要处理ftest
							
							
							
							
							
						 | 
						
							2025-02-25 15:10:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e9f858205
								
							
						 | 
						
							
							
								
								fix: cal_real_task_count 在子任务数量上错误
							
							
							
							
							
						 | 
						
							2025-02-25 15:05:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0e96485fae
								
							
						 | 
						
							
							
								
								feat: mioitem添加count_tested
							
							
							
							
							
						 | 
						
							2025-02-25 10:33:22 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								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 |