caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								47f4222f03
								
							
						 | 
						
							
							
								
								fix: mlog submit wm belong_dept 缺失
							
							
							
							
							
						 | 
						
							2024-07-24 16:43:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c67675ca7
								
							
						 | 
						
							
							
								
								feat: 完成返工交接
							
							
							
							
							
						 | 
						
							2024-07-22 15:26:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92fc1e9e0a
								
							
						 | 
						
							
							
								
								feat: 添加返修交接支持
							
							
							
							
							
						 | 
						
							2024-07-19 10:04:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								950b017073
								
							
						 | 
						
							
							
								
								feat: mlog_submit 时校验handle_date
							
							
							
							
							
						 | 
						
							2024-07-18 14:48:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d561a0d24b
								
							
						 | 
						
							
							
								
								feat: 日志提交时不合格品存储到车间库存
							
							
							
							
							
						 | 
						
							2024-07-18 11:30:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ee65658145
								
							
						 | 
						
							
							
								
								fix: MlogbInSerializer bug
							
							
							
							
							
						 | 
						
							2024-07-17 17:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c058fe9338
								
							
						 | 
						
							
							
								
								feat: 支持不合格品处理/添加不合格品存储字段
							
							
							
							
							
						 | 
						
							2024-07-17 16:58:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07680704ec
								
							
						 | 
						
							
							
								
								feat: cal_mtask_progress_from_mlog
							
							
							
							
							
						 | 
						
							2024-07-15 16:57:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f5edc041c
								
							
						 | 
						
							
							
								
								feat: mlog init
							
							
							
							
							
						 | 
						
							2024-07-10 15:32:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								24b2a98440
								
							
						 | 
						
							
							
								
								refecor: 一些处理
							
							
							
							
							
						 | 
						
							2024-07-05 08:49:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a0dae66cf7
								
							
						 | 
						
							
							
								
								feat: 根据光芯需求对wpm做兼容性处理2
							
							
							
							
							
						 | 
						
							2024-07-03 13:19:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								427bf31d50
								
							
						 | 
						
							
							
								
								fix: mlogb 取material bug
							
							
							
							
							
						 | 
						
							2024-07-02 12:09:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d579a7358d
								
							
						 | 
						
							
							
								
								feat: 根据光芯需求对wpm做兼容性处理
							
							
							
							
							
						 | 
						
							2024-07-01 10:07:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8548004690
								
							
						 | 
						
							
							
								
								fix: 用于混料的原料不与车间库存交互
							
							
							
							
							
						 | 
						
							2024-06-04 09:11:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd33a33ed6
								
							
						 | 
						
							
							
								
								fix: get_pcoal_heat 逻辑严谨
							
							
							
							
							
						 | 
						
							2024-05-16 17:18:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a90396099b
								
							
						 | 
						
							
							
								
								fix: 更新煤粉热值触发计算的bug3
							
							
							
							
							
						 | 
						
							2024-05-16 16:57:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9a1074caf8
								
							
						 | 
						
							
							
								
								fix: 更新煤粉热值触发计算的bug
							
							
							
							
							
						 | 
						
							2024-05-16 16:48:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5093eb7b29
								
							
						 | 
						
							
							
								
								feat: 更新煤粉热值触发计算的bug
							
							
							
							
							
						 | 
						
							2024-05-16 16:26:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b4b3d6eadc
								
							
						 | 
						
							
							
								
								feat: hour计数改为sec计数 步骤2
							
							
							
							
							
						 | 
						
							2024-05-15 10:31:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8753994468
								
							
						 | 
						
							
							
								
								fix: hour计数改为sec计数 make_sflogs 的bug
							
							
							
							
							
						 | 
						
							2024-05-15 10:14:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a3f5e48b8c
								
							
						 | 
						
							
							
								
								feat: hour计数改为sec计数
							
							
							
							
							
						 | 
						
							2024-05-15 10:06:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								035b9b392a
								
							
						 | 
						
							
							
								
								fix: get_pcoal_heat 时以work_date为准
							
							
							
							
							
						 | 
						
							2024-05-08 16:06:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								634884f336
								
							
						 | 
						
							
							
								
								doc: 增加注释
							
							
							
							
							
						 | 
						
							2024-05-02 00:02:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ea5e0b5d7
								
							
						 | 
						
							
							
								
								fix: make_sflogs当天班生成缺少的bug
							
							
							
							
							
						 | 
						
							2024-05-02 00:01:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dddab37c63
								
							
						 | 
						
							
							
								
								fix: get_sflog 取的时候与happen_time对比错误
							
							
							
							
							
						 | 
						
							2024-04-30 12:59:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1139bb6119
								
							
						 | 
						
							
							
								
								feat: 优化make_sflog/get_sflog
							
							
							
							
							
						 | 
						
							2024-04-11 10:56:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								779488589a
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug3
							
							
							
							
							
						 | 
						
							2024-03-06 22:24:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2addfc8433
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug2
							
							
							
							
							
						 | 
						
							2024-03-06 21:52:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ddb050330
								
							
						 | 
						
							
							
								
								fix: handover_submit针对混料特殊处理的bug
							
							
							
							
							
						 | 
						
							2024-03-06 21:45:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b429ad9059
								
							
						 | 
						
							
							
								
								fix: 废弃一些接口
							
							
							
							
							
						 | 
						
							2024-03-06 18:01:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4c3610ac25
								
							
						 | 
						
							
							
								
								feat: 混料支持车间库存
							
							
							
							
							
						 | 
						
							2024-03-06 17:07:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eef99ed624
								
							
						 | 
						
							
							
								
								feat: 出入库操作支持提交后可撤销功能
							
							
							
							
							
						 | 
						
							2024-02-29 17:10:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d0b13ac215
								
							
						 | 
						
							
							
								
								feat: do_in时增加更完整的提示信息
							
							
							
							
							
						 | 
						
							2024-01-25 09:49:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a6aabd860
								
							
						 | 
						
							
							
								
								fix: do_in new_count为0时wm.delete
							
							
							
							
							
						 | 
						
							2024-01-12 16:45:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7ca12228e2
								
							
						 | 
						
							
							
								
								feat: 库存减到0时删除该记录
							
							
							
							
							
						 | 
						
							2024-01-11 17:56:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6165af7c47
								
							
						 | 
						
							
							
								
								feat: mlog_submit返回更详细的报错
							
							
							
							
							
						 | 
						
							2023-12-28 17:28:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								03d6a6c99f
								
							
						 | 
						
							
							
								
								fix: mtask_submit时导致重复计算
							
							
							
							
							
						 | 
						
							2023-12-27 09:03:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								625074049e
								
							
						 | 
						
							
							
								
								feat: mlog日志撤回
							
							
							
							
							
						 | 
						
							2023-12-18 09:18:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								845a510068
								
							
						 | 
						
							
							
								
								fix: mlog撤回1未完成
							
							
							
							
							
						 | 
						
							2023-12-18 08:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								128dc2a7e3
								
							
						 | 
						
							
							
								
								feat: utask mtask状态submit调整
							
							
							
							
							
						 | 
						
							2023-12-15 09:05:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95f67b6543
								
							
						 | 
						
							
							
								
								feat: is_hidden的物料也需要进行车间库存管理
							
							
							
							
							
						 | 
						
							2023-12-05 13:02:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cc0a2719de
								
							
						 | 
						
							
							
								
								feat: mtask增加submit_time
							
							
							
							
							
						 | 
						
							2023-11-30 16:30:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								81e97c4789
								
							
						 | 
						
							
							
								
								feat: 日志提交时间校验
							
							
							
							
							
						 | 
						
							2023-11-30 14:48:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2030812c18
								
							
						 | 
						
							
							
								
								fix: 能管的工段异常修改
							
							
							
							
							
						 | 
						
							2023-11-22 16:07:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dd2189900f
								
							
						 | 
						
							
							
								
								feat: sflog增加total_hour字段
							
							
							
							
							
						 | 
						
							2023-11-20 19:09:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fddadfe30c
								
							
						 | 
						
							
							
								
								feat: wpm中增加到岗记录
							
							
							
							
							
						 | 
						
							2023-11-20 16:26:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1b85a7f88a
								
							
						 | 
						
							
							
								
								fix: 可不用隐式物料
							
							
							
							
							
						 | 
						
							2023-11-03 18:33:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3b3434fcf1
								
							
						 | 
						
							
							
								
								feat: mlog增加material_in字段
							
							
							
							
							
						 | 
						
							2023-11-02 16:13:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b742fecf50
								
							
						 | 
						
							
							
								
								fix: datetime引用出错2
							
							
							
							
							
						 | 
						
							2023-11-02 08:44:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ae6c3fde7
								
							
						 | 
						
							
							
								
								fix: datetime引用出错
							
							
							
							
							
						 | 
						
							2023-11-02 08:42:46 +08:00 |