|  caoqianming | 8a2e409c8a | feat: 增加改版交接类型 | 2025-02-05 09:54:22 +08:00 | 
				
					
						|  caoqianming | 50f19291a0 | fix: mlog revert bug | 2025-01-20 10:45:10 +08:00 | 
				
					
						|  caoqianming | 1eb990d3d5 | fix: mlogbw submit错误 | 2025-01-20 10:33:44 +08:00 | 
				
					
						|  caoqianming | 4699b31f83 | feat: ftest增加defect_main的后续逻辑变更 | 2025-01-17 16:52:14 +08:00 | 
				
					
						|  caoqianming | d653caed1d | fix: 变更单件产品的属性问题2 | 2025-01-17 10:01:02 +08:00 | 
				
					
						|  caoqianming | 8b7887ec43 | fix: 变更单件产品的属性问题 | 2025-01-17 09:57:53 +08:00 | 
				
					
						|  caoqianming | f4f17fd2b8 | fix: handover submit合并批次bug | 2025-01-14 08:52:16 +08:00 | 
				
					
						|  caoqianming | f68d498dd3 | feat: handover submit支持合并为单个新批次 | 2025-01-13 17:26:41 +08:00 | 
				
					
						|  caoqianming | ee3dc6a5a2 | feat: mlog revert bug | 2025-01-10 14:30:04 +08:00 | 
				
					
						|  caoqianming | 4b327c0575 | feat: mlog撤回 | 2025-01-10 13:47:39 +08:00 | 
				
					
						|  caoqianming | 8d923255fd | fix: mlog_submit提交的bug | 2025-01-09 18:14:36 +08:00 | 
				
					
						|  caoqianming | ce7183ff17 | fix: 不支持消耗物料的检验 | 2025-01-09 17:02:30 +08:00 | 
				
					
						|  caoqianming | 88535650a7 | fix: mlog submit中提交wprbug | 2025-01-09 16:27:12 +08:00 | 
				
					
						|  caoqianming | aca5cd8a63 | fix: mlog submit defect_qs | 2025-01-09 15:57:23 +08:00 | 
				
					
						|  caoqianming | 37cce1664b | feat: mlog submit支持质检 | 2025-01-09 15:28:31 +08:00 | 
				
					
						|  caoqianming | 6fbe0a7b1c | fix: mlogbw删除的bug | 2025-01-09 10:51:04 +08:00 | 
				
					
						|  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 | 
				
					
						|  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 |