caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								49d1b95968
								
							
						 | 
						
							
							
								
								feat: handoverbw的处理2
							
							
							
							
							
						 | 
						
							2025-01-06 11:34:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d784ac8a3c
								
							
						 | 
						
							
							
								
								feat: 生产日志追踪到个完善
							
							
							
							
							
						 | 
						
							2025-01-06 10:23:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								437501b668
								
							
						 | 
						
							
							
								
								feat: mioitemw等增加wpr字段
							
							
							
							
							
						 | 
						
							2025-01-03 16:53:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d0d5ebcd0
								
							
						 | 
						
							
							
								
								fix: 主要是wpmw change_or_new的修正
							
							
							
							
							
						 | 
						
							2025-01-03 14:37:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								70e344ed68
								
							
						 | 
						
							
							
								
								feat: mlogrever支持单件回退
							
							
							
							
							
						 | 
						
							2025-01-02 16:29:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba41228d69
								
							
						 | 
						
							
							
								
								fix: 生产提交支持单个物料
							
							
							
							
							
						 | 
						
							2025-01-02 14:01:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1fd76611b6
								
							
						 | 
						
							
							
								
								fix: make_sflogs if start_time的bug
							
							
							
							
							
						 | 
						
							2024-12-29 00:34:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afc910a805
								
							
						 | 
						
							
							
								
								fix: make_sflogs bug
							
							
							
							
							
						 | 
						
							2024-12-27 15:29:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cc8d9b1bf4
								
							
						 | 
						
							
							
								
								feat: enm/service 修改 service
							
							
							
							
							
						 | 
						
							2024-12-27 14:42:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bdd644a527
								
							
						 | 
						
							
							
								
								fix: 日志撤销的同时将任务变更状态
							
							
							
							
							
						 | 
						
							2024-12-16 13:06:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cdc70177bb
								
							
						 | 
						
							
							
								
								fix: sflog work_date 默认start_time.date
							
							
							
							
							
						 | 
						
							2024-12-13 17:32:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								41b27c0113
								
							
						 | 
						
							
							
								
								feat: sflog save 保存team leader
							
							
							
							
							
						 | 
						
							2024-12-11 13:03:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								13639568b1
								
							
						 | 
						
							
							
								
								feat: 回退make_sflogs中start_time缺班bug
							
							
							
							
							
						 | 
						
							2024-12-11 12:58:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6815babe0f
								
							
						 | 
						
							
							
								
								feat: get_team_x bug
							
							
							
							
							
						 | 
						
							2024-12-11 12:45:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								44af9bc494
								
							
						 | 
						
							
							
								
								feat : 修改排班规则
							
							
							
							
							
						 | 
						
							2024-12-11 12:18:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e0915676e3
								
							
						 | 
						
							
							
								
								feat: enm/view service 修改聚合和煤粉热值 缓存失效时间。
							
							
							
							
							
						 | 
						
							2024-12-09 09:46:51 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |