caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								17622f230e
								
							
						 | 
						
							
							
								
								feat: 根据排班规则填入班组
							
							
							
							
							
						 | 
						
							2024-12-05 18:59:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4c732894df
								
							
						 | 
						
							
							
								
								feat: wpm 排班修改
							
							
							
							
							
						 | 
						
							2024-12-05 18:19:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								918df6b345
								
							
						 | 
						
							
							
								
								feat: 新增tkx 测点 聚合
							
							
							
							
							
						 | 
						
							2024-12-05 15:22:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b93c4bddeb
								
							
						 | 
						
							
							
								
								feat: 触发批次分析统计
							
							
							
							
							
						 | 
						
							2024-12-03 18:07:23 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c0169d25ac
								
							
						 | 
						
							
							
								
								add : enm 增加峰谷平电量统计
							
							
							
							
							
						 | 
						
							2024-12-02 15:26:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4671ee9e7a
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-28 14:28:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4c38cee983
								
							
						 | 
						
							
							
								
								add: mtm/model serializer view 增加tkx 自动排班
							
							
							
							
							
						 | 
						
							2024-11-28 14:28:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								31b1aae03c
								
							
						 | 
						
							
							
								
								feat: generate_new_batch 追加锅号
							
							
							
							
							
						 | 
						
							2024-11-28 09:37:17 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								1010a6b86f
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-25 17:45:10 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f0a748e304
								
							
						 | 
						
							
							
								
								feat:修改自动生成班组
							
							
							
							
							
						 | 
						
							2024-11-25 17:45:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12d77e53b6
								
							
						 | 
						
							
							
								
								feat: mlog submit 添加一个注释
							
							
							
							
							
						 | 
						
							2024-11-24 17:03:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5d6ce9f6c0
								
							
						 | 
						
							
							
								
								feat: mlog_submit mlog_revert bug
							
							
							
							
							
						 | 
						
							2024-11-22 09:07:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4518344fa6
								
							
						 | 
						
							
							
								
								fix: do_out 领料时的material_ofrom
							
							
							
							
							
						 | 
						
							2024-11-14 13:04:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a00f533752
								
							
						 | 
						
							
							
								
								fix: mlog submit 关于wm.batch_ofrom的bug
							
							
							
							
							
						 | 
						
							2024-11-14 11:39:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9fb09f7c2a
								
							
						 | 
						
							
							
								
								fix: mlog submit 关于count_n的bug
							
							
							
							
							
						 | 
						
							2024-11-14 11:24:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b5928b2927
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次4
							
							
							
							
							
						 | 
						
							2024-11-14 10:40:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90e699155c
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次3
							
							
							
							
							
						 | 
						
							2024-11-13 18:16:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4016c421be
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次
							
							
							
							
							
						 | 
						
							2024-11-13 17:22:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d9582fe34
								
							
						 | 
						
							
							
								
								feat: mlogb添加字段以追踪原料批次
							
							
							
							
							
						 | 
						
							2024-11-13 15:56:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0d66ae5e90
								
							
						 | 
						
							
							
								
								feat: generate_new_batch 中添加-变为>
							
							
							
							
							
						 | 
						
							2024-11-12 14:13:06 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								780564f6e1
								
							
						 | 
						
							
							
								
								feat: 煤粉热值处理2
							
							
							
							
							
						 | 
						
							2024-09-30 16:22:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b6b72b2826
								
							
						 | 
						
							
							
								
								fix: handover submit need_add
							
							
							
							
							
						 | 
						
							2024-09-06 10:01:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba8bc4fb72
								
							
						 | 
						
							
							
								
								fix: handover_submit
							
							
							
							
							
						 | 
						
							2024-09-05 17:50:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e51960d5ba
								
							
						 | 
						
							
							
								
								fix: handover_submit bug
							
							
							
							
							
						 | 
						
							2024-09-05 15:17:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e2f4cd1612
								
							
						 | 
						
							
							
								
								feat: handover_submit优化
							
							
							
							
							
						 | 
						
							2024-09-05 12:44:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d6e3657298
								
							
						 | 
						
							
							
								
								fix: count_pn_jgqbl的扣减bug
							
							
							
							
							
						 | 
						
							2024-09-05 10:50:32 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |