|  caoqianming | 2ea3dc79cb | feat: 批号追加工段标识2 | 2025-04-21 13:22:39 +08:00 | 
				
					
						|  caoqianming | 82587b1736 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2025-04-21 11:33:11 +08:00 | 
				
					
						|  caoqianming | 786d178edc | feat: 批号追加工段标识 | 2025-04-21 11:32:57 +08:00 | 
				
					
						|  caoqianming | 181d477425 | fix: 日志和交接记录操作数正值校验 | 2025-04-19 23:40:42 +08:00 | 
				
					
						|  caoqianming | 00e352d8ef | feat: 改版交接需要触发统计数量 | 2025-04-18 14:52:03 +08:00 | 
				
					
						|  caoqianming | 369c452dd5 | fix: 正常交接后的物料状态不变 | 2025-04-17 11:17:05 +08:00 | 
				
					
						|  caoqianming | 896be043f5 | feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成 | 2025-04-16 19:14:18 +08:00 | 
				
					
						|  caoqianming | 300023ff81 | fix: 交接分批bug/加工前不良的bug | 2025-04-16 13:43:38 +08:00 | 
				
					
						|  caoqianming | e0217e86c4 | feat: 添加count_json_from字段及相应逻辑 | 2025-04-16 11:31:23 +08:00 | 
				
					
						|  caoqianming | cd294bc53c | fix: 返修交接后物料状态都变为返修品 | 2025-04-14 23:03:34 +08:00 | 
				
					
						|  caoqianming | 22b6b1305f | fix: handover拆批请选择车间库存 | 2025-04-14 15:19:45 +08:00 | 
				
					
						|  caoqianming | 146fe6641f | feat: get_batch_dag节点排序改动 | 2025-03-31 15:11:43 +08:00 | 
				
					
						|  caoqianming | 3c0e416735 | feat: 支持退料交接 | 2025-03-31 14:17:20 +08:00 | 
				
					
						|  caoqianming | c002017a84 | feat: 工艺路线支持子图逻辑 | 2025-03-27 12:40:09 +08:00 | 
				
					
						|  caoqianming | eaa5d75b99 | feat: 工艺路线校验 | 2025-03-26 16:36:29 +08:00 | 
				
					
						|  caoqianming | 0ddc6692ac | feat: handover 合并可指定现有库存 | 2025-03-26 13:19:30 +08:00 | 
				
					
						|  caoqianming | 0e8cce0669 | feat: get_batch_dag bug2 | 2025-03-25 09:54:57 +08:00 | 
				
					
						|  caoqianming | 11d7e1a772 | feat: get_batch_dag bug | 2025-03-25 09:51:25 +08:00 | 
				
					
						|  caoqianming | 52b96dc740 | fix: batchst g_create bug | 2025-03-25 09:48:17 +08:00 | 
				
					
						|  caoqianming | 6f28056ed4 | feat: 重构以下batchlog | 2025-03-25 09:44:22 +08:00 | 
				
					
						|  caoqianming | b070b312a8 | feat: batchst添加字段以追踪 | 2025-03-24 15:07:50 +08:00 | 
				
					
						|  caoqianming | 5ee10e7cc5 | fix: handover 合批时创建关系链的bug | 2025-03-24 08:41:43 +08:00 | 
				
					
						|  caoqianming | 108116342e | feat: batchlog数据链 | 2025-03-21 14:15:10 +08:00 | 
				
					
						|  caoqianming | 1040e55a48 | feat: wpr增加wpr_from的相关逻辑 | 2025-03-19 14:08:34 +08:00 | 
				
					
						|  caoqianming | fbb18ae990 | feat: 部分bug修复 | 2025-03-09 11:36:17 +08:00 | 
				
					
						|  caoqianming | 456f05a83e | feat: 针对加工前不良的处理2 | 2025-03-07 10:42:27 +08:00 | 
				
					
						|  caoqianming | 330d44e2a3 | feat: 优化一下mlogbdefect的代码结构 | 2025-03-07 10:09:49 +08:00 | 
				
					
						|  caoqianming | 8a715ed136 | feat: wpm revert支持加工强不良 | 2025-03-07 09:20:20 +08:00 | 
				
					
						|  caoqianming | 925bc2027c | feat: mlogb_submit支持加工前不良 | 2025-03-07 08:51:22 +08:00 | 
				
					
						|  caoqianming | 74f0db77ed | feat: Handoverb 支持拆批 | 2025-03-06 14:15:45 +08:00 | 
				
					
						|  caoqianming | 33957216cd | feat: handover recive user可为空 | 2025-03-06 09:01:45 +08:00 | 
				
					
						|  caoqianming | df427d60b2 | fix: mlog ftestwork submit关于合格b类的调整 | 2025-03-04 15:45:56 +08:00 | 
				
					
						|  caoqianming | 2311e1773f | fix: cal_count_notok bug | 2025-02-28 16:49:08 +08:00 | 
				
					
						|  caoqianming | 286a5306e3 | feat: 批次处理做兼容性处理 | 2025-02-28 15:31:38 +08:00 | 
				
					
						|  caoqianming | b2f801deda | feat: 添加mlogbdefect | 2025-02-28 09:14:55 +08:00 | 
				
					
						|  caoqianming | 39eef7d2b4 | fix: material_out.tracking的比较bug | 2025-02-26 12:07:02 +08:00 | 
				
					
						|  caoqianming | 32ba222523 | fix: mlog_submit process获取bug | 2025-02-24 17:29:00 +08:00 | 
				
					
						|  caoqianming | 63004f81ca | fix: mlog_submit tracking获取方式 | 2025-02-24 17:21:28 +08:00 | 
				
					
						|  caoqianming | 14cad30b2e | fix: mlog_submit is_fix bug | 2025-02-24 17:14:33 +08:00 | 
				
					
						|  caoqianming | 2663f20953 | feat: 返修逻辑完成 | 2025-02-24 13:22:43 +08:00 | 
				
					
						|  caoqianming | 0c5cc55b54 | feat: 用于返修的mlog | 2025-02-24 09:39:05 +08:00 | 
				
					
						|  caoqianming | b062d7ef6b | fix: cal_material_count 挪到单独文件里 | 2025-02-18 11:03:22 +08:00 | 
				
					
						|  caoqianming | edac22b701 | feat: cal_material_count 改为同步执行 | 2025-02-18 10:51:31 +08:00 | 
				
					
						|  caoqianming | b3d060b25a | feat: cal_material_count_from_mlog | 2025-02-18 10:42:59 +08:00 | 
				
					
						|  caoqianming | 821b88eb90 | feat: handover submit支持改版 | 2025-02-05 10:55:21 +08:00 | 
				
					
						|  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 |