caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9dcc4c0910
								
							
						 | 
						
							
							
								
								feat: 工序增加字段batch_append_equip
							
							
							
							
							
						 | 
						
							2024-07-31 16:30:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19167887d5
								
							
						 | 
						
							
							
								
								fix: mgroup_run_change bug
							
							
							
							
							
						 | 
						
							2024-07-31 15:34:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f5c22d460b
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-29 17:24:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e853fe33b1
								
							
						 | 
						
							
							
								
								feat: gen_material_out 优化并变更物料信息
							
							
							
							
							
						 | 
						
							2024-07-29 17:24:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93d26ec100
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-29 16:21:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a4417e7a4f
								
							
						 | 
						
							
							
								
								fix: gen_material_out bug
							
							
							
							
							
						 | 
						
							2024-07-29 16:20:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebfb96b12e
								
							
						 | 
						
							
							
								
								feat: material delete 时 update 子物料
							
							
							
							
							
						 | 
						
							2024-07-29 16:16:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5cd203e04
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-26 16:57:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								23d452fe2c
								
							
						 | 
						
							
							
								
								fix: mgroup_run_change 再从开到停时再查询一次last_stlog
							
							
							
							
							
						 | 
						
							2024-07-26 10:06:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7fe59518c1
								
							
						 | 
						
							
							
								
								fix: routepack destory bug
							
							
							
							
							
						 | 
						
							2024-07-25 15:40:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								51e6cc041e
								
							
						 | 
						
							
							
								
								fix: bind_routepack bug
							
							
							
							
							
						 | 
						
							2024-07-25 15:25:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3a5d6cac55
								
							
						 | 
						
							
							
								
								feat: route update做限制
							
							
							
							
							
						 | 
						
							2024-07-25 13:34:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6759ea76bf
								
							
						 | 
						
							
							
								
								feat: material增加into_wm字段控制与车间库存交互
							
							
							
							
							
						 | 
						
							2024-07-25 13:27:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c125652de4
								
							
						 | 
						
							
							
								
								feat: material添加单价字段
							
							
							
							
							
						 | 
						
							2024-07-25 13:11:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c31bd32fb5
								
							
						 | 
						
							
							
								
								feat: bind_routepack 添加 t_create_by 字段
							
							
							
							
							
						 | 
						
							2024-07-25 13:06:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								34c0f82ed1
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-24 11:20:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb5ede39f0
								
							
						 | 
						
							
							
								
								feat: process admin 字段展示
							
							
							
							
							
						 | 
						
							2024-07-18 16:46:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d561a0d24b
								
							
						 | 
						
							
							
								
								feat: 日志提交时不合格品存储到车间库存
							
							
							
							
							
						 | 
						
							2024-07-18 11:30:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								876c18149e
								
							
						 | 
						
							
							
								
								feat: route增加返回字段
							
							
							
							
							
						 | 
						
							2024-07-15 17:32:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e904f083a
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-12 10:58:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12fb18205d
								
							
						 | 
						
							
							
								
								feat: 增加route和routepack查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 13:28:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d522a1fd4
								
							
						 | 
						
							
							
								
								feat: route增加batch_bind字段/mlogbin接口
							
							
							
							
							
						 | 
						
							2024-07-11 11:26:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f5edc041c
								
							
						 | 
						
							
							
								
								feat: mlog init
							
							
							
							
							
						 | 
						
							2024-07-10 15:32:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8872d63aae
								
							
						 | 
						
							
							
								
								fix: 优化cal_material_count
							
							
							
							
							
						 | 
						
							2024-07-08 08:57:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b18f39d95d
								
							
						 | 
						
							
							
								
								fix: routepack serializer validate  bug
							
							
							
							
							
						 | 
						
							2024-07-08 08:25:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92903e7014
								
							
						 | 
						
							
							
								
								feat: cal_material_count 重构
							
							
							
							
							
						 | 
						
							2024-07-04 16:23:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								511b149290
								
							
						 | 
						
							
							
								
								feat: 增加routepack返回信息
							
							
							
							
							
						 | 
						
							2024-07-04 10:25:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7381a65c24
								
							
						 | 
						
							
							
								
								feat: 重新梳理计算物料总数量
							
							
							
							
							
						 | 
						
							2024-07-04 10:04:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								436719d9ff
								
							
						 | 
						
							
							
								
								feat: 依据routepack进行任务派发
							
							
							
							
							
						 | 
						
							2024-07-03 16:46:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								439c8a0f88
								
							
						 | 
						
							
							
								
								feat: routepack增加返回信息
							
							
							
							
							
						 | 
						
							2024-07-03 13:02:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bad338ba67
								
							
						 | 
						
							
							
								
								feat: 增加routepack_ticket_change方法
							
							
							
							
							
						 | 
						
							2024-07-02 17:09:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1161c4391
								
							
						 | 
						
							
							
								
								feat: routepack bind ticket
							
							
							
							
							
						 | 
						
							2024-07-02 16:40:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b2664ca81b
								
							
						 | 
						
							
							
								
								feat: 修改route serializer
							
							
							
							
							
						 | 
						
							2024-07-02 15:44:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								15c4e195f3
								
							
						 | 
						
							
							
								
								feat: 添加routepack表
							
							
							
							
							
						 | 
						
							2024-07-02 14:12:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d579a7358d
								
							
						 | 
						
							
							
								
								feat: 根据光芯需求对wpm做兼容性处理
							
							
							
							
							
						 | 
						
							2024-07-01 10:07:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2bb860f8dd
								
							
						 | 
						
							
							
								
								feat: 添加工时字段
							
							
							
							
							
						 | 
						
							2024-06-21 14:31:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7c0df5f804
								
							
						 | 
						
							
							
								
								fix: raise 工艺路线未配置
							
							
							
							
							
						 | 
						
							2024-06-21 11:15:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								458385c0f6
								
							
						 | 
						
							
							
								
								feat: material增加count_mb字段
							
							
							
							
							
						 | 
						
							2024-05-28 14:29:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b4b3d6eadc
								
							
						 | 
						
							
							
								
								feat: hour计数改为sec计数 步骤2
							
							
							
							
							
						 | 
						
							2024-05-15 10:31:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a3f5e48b8c
								
							
						 | 
						
							
							
								
								feat: hour计数改为sec计数
							
							
							
							
							
						 | 
						
							2024-05-15 10:06:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								52d9407346
								
							
						 | 
						
							
							
								
								feat: 班次表增加排序
							
							
							
							
							
						 | 
						
							2024-05-13 09:39:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02a8693a65
								
							
						 | 
						
							
							
								
								fix: cal_enstat前调用一下get_total_hour_now
							
							
							
							
							
						 | 
						
							2024-05-07 09:58:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d720dc9c9b
								
							
						 | 
						
							
							
								
								fix: mgroup is_running字段更改2
							
							
							
							
							
						 | 
						
							2024-04-29 10:17:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fa6d6da1d2
								
							
						 | 
						
							
							
								
								fix: mgroup is_running字段更改
							
							
							
							
							
						 | 
						
							2024-04-29 10:17:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e56fa7390
								
							
						 | 
						
							
							
								
								feat: 物料删除时进行校验和相应的数据矫正
							
							
							
							
							
						 | 
						
							2024-04-19 14:32:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd1897f6f6
								
							
						 | 
						
							
							
								
								feat: correct_material_cate
							
							
							
							
							
						 | 
						
							2024-04-11 11:29:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3c1319d48f
								
							
						 | 
						
							
							
								
								feat: material增加search字段
							
							
							
							
							
						 | 
						
							2024-04-07 19:15:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3eb7b76095
								
							
						 | 
						
							
							
								
								fix: material create指定所到工序校验
							
							
							
							
							
						 | 
						
							2024-04-02 16:12:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e4298873f
								
							
						 | 
						
							
							
								
								feat: 增加周预估消耗量字段
							
							
							
							
							
						 | 
						
							2024-03-20 17:39:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5aab22e9d9
								
							
						 | 
						
							
							
								
								fix: 工段删除同时更新route
							
							
							
							
							
						 | 
						
							2024-03-04 14:22:22 +08:00 |