caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								982247ee70
								
							
						 | 
						
							
							
								
								feat: count_n_jgqbl 改为count_pn_jgqbl
							
							
							
							
							
						 | 
						
							2024-09-05 09:11:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e7e6c584e
								
							
						 | 
						
							
							
								
								feat: 一二级日志录入
							
							
							
							
							
						 | 
						
							2024-09-04 15:25:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								044819815e
								
							
						 | 
						
							
							
								
								fix: cal_mlog_count_from_mlogb 统计bug
							
							
							
							
							
						 | 
						
							2024-09-03 17:57:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6a573dd4dd
								
							
						 | 
						
							
							
								
								feat: mlog经审批后提交
							
							
							
							
							
						 | 
						
							2024-09-03 09:10:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								40b012b962
								
							
						 | 
						
							
							
								
								feat: 加工前不良的日志提交和撤回
							
							
							
							
							
						 | 
						
							2024-09-02 15:27:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5289e71280
								
							
						 | 
						
							
							
								
								feat: wmaterial添加外协字段及相关调整
							
							
							
							
							
						 | 
						
							2024-08-30 09:21:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								54c7c65fe0
								
							
						 | 
						
							
							
								
								feat: 产出物为0时跳过revert
							
							
							
							
							
						 | 
						
							2024-08-29 14:52:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba6c30a745
								
							
						 | 
						
							
							
								
								feat: wmaterial增加state字段并进行相应处理
							
							
							
							
							
						 | 
						
							2024-08-15 10:41:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a42cf34f0
								
							
						 | 
						
							
							
								
								feat: wmaterial增加count_xtest/handover增加检验交接
							
							
							
							
							
						 | 
						
							2024-08-09 15:09:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								341a681d00
								
							
						 | 
						
							
							
								
								fix: get_sflog 提前起始时间
							
							
							
							
							
						 | 
						
							2024-08-06 09:54:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cbe516ccf5
								
							
						 | 
						
							
							
								
								fix: handover submit时更新bug
							
							
							
							
							
						 | 
						
							2024-08-01 15:25:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6efcf19716
								
							
						 | 
						
							
							
								
								fix: mlog_revert bug
							
							
							
							
							
						 | 
						
							2024-08-01 15:15:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f3f0ea132c
								
							
						 | 
						
							
							
								
								fix: find_material_can_change 只可返工到半成品
							
							
							
							
							
						 | 
						
							2024-08-01 10:30:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								821d7613d1
								
							
						 | 
						
							
							
								
								fix: get_sflog 增加 sflog创建范围
							
							
							
							
							
						 | 
						
							2024-07-31 15:55:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ebf6f739ca
								
							
						 | 
						
							
							
								
								feat: 出入库添加工段逻辑
							
							
							
							
							
						 | 
						
							2024-07-30 13:24:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6759ea76bf
								
							
						 | 
						
							
							
								
								feat: material增加into_wm字段控制与车间库存交互
							
							
							
							
							
						 | 
						
							2024-07-25 13:27:44 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |