caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eaf1a5671f
								
							
						 | 
						
							
							
								
								fix: 用于correct utask错误数据
							
							
							
							
							
						 | 
						
							2024-03-18 16:29:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f456c7cbc8
								
							
						 | 
						
							
							
								
								fix: mtask_submit后不更改utask状态的bug
							
							
							
							
							
						 | 
						
							2024-03-18 16:13:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90e0513db6
								
							
						 | 
						
							
							
								
								refector: 取消未填写mlog的校验,由前端来做
							
							
							
							
							
						 | 
						
							2024-01-10 15:46:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5bbb48ceb
								
							
						 | 
						
							
							
								
								fix: 停止任务的bug
							
							
							
							
							
						 | 
						
							2024-01-04 09:07:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae0832010f
								
							
						 | 
						
							
							
								
								feat: MtaskSerializer 返回submit_user_name
							
							
							
							
							
						 | 
						
							2023-12-28 18:37:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a09ae16fa0
								
							
						 | 
						
							
							
								
								fix: mtask_submit bug
							
							
							
							
							
						 | 
						
							2023-12-27 15:13:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								03d6a6c99f
								
							
						 | 
						
							
							
								
								fix: mtask_submit时导致重复计算
							
							
							
							
							
						 | 
						
							2023-12-27 09:03:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ca7dc5c2ba
								
							
						 | 
						
							
							
								
								feat: mtask增加查询条件
							
							
							
							
							
						 | 
						
							2023-12-25 10:06:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5c24465a41
								
							
						 | 
						
							
							
								
								feat: mtask utask增加返回信息
							
							
							
							
							
						 | 
						
							2023-12-21 00:37:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e954b37404
								
							
						 | 
						
							
							
								
								feat: 添加与任务相关的日志信息peifen_kg
							
							
							
							
							
						 | 
						
							2023-12-17 19:55:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19a53931c4
								
							
						 | 
						
							
							
								
								fix: mtask update在已提交状态下只更改peifen_kg bug
							
							
							
							
							
						 | 
						
							2023-12-16 10:32:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5d2d5ef84
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2023-12-16 09:56:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8b106dc2e
								
							
						 | 
						
							
							
								
								feat: mtask update在已提交状态下只更改peifen_kg
							
							
							
							
							
						 | 
						
							2023-12-16 09:56:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								128dc2a7e3
								
							
						 | 
						
							
							
								
								feat: utask mtask状态submit调整
							
							
							
							
							
						 | 
						
							2023-12-15 09:05:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								33ea769ad4
								
							
						 | 
						
							
							
								
								feat: 增加任务类型 mass
							
							
							
							
							
						 | 
						
							2023-12-05 17:25:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cc0a2719de
								
							
						 | 
						
							
							
								
								feat: mtask增加submit_time
							
							
							
							
							
						 | 
						
							2023-11-30 16:30:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e041ec93b
								
							
						 | 
						
							
							
								
								fix: 任务提交接口改为单个提交
							
							
							
							
							
						 | 
						
							2023-11-30 16:00:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73a463dd2f
								
							
						 | 
						
							
							
								
								feat: 增加mtask查询条件
							
							
							
							
							
						 | 
						
							2023-11-30 13:38:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab0bc60c23
								
							
						 | 
						
							
							
								
								feat: utask增加返回数据
							
							
							
							
							
						 | 
						
							2023-11-29 10:57:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								741032f4e8
								
							
						 | 
						
							
							
								
								feat: 增加日均计划数
							
							
							
							
							
						 | 
						
							2023-11-27 15:38:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eef925dc62
								
							
						 | 
						
							
							
								
								feat: 生产任务增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-24 11:17:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c20c0e5ae7
								
							
						 | 
						
							
							
								
								fix: 先注释掉
							
							
							
							
							
						 | 
						
							2023-11-20 19:07:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b90ea74e4b
								
							
						 | 
						
							
							
								
								fix: 创建mtask时先不make_sflogs
							
							
							
							
							
						 | 
						
							2023-11-20 18:48:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fddadfe30c
								
							
						 | 
						
							
							
								
								feat: wpm中增加到岗记录
							
							
							
							
							
						 | 
						
							2023-11-20 16:26:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a591abab8a
								
							
						 | 
						
							
							
								
								feat: mtask serializer增加mlogs
							
							
							
							
							
						 | 
						
							2023-11-14 13:47:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae629846ab
								
							
						 | 
						
							
							
								
								feat: 增加配粉料数字段
							
							
							
							
							
						 | 
						
							2023-11-01 14:37:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a640d9a70
								
							
						 | 
						
							
							
								
								feat: mlog增加submit_time/submit_user及相应逻辑
							
							
							
							
							
						 | 
						
							2023-11-01 13:28:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd16bef47a
								
							
						 | 
						
							
							
								
								feat: 直接下任务时需设置is_count_utask
							
							
							
							
							
						 | 
						
							2023-10-31 16:59:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b3cbdeaa70
								
							
						 | 
						
							
							
								
								feat: 获取指定车间指定日期的代表工序生产任务
							
							
							
							
							
						 | 
						
							2023-10-30 17:47:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cbc43fdb65
								
							
						 | 
						
							
							
								
								feat: 增加is_count_utask字段以确认同步utask
							
							
							
							
							
						 | 
						
							2023-10-26 18:20:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5ba3b4e07a
								
							
						 | 
						
							
							
								
								feat: 增加utask查询条件
							
							
							
							
							
						 | 
						
							2023-10-26 16:40:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4cea056955
								
							
						 | 
						
							
							
								
								feat: utask mtask增加状态以及相关逻辑
							
							
							
							
							
						 | 
						
							2023-10-26 16:25:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b53b68e0c
								
							
						 | 
						
							
							
								
								fix: mtaskserializer material_out_ 错误
							
							
							
							
							
						 | 
						
							2023-10-26 13:35:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c459960128
								
							
						 | 
						
							
							
								
								fix: mtask day 逻辑不严谨
							
							
							
							
							
						 | 
						
							2023-10-26 11:34:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef971c6501
								
							
						 | 
						
							
							
								
								fix: schedue_mtasks 修改utask状态
							
							
							
							
							
						 | 
						
							2023-10-26 10:12:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5eb4eaaaec
								
							
						 | 
						
							
							
								
								feat: utask指定mgroup也可以直接分解
							
							
							
							
							
						 | 
						
							2023-10-26 10:01:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								add92c8daa
								
							
						 | 
						
							
							
								
								feat: schedue_mtasks 校验一下
							
							
							
							
							
						 | 
						
							2023-10-26 09:56:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5c5c3510aa
								
							
						 | 
						
							
							
								
								feat: 增加utask的状态已分解
							
							
							
							
							
						 | 
						
							2023-10-26 09:41:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ec3530862
								
							
						 | 
						
							
							
								
								feat: utask增加查询条件
							
							
							
							
							
						 | 
						
							2023-10-26 09:07:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4869a2cb8a
								
							
						 | 
						
							
							
								
								fix: typing 取消
							
							
							
							
							
						 | 
						
							2023-10-26 08:59:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0aea02ffc9
								
							
						 | 
						
							
							
								
								feat: 订单排产时增加belong_dept参数
							
							
							
							
							
						 | 
						
							2023-10-26 08:57:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b1339f6d6b
								
							
						 | 
						
							
							
								
								feat: utask增加belong_dept字段及相应逻辑
							
							
							
							
							
						 | 
						
							2023-10-26 08:48:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bc57f49e6a
								
							
						 | 
						
							
							
								
								feat: 增加utask mgroup和material_in 字段
							
							
							
							
							
						 | 
						
							2023-10-25 18:49:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5649decd77
								
							
						 | 
						
							
							
								
								fix: 提交任务时的bug
							
							
							
							
							
						 | 
						
							2023-10-25 13:46:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1f4107407b
								
							
						 | 
						
							
							
								
								feat: 增加返回数据
							
							
							
							
							
						 | 
						
							2023-10-24 11:11:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1c74a0fa6
								
							
						 | 
						
							
							
								
								feat: 增加多个友好接口
							
							
							
							
							
						 | 
						
							2023-10-23 09:02:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a69fa79de8
								
							
						 | 
						
							
							
								
								feat:  获取指定车间指定日期的最后工序生产任务
							
							
							
							
							
						 | 
						
							2023-10-20 16:55:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0843cf6ce3
								
							
						 | 
						
							
							
								
								fix: mtasks_submit 时未填写日志校验
							
							
							
							
							
						 | 
						
							2023-10-20 15:36:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d8be8665eb
								
							
						 | 
						
							
							
								
								fix: 提交任务submit_related_same_day
							
							
							
							
							
						 | 
						
							2023-10-20 14:51:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3fd0347837
								
							
						 | 
						
							
							
								
								feat: 增加utask过滤条件
							
							
							
							
							
						 | 
						
							2023-10-20 09:24:56 +08:00 |