caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0ff9aa1e5a
								
							
						 | 
						
							
							
								
								feat: 支持个号转批号的配置
							
							
							
							
							
						 | 
						
							2025-04-28 14:43:22 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								8183073026
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
							
							
							合并 
							
						 | 
						
							2025-04-23 16:49:00 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								b66157edb8
								
							
						 | 
						
							
							
								
								feat: model add note
							
							
							
							
							
						 | 
						
							2025-04-23 16:48:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								75503fc7e8
								
							
						 | 
						
							
							
								
								feat: 切分工序切分数量支持1
							
							
							
							
							
						 | 
						
							2025-04-23 10:59:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f12d8ce03c
								
							
						 | 
						
							
							
								
								feat: 工艺步骤返回组合而成的name
							
							
							
							
							
						 | 
						
							2025-04-22 09:08:44 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								1e379d412c
								
							
						 | 
						
							
							
								
								feat: 物料统计数量接口
							
							
							
							
							
						 | 
						
							2025-04-18 14:18:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								896be043f5
								
							
						 | 
						
							
							
								
								feat: 返工可选择不合格品/根据工艺路线决定返工后是合格不合格还是返修完成
							
							
							
							
							
						 | 
						
							2025-04-16 19:14:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b5c21b7472
								
							
						 | 
						
							
							
								
								feat: fmlog添加工艺步骤字段及相应返回数据
							
							
							
							
							
						 | 
						
							2025-04-16 17:59:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7a3c5be4eb
								
							
						 | 
						
							
							
								
								feat: 工艺步骤增加排序字段
							
							
							
							
							
						 | 
						
							2025-04-15 18:14:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d3263236f9
								
							
						 | 
						
							
							
								
								feat: 物料筛选low_inm进行优化
							
							
							
							
							
						 | 
						
							2025-04-15 18:13:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef0414b053
								
							
						 | 
						
							
							
								
								fix: material_out_tracking获取时对None的情况进行处理
							
							
							
							
							
						 | 
						
							2025-04-08 08:38:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b852e9b740
								
							
						 | 
						
							
							
								
								fix: get_dag时matin matout为空时不报错
							
							
							
							
							
						 | 
						
							2025-04-07 10:18:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								61488bb4bd
								
							
						 | 
						
							
							
								
								feat: copy时matin matout不自动生成
							
							
							
							
							
						 | 
						
							2025-04-07 10:13:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9f0a9fc699
								
							
						 | 
						
							
							
								
								fix: 通过指定mat_in/mat_out复制工艺路线 bug2
							
							
							
							
							
						 | 
						
							2025-04-03 16:12:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								885d932fc8
								
							
						 | 
						
							
							
								
								fix: 通过指定mat_in/mat_out复制工艺路线 bug1
							
							
							
							
							
						 | 
						
							2025-04-03 16:11:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b400b13ded
								
							
						 | 
						
							
							
								
								feat: 通过指定mat_in/mat_out复制工艺路线
							
							
							
							
							
						 | 
						
							2025-04-03 14:48:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2923fad2a8
								
							
						 | 
						
							
							
								
								feat: HTML_BASE_URL 前缀统一修改
							
							
							
							
							
						 | 
						
							2025-04-02 11:04:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6dfb5c489a
								
							
						 | 
						
							
							
								
								fix: 该工艺步骤已存在的校验bug
							
							
							
							
							
						 | 
						
							2025-04-01 15:41:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								98d76424c7
								
							
						 | 
						
							
							
								
								feat: route create update 强校验4
							
							
							
							
							
						 | 
						
							2025-03-28 09:20:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c541e58006
								
							
						 | 
						
							
							
								
								feat: route create update 强校验3
							
							
							
							
							
						 | 
						
							2025-03-28 09:07:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b3a34879e
								
							
						 | 
						
							
							
								
								feat: route create update 强校验2
							
							
							
							
							
						 | 
						
							2025-03-28 08:49:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4b9e65ba40
								
							
						 | 
						
							
							
								
								feat: route create update 强校验
							
							
							
							
							
						 | 
						
							2025-03-28 08:48:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								18e5ca2598
								
							
						 | 
						
							
							
								
								fix: routeserializer material_out_tracking错误
							
							
							
							
							
						 | 
						
							2025-03-28 08:29:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ce38115255
								
							
						 | 
						
							
							
								
								fix: validate_and_return_gjson bug
							
							
							
							
							
						 | 
						
							2025-03-27 13:36:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								afe53f3687
								
							
						 | 
						
							
							
								
								fix: _validate_subgraph bug
							
							
							
							
							
						 | 
						
							2025-03-27 12:50:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c002017a84
								
							
						 | 
						
							
							
								
								feat: 工艺路线支持子图逻辑
							
							
							
							
							
						 | 
						
							2025-03-27 12:40:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a31faa0cda
								
							
						 | 
						
							
							
								
								feat: 添加route pack dag显示
							
							
							
							
							
						 | 
						
							2025-03-26 17:23:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d7183f8dd
								
							
						 | 
						
							
							
								
								feat: 简化validate dag 的报错提示
							
							
							
							
							
						 | 
						
							2025-03-26 16:45:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eaa5d75b99
								
							
						 | 
						
							
							
								
								feat: 工艺路线校验
							
							
							
							
							
						 | 
						
							2025-03-26 16:36:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e074b51e3
								
							
						 | 
						
							
							
								
								feat: routepack变更工艺路线的状态
							
							
							
							
							
						 | 
						
							2025-03-26 09:10:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7f2aaf3f86
								
							
						 | 
						
							
							
								
								feat: process添加查询条件
							
							
							
							
							
						 | 
						
							2025-03-25 14:19:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0842806f83
								
							
						 | 
						
							
							
								
								feat: process添加parent字段
							
							
							
							
							
						 | 
						
							2025-03-21 16:33:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								459fc3bbe8
								
							
						 | 
						
							
							
								
								feat: mgroup增加自产和外协字段及相关逻辑
							
							
							
							
							
						 | 
						
							2025-03-19 14:27:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fbb18ae990
								
							
						 | 
						
							
							
								
								feat: 部分bug修复
							
							
							
							
							
						 | 
						
							2025-03-09 11:36:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aa32047bf7
								
							
						 | 
						
							
							
								
								fix: 一些bug调整
							
							
							
							
							
						 | 
						
							2025-03-04 12:33:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1dbb07ddcb
								
							
						 | 
						
							
							
								
								feat: route支持传入material_out_tracking 2
							
							
							
							
							
						 | 
						
							2025-02-26 17:37:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d1c15b0b2e
								
							
						 | 
						
							
							
								
								feat: route支持传入material_out_tracking
							
							
							
							
							
						 | 
						
							2025-02-26 17:36:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2663f20953
								
							
						 | 
						
							
							
								
								feat: 返修逻辑完成
							
							
							
							
							
						 | 
						
							2025-02-24 13:22:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b484a65cd
								
							
						 | 
						
							
							
								
								feat: route添加document字段
							
							
							
							
							
						 | 
						
							2025-02-19 15:35:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5f0d34f9c3
								
							
						 | 
						
							
							
								
								feat: route添加parent字段以支持子步骤
							
							
							
							
							
						 | 
						
							2025-02-19 14:02:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b062d7ef6b
								
							
						 | 
						
							
							
								
								fix: cal_material_count 挪到单独文件里
							
							
							
							
							
						 | 
						
							2025-02-18 11:03:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								56d49b4d26
								
							
						 | 
						
							
							
								
								fix: cal_material_count 只统计合格品
							
							
							
							
							
						 | 
						
							2025-02-18 10:56:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b96846d2c0
								
							
						 | 
						
							
							
								
								feat: 获取可交接到的工段
							
							
							
							
							
						 | 
						
							2025-02-07 10:04:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								77a50ae162
								
							
						 | 
						
							
							
								
								feat: route添加material筛选条件
							
							
							
							
							
						 | 
						
							2025-02-06 16:40:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4927afa9b7
								
							
						 | 
						
							
							
								
								feat: 工艺路线复制按钮
							
							
							
							
							
						 | 
						
							2025-01-20 15:43:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f8c72a1487
								
							
						 | 
						
							
							
								
								feat: 增加routemat表
							
							
							
							
							
						 | 
						
							2025-01-07 09:50:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0a2f671f0f
								
							
						 | 
						
							
							
								
								feat: materialsimpleserializer增加返回字段
							
							
							
							
							
						 | 
						
							2025-01-02 14:50:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d42a485af
								
							
						 | 
						
							
							
								
								feat: 通过给定时间获取班年月日
							
							
							
							
							
						 | 
						
							2024-12-30 10:01:10 +08:00 |