caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								26172b767f
								
							
						 | 
						
							
							
								
								feat: utask mtask 增加筛选条件
							
							
							
							
							
						 | 
						
							2024-08-22 12:45:53 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4960ee7fac
								
							
						 | 
						
							
							
								
								feat: 增加水泥包装
							
							
							
							
							
						 | 
						
							2024-08-21 17:55:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								33a7e7320b
								
							
						 | 
						
							
							
								
								fix: daoru_material 增加校验
							
							
							
							
							
						 | 
						
							2024-08-21 14:12:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a48ee63679
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-21 09:27:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a277eb954
								
							
						 | 
						
							
							
								
								feat: base 可使用跳板机转发错误邮件
							
							
							
							
							
						 | 
						
							2024-08-21 09:27:37 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5a35ea6028
								
							
						 | 
						
							
							
								
								feat: 增加出厂水泥 和 计算
							
							
							
							
							
						 | 
						
							2024-08-21 08:59:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								bc38196f68
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-20 14:43:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								206e33d091
								
							
						 | 
						
							
							
								
								fix :apps\enm filter
							
							
							
							
							
						 | 
						
							2024-08-20 14:43:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1e667e69ac
								
							
						 | 
						
							
							
								
								feat: daoru_material 增加校验
							
							
							
							
							
						 | 
						
							2024-08-20 14:39:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								561c2a0c31
								
							
						 | 
						
							
							
								
								feat: materialbatch也不进行物理删除
							
							
							
							
							
						 | 
						
							2024-08-20 14:25:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								592e34c07e
								
							
						 | 
						
							
							
								
								refector: mgroup_on_change时创建stlog优化
							
							
							
							
							
						 | 
						
							2024-08-20 08:56:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d102f01c26
								
							
						 | 
						
							
							
								
								feat: 增加check_opl_work_imgs
							
							
							
							
							
						 | 
						
							2024-08-19 16:51:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e2d652f9ef
								
							
						 | 
						
							
							
								
								fix: get_area_from_point 获取cache bug
							
							
							
							
							
						 | 
						
							2024-08-19 16:17:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								28958b405c
								
							
						 | 
						
							
							
								
								fix: check_opl_audit_imgs bug
							
							
							
							
							
						 | 
						
							2024-08-19 13:41:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ce56d3f34
								
							
						 | 
						
							
							
								
								feat: ftestwork增加关联仓库库存字段
							
							
							
							
							
						 | 
						
							2024-08-19 11:35:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c00f59f8d9
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-19 08:59:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								808a1c825d
								
							
						 | 
						
							
							
								
								feat: check_opl_audit_imgs raise
							
							
							
							
							
						 | 
						
							2024-08-19 08:59:24 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c3b62f1831
								
							
						 | 
						
							
							
								
								fix: equip_elec_data 计算
							
							
							
							
							
						 | 
						
							2024-08-16 18:45:31 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								62fb5aa54c
								
							
						 | 
						
							
							
								
								feat: sflog teamchange cal_quastat_sflog
							
							
							
							
							
						 | 
						
							2024-08-16 18:45:11 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7a780ebd0d
								
							
						 | 
						
							
							
								
								fix: set coefficient
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cbce4998d9
								
							
						 | 
						
							
							
								
								feat: mpoint stat添加筛选条件
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:30 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a09343322e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4cdc48e549
								
							
						 | 
						
							
							
								
								fix: equip_elec_data 计算
							
							
							
							
							
						 | 
						
							2024-08-16 18:44:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c8db1ad29b
								
							
						 | 
						
							
							
								
								feat: base handle_parent报错调整
							
							
							
							
							
						 | 
						
							2024-08-15 15:53:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0aa0b051e9
								
							
						 | 
						
							
							
								
								fix: em ecate serializer 优化
							
							
							
							
							
						 | 
						
							2024-08-15 15:53:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c71624def0
								
							
						 | 
						
							
							
								
								fix: em serializer 优化
							
							
							
							
							
						 | 
						
							2024-08-15 11:36:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3976e3834e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-15 11:17:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb46d9bfc6
								
							
						 | 
						
							
							
								
								fix: ecate code 必填校验
							
							
							
							
							
						 | 
						
							2024-08-15 11:17:48 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								71dd916dbf
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-15 10:47:47 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								13fb91e83a
								
							
						 | 
						
							
							
								
								fix:enm/service 修改稿last_val
							
							
							
							
							
						 | 
						
							2024-08-15 10:47:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7028fd31ee
								
							
						 | 
						
							
							
								
								feat: wmaterial增加state字段并进行相应处理2
							
							
							
							
							
						 | 
						
							2024-08-15 10:43:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba6c30a745
								
							
						 | 
						
							
							
								
								feat: wmaterial增加state字段并进行相应处理
							
							
							
							
							
						 | 
						
							2024-08-15 10:41:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								824dacf78d
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-15 09:47:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bcafe94e71
								
							
						 | 
						
							
							
								
								fix: base validate_password支持.号
							
							
							
							
							
						 | 
						
							2024-08-15 09:47:04 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f52b501aa1
								
							
						 | 
						
							
							
								
								feat : enm/service 增加测点采集系数
							
							
							
							
							
						 | 
						
							2024-08-15 09:19:19 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								29ba9647b4
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-14 18:33:05 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								6a20445ddd
								
							
						 | 
						
							
							
								
								fix : em/service 修改update_time
							
							
							
							
							
						 | 
						
							2024-08-14 18:33:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								42769e3abe
								
							
						 | 
						
							
							
								
								fix: mioitempurin bug
							
							
							
							
							
						 | 
						
							2024-08-14 18:17:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								db792a2de5
								
							
						 | 
						
							
							
								
								feat: ftestwork增加检验人及不合格项
							
							
							
							
							
						 | 
						
							2024-08-14 18:07:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a9acf6d187
								
							
						 | 
						
							
							
								
								feat: 物料导入模板增加编号列
							
							
							
							
							
						 | 
						
							2024-08-14 17:42:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								27c60ff973
								
							
						 | 
						
							
							
								
								feat: mio pur test 支持count_sampling自填
							
							
							
							
							
						 | 
						
							2024-08-13 17:28:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3bb3834c04
								
							
						 | 
						
							
							
								
								fix: miolist pu_order_number
							
							
							
							
							
						 | 
						
							2024-08-13 17:11:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cc5dcc9685
								
							
						 | 
						
							
							
								
								fix: gen_material_out bug
							
							
							
							
							
						 | 
						
							2024-08-13 16:29:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								58ddc8dd0b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-13 15:06:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad1d0680b1
								
							
						 | 
						
							
							
								
								feat: mlogbupdate 校验
							
							
							
							
							
						 | 
						
							2024-08-13 15:06:07 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								779bd763a1
								
							
						 | 
						
							
							
								
								fix : em/service 修改运行设备更新状态 根据最后一次时间修改
							
							
							
							
							
						 | 
						
							2024-08-13 15:00:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bbac19c791
								
							
						 | 
						
							
							
								
								feat: notok option 其他
							
							
							
							
							
						 | 
						
							2024-08-13 14:47:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bfad89bf2f
								
							
						 | 
						
							
							
								
								feat: ftestwork_submit增加抽检逻辑
							
							
							
							
							
						 | 
						
							2024-08-13 14:31:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								23dd745192
								
							
						 | 
						
							
							
								
								feat: ftestwork增加查询条件
							
							
							
							
							
						 | 
						
							2024-08-13 13:59:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0a0b6b72ba
								
							
						 | 
						
							
							
								
								feat: ftestworkcreate type2处理
							
							
							
							
							
						 | 
						
							2024-08-13 13:42:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8e7e60c600
								
							
						 | 
						
							
							
								
								fix: ftestwork_submit bug2
							
							
							
							
							
						 | 
						
							2024-08-12 17:36:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e6e4a61289
								
							
						 | 
						
							
							
								
								fix: ftestwork_submit bug
							
							
							
							
							
						 | 
						
							2024-08-12 17:31:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								096ad540d4
								
							
						 | 
						
							
							
								
								feat: qm batch增加长度
							
							
							
							
							
						 | 
						
							2024-08-12 17:21:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f6f84533d1
								
							
						 | 
						
							
							
								
								fix: notokoption 修改3
							
							
							
							
							
						 | 
						
							2024-08-12 17:18:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								38f052c015
								
							
						 | 
						
							
							
								
								fix: notokoption 修改2
							
							
							
							
							
						 | 
						
							2024-08-12 17:15:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cfbd79a206
								
							
						 | 
						
							
							
								
								fix: notokoption 修改
							
							
							
							
							
						 | 
						
							2024-08-12 17:12:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								274a0df0eb
								
							
						 | 
						
							
							
								
								feat: 检验工作增加查询条件
							
							
							
							
							
						 | 
						
							2024-08-12 16:57:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b9dc211df3
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-12 16:46:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5fc38eabaa
								
							
						 | 
						
							
							
								
								fix: notokoption values
							
							
							
							
							
						 | 
						
							2024-08-12 16:46:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7664dfefa4
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-12 16:04:57 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								47acf9ceb4
								
							
						 | 
						
							
							
								
								fix: enm/service 修改service
							
							
							
							
							
						 | 
						
							2024-08-12 16:04:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba2368f59b
								
							
						 | 
						
							
							
								
								feat: handover增加筛选条件
							
							
							
							
							
						 | 
						
							2024-08-12 15:05:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c5dfb325dc
								
							
						 | 
						
							
							
								
								feat: handover 增加查询条件
							
							
							
							
							
						 | 
						
							2024-08-12 14:39:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2108b1c33a
								
							
						 | 
						
							
							
								
								feat: wmaterial增加查询条件
							
							
							
							
							
						 | 
						
							2024-08-12 14:35:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								50c3efe39b
								
							
						 | 
						
							
							
								
								feat: ftestwork提交并更新车间库存
							
							
							
							
							
						 | 
						
							2024-08-12 12:58:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5821b6b7df
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-12 11:07:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								562372b0b9
								
							
						 | 
						
							
							
								
								feat: mlog添加不合格项目
							
							
							
							
							
						 | 
						
							2024-08-12 11:07:29 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								345588b611
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-12 10:32:39 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a6d5604acb
								
							
						 | 
						
							
							
								
								fix: em.service.py 更改状态变动
							
							
							
							
							
						 | 
						
							2024-08-12 10:32:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae1099cbec
								
							
						 | 
						
							
							
								
								fix: base wf 工段的字段获取处理人时没找到返回0
							
							
							
							
							
						 | 
						
							2024-08-09 15:19:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a42cf34f0
								
							
						 | 
						
							
							
								
								feat: wmaterial增加count_xtest/handover增加检验交接
							
							
							
							
							
						 | 
						
							2024-08-09 15:09:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a2b52e95a5
								
							
						 | 
						
							
							
								
								doc: drain view swagger 变动3
							
							
							
							
							
						 | 
						
							2024-08-08 15:07:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fff6c76cc6
								
							
						 | 
						
							
							
								
								doc: drain view swagger 变动2
							
							
							
							
							
						 | 
						
							2024-08-08 15:03:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								758d403f5d
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-08 14:55:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f1aa402383
								
							
						 | 
						
							
							
								
								doc: drain view swagger 变动
							
							
							
							
							
						 | 
						
							2024-08-08 14:55:26 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								169a31da5a
								
							
						 | 
						
							
							
								
								fix : apps/em /enm  更改缓存存储
							
							
							
							
							
						 | 
						
							2024-08-08 14:52:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e2c44f06c4
								
							
						 | 
						
							
							
								
								feat: drain serializer增加返回序列化
							
							
							
							
							
						 | 
						
							2024-08-08 14:45:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3f32390fb2
								
							
						 | 
						
							
							
								
								feat: 自动生成物料时延续cate
							
							
							
							
							
						 | 
						
							2024-08-08 09:12:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1781dba630
								
							
						 | 
						
							
							
								
								feat: 更改testitem field type
							
							
							
							
							
						 | 
						
							2024-08-07 15:43:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c64387e5bc
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-08-07 15:26:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1418141a67
								
							
						 | 
						
							
							
								
								feat: ftestwork返回material_cate
							
							
							
							
							
						 | 
						
							2024-08-07 15:25:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fe61081ec7
								
							
						 | 
						
							
							
								
								feat: ftestworkcreateupdate 支持更改
							
							
							
							
							
						 | 
						
							2024-08-07 14:52:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9136f7e87f
								
							
						 | 
						
							
							
								
								feat: 增加material cate 接口
							
							
							
							
							
						 | 
						
							2024-08-07 14:52:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab9b1b7f27
								
							
						 | 
						
							
							
								
								feat: 增加testitem筛选条件
							
							
							
							
							
						 | 
						
							2024-08-07 14:51:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								239f01a4ca
								
							
						 | 
						
							
							
								
								feat: qm添加字段2
							
							
							
							
							
						 | 
						
							2024-08-07 14:51:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8dceb03a3
								
							
						 | 
						
							
							
								
								feat: qm添加字段
							
							
							
							
							
						 | 
						
							2024-08-07 14:51:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								15043bbb49
								
							
						 | 
						
							
							
								
								feat: ftestworkcreateupdate 支持更改
							
							
							
							
							
						 | 
						
							2024-08-07 11:07:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								211fd1ac77
								
							
						 | 
						
							
							
								
								feat: 增加material cate 接口
							
							
							
							
							
						 | 
						
							2024-08-07 10:54:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cf7007f8b8
								
							
						 | 
						
							
							
								
								feat: 增加testitem筛选条件
							
							
							
							
							
						 | 
						
							2024-08-07 10:18:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								be8fbec24e
								
							
						 | 
						
							
							
								
								feat: edu添加字段
							
							
							
							
							
						 | 
						
							2024-08-07 10:01:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								632c36edd0
								
							
						 | 
						
							
							
								
								feat: qm添加字段2
							
							
							
							
							
						 | 
						
							2024-08-07 10:01:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8aabf1fca0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-07 09:46:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								549ef24c70
								
							
						 | 
						
							
							
								
								feat: qm添加字段
							
							
							
							
							
						 | 
						
							2024-08-07 09:46:17 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								6bdc5a04aa
								
							
						 | 
						
							
							
								
								fix :enm service.py  修改缓存不存在直接返回
							
							
							
							
							
						 | 
						
							2024-08-07 09:30:56 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								314b614c53
								
							
						 | 
						
							
							
								
								fix: cal_exp_duration_sec 还需要更新时间为None3
							
							
							
							
							
						 | 
						
							2024-08-06 19:00:38 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								1fe8c7ae76
								
							
						 | 
						
							
							
								
								feat: cal_exp_duration_sec 还需要更新时间为None2
							
							
							
							
							
						 | 
						
							2024-08-06 18:43:20 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5461fb5f55
								
							
						 | 
						
							
							
								
								feat: cal_exp_duration_sec 还需要更新时间为None的
							
							
							
							
							
						 | 
						
							2024-08-06 18:40:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f97c99bf8a
								
							
						 | 
						
							
							
								
								fix: cal_mpointstat_hour对于is_unit的计算错误
							
							
							
							
							
						 | 
						
							2024-08-06 17:52:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								91e9ac38f6
								
							
						 | 
						
							
							
								
								fix: db_insert_mplogx_batch bug
							
							
							
							
							
						 | 
						
							2024-08-06 17:22:28 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								679165cbd0
								
							
						 | 
						
							
							
								
								feat: db_insert_mplogx 添加限制参数
							
							
							
							
							
						 | 
						
							2024-08-06 17:12:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a24666b795
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-06 16:11:32 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								4d498f99a3
								
							
						 | 
						
							
							
								
								fix: enm/task 水泥批号插入
							
							
							
							
							
						 | 
						
							2024-08-06 16:11:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b2abf0128a
								
							
						 | 
						
							
							
								
								feat: pum sam 增加检索条件
							
							
							
							
							
						 | 
						
							2024-08-06 12:24:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								06d2c5a096
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-06 12:21:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								abccaf4c78
								
							
						 | 
						
							
							
								
								feat: pum sam 增加检索条件
							
							
							
							
							
						 | 
						
							2024-08-06 12:21:08 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								50cdbf9428
								
							
						 | 
						
							
							
								
								fix :enm/task 修改数据库连接
							
							
							
							
							
						 | 
						
							2024-08-06 10:53:01 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f09a8fe4cd
								
							
						 | 
						
							
							
								
								add : db_ins_mplogx 增加测点插入数据库
							
							
							
							
							
						 | 
						
							2024-08-06 10:01:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								341a681d00
								
							
						 | 
						
							
							
								
								fix: get_sflog 提前起始时间
							
							
							
							
							
						 | 
						
							2024-08-06 09:54:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f1a76cba74
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-06 09:45:10 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								73176847e0
								
							
						 | 
						
							
							
								
								feat: make_sflogs_simple 扩大范围
							
							
							
							
							
						 | 
						
							2024-08-06 09:44:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								42c1386efd
								
							
						 | 
						
							
							
								
								feat: sflogexp增加返回信息
							
							
							
							
							
						 | 
						
							2024-08-06 08:29:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6931c49b3b
								
							
						 | 
						
							
							
								
								feat: oplserializer 添加返回信息
							
							
							
							
							
						 | 
						
							2024-08-04 20:28:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fe97d36f54
								
							
						 | 
						
							
							
								
								feat: opl添加字段
							
							
							
							
							
						 | 
						
							2024-08-04 18:50:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1003e0aea7
								
							
						 | 
						
							
							
								
								feat: route添加filter
							
							
							
							
							
						 | 
						
							2024-08-02 21:13:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c58e34a7fd
								
							
						 | 
						
							
							
								
								feat: route添加filter
							
							
							
							
							
						 | 
						
							2024-08-02 21:00:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fa56d61ffc
								
							
						 | 
						
							
							
								
								feat: 修改nowx使用aware
							
							
							
							
							
						 | 
						
							2024-08-02 16:39:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4604809bf4
								
							
						 | 
						
							
							
								
								feat: bind_routepack 时取消第一步的批次校验
							
							
							
							
							
						 | 
						
							2024-08-02 13:52:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dc7e6f9d03
								
							
						 | 
						
							
							
								
								fix: get_total_sec_now及cal_exp_duration_sec 添加now参数
							
							
							
							
							
						 | 
						
							2024-08-02 13:50:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								313e9ed1cd
								
							
						 | 
						
							
							
								
								fix: routeserializer优化routepack process校验3
							
							
							
							
							
						 | 
						
							2024-08-02 11:14:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f5482285f2
								
							
						 | 
						
							
							
								
								fix: routeserializer优化routepack process校验2
							
							
							
							
							
						 | 
						
							2024-08-02 11:11:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								757bf89d71
								
							
						 | 
						
							
							
								
								fix: enstat hour_s查询时按真实事件查询
							
							
							
							
							
						 | 
						
							2024-08-02 10:50:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								adffac48ad
								
							
						 | 
						
							
							
								
								fix: routeserializer优化routepack process校验
							
							
							
							
							
						 | 
						
							2024-08-02 09:13:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aa42ba6e3f
								
							
						 | 
						
							
							
								
								feat: submit时校验消耗和产出是否已经填写
							
							
							
							
							
						 | 
						
							2024-08-01 18:12:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								071558af8d
								
							
						 | 
						
							
							
								
								feat: mlogbin 校验记录已存在
							
							
							
							
							
						 | 
						
							2024-08-01 17:32:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cbedb81b0e
								
							
						 | 
						
							
							
								
								fix: mlogbin 不合格物料校验去除
							
							
							
							
							
						 | 
						
							2024-08-01 16:54:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c293dd068f
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-08-01 15:55:22 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								261ed40d94
								
							
						 | 
						
							
							
								
								fix: fim.py cost_unit 字段
							
							
							
							
							
						 | 
						
							2024-08-01 15:55:19 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								9ff4f21f9a
								
							
						 | 
						
							
							
								
								fix: mlogbin create时生成编号变更3
							
							
							
							
							
						 | 
						
							2024-08-01 09:59:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								99ab4e1957
								
							
						 | 
						
							
							
								
								feat: mlogbin create时生成编号变更2
							
							
							
							
							
						 | 
						
							2024-08-01 09:20:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3f62e8709f
								
							
						 | 
						
							
							
								
								feat: 采购计划和订单增加单价和总价
							
							
							
							
							
						 | 
						
							2024-07-31 19:18:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9e26f416a5
								
							
						 | 
						
							
							
								
								feat: 变更物料单价字段为小数
							
							
							
							
							
						 | 
						
							2024-07-31 19:18:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a589fec67e
								
							
						 | 
						
							
							
								
								feat: enstat2添加统计字段
							
							
							
							
							
						 | 
						
							2024-07-31 16:53:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0813a3b568
								
							
						 | 
						
							
							
								
								feat: mlogbin create时生成编号变更
							
							
							
							
							
						 | 
						
							2024-07-31 16:33:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9dcc4c0910
								
							
						 | 
						
							
							
								
								feat: 工序增加字段batch_append_equip
							
							
							
							
							
						 | 
						
							2024-07-31 16:30:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93b1a80cfb
								
							
						 | 
						
							
							
								
								feat: 供应商增加字段number
							
							
							
							
							
						 | 
						
							2024-07-31 16:29:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								821d7613d1
								
							
						 | 
						
							
							
								
								fix: get_sflog 增加 sflog创建范围
							
							
							
							
							
						 | 
						
							2024-07-31 15:55:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19167887d5
								
							
						 | 
						
							
							
								
								fix: mgroup_run_change bug
							
							
							
							
							
						 | 
						
							2024-07-31 15:34:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bea83f93d5
								
							
						 | 
						
							
							
								
								fix: 批次号追加设备编号
							
							
							
							
							
						 | 
						
							2024-07-31 14:30:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ad0cf6498
								
							
						 | 
						
							
							
								
								feat: 批次号追加number
							
							
							
							
							
						 | 
						
							2024-07-31 14:27:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								166ae8b12c
								
							
						 | 
						
							
							
								
								feat: base user增加筛选条件
							
							
							
							
							
						 | 
						
							2024-07-31 13:43:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								321be50323
								
							
						 | 
						
							
							
								
								feat: MaterialBatchSerializer 改变material_name
							
							
							
							
							
						 | 
						
							2024-07-30 17:06:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3a276c634
								
							
						 | 
						
							
							
								
								feat: MaterialBatchSerializer 改变material_name
							
							
							
							
							
						 | 
						
							2024-07-30 17:05:55 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								181a4e3a5f
								
							
						 | 
						
							
							
								
								fix: HandoverSerializer recive_mgroup 校验bug
							
							
							
							
							
						 | 
						
							2024-07-30 15:11:23 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ebf6f739ca
								
							
						 | 
						
							
							
								
								feat: 出入库添加工段逻辑
							
							
							
							
							
						 | 
						
							2024-07-30 13:24:21 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								a587e570f0
								
							
						 | 
						
							
							
								
								feat: mio 添加 mgroup字段
							
							
							
							
							
						 | 
						
							2024-07-30 11:40:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								893781ec7f
								
							
						 | 
						
							
							
								
								feat: db_insert_mplogx不用thread
							
							
							
							
							
						 | 
						
							2024-07-30 10:01:42 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								76c14460f5
								
							
						 | 
						
							
							
								
								fix: base handle_parent 错误
							
							
							
							
							
						 | 
						
							2024-07-29 11:12:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								effffe34bf
								
							
						 | 
						
							
							
								
								fix: base handle_parent 错误
							
							
							
							
							
						 | 
						
							2024-07-29 11:12:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92c6939a9c
								
							
						 | 
						
							
							
								
								refactor: base 更新permission 描述
							
							
							
							
							
						 | 
						
							2024-07-29 10:32:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								38eaefe3bb
								
							
						 | 
						
							
							
								
								refactor: base 更新permission 描述
							
							
							
							
							
						 | 
						
							2024-07-29 10:31:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								05b46b5351
								
							
						 | 
						
							
							
								
								fix: EnvData get_or_create 避免报错
							
							
							
							
							
						 | 
						
							2024-07-29 08:38:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b428f36014
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-26 17:41:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7f935dbf57
								
							
						 | 
						
							
							
								
								fix: datarecordviewset 继承错误
							
							
							
							
							
						 | 
						
							2024-07-26 17:40:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e78cdca9ae
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-26 17:33:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02a9445596
								
							
						 | 
						
							
							
								
								feat: 添加dataset接口
							
							
							
							
							
						 | 
						
							2024-07-26 17:32:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae55a62ced
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-26 17:19:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2a225bdc86
								
							
						 | 
						
							
							
								
								feat: 添加定时执行bi的task和记录表
							
							
							
							
							
						 | 
						
							2024-07-26 17:18:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5cd203e04
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-26 16:57:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c27ffd7dd
								
							
						 | 
						
							
							
								
								feat: testitem 增删改查
							
							
							
							
							
						 | 
						
							2024-07-26 16:56:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								23d452fe2c
								
							
						 | 
						
							
							
								
								fix: mgroup_run_change 再从开到停时再查询一次last_stlog
							
							
							
							
							
						 | 
						
							2024-07-26 10:06:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b6d4b38103
								
							
						 | 
						
							
							
								
								fix: base get_ticket_state_participant_info  通过工单字段获取处理人错误2
							
							
							
							
							
						 | 
						
							2024-07-26 09:07:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7df2cbba1e
								
							
						 | 
						
							
							
								
								feat: base 处理父级引用parent_link bug
							
							
							
							
							
						 | 
						
							2024-07-26 09:04:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cab46ea229
								
							
						 | 
						
							
							
								
								fix: base handle_parent时要处理所有相关的父子关系
							
							
							
							
							
						 | 
						
							2024-07-26 09:03:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eb81c2db2d
								
							
						 | 
						
							
							
								
								fix: base get_ticket_state_participant_info  通过工单字段获取处理人错误
							
							
							
							
							
						 | 
						
							2024-07-26 09:03:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								370cda6a41
								
							
						 | 
						
							
							
								
								feat: base permission增加搜索字段
							
							
							
							
							
						 | 
						
							2024-07-26 09:03:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								52ce49a9f3
								
							
						 | 
						
							
							
								
								feat: base 处理父级引用parent_link bug
							
							
							
							
							
						 | 
						
							2024-07-26 08:52:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f4c04cdf90
								
							
						 | 
						
							
							
								
								fix: base handle_parent时要处理所有相关的父子关系
							
							
							
							
							
						 | 
						
							2024-07-25 18:40:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								db95b27b5c
								
							
						 | 
						
							
							
								
								fix: base get_ticket_state_participant_info  通过工单字段获取处理人错误2
							
							
							
							
							
						 | 
						
							2024-07-25 16:00:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7fe59518c1
								
							
						 | 
						
							
							
								
								fix: routepack destory bug
							
							
							
							
							
						 | 
						
							2024-07-25 15:40:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6a43dcfd0d
								
							
						 | 
						
							
							
								
								fix: base get_ticket_state_participant_info  通过工单字段获取处理人错误
							
							
							
							
							
						 | 
						
							2024-07-25 15:38:25 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								71dbd6c572
								
							
						 | 
						
							
							
								
								feat: handover 添加返回信息
							
							
							
							
							
						 | 
						
							2024-07-25 11:31:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b0004ba12e
								
							
						 | 
						
							
							
								
								feat: mpointcache 存库时若测点不存在删除缓存
							
							
							
							
							
						 | 
						
							2024-07-25 10:51:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								391d9b137d
								
							
						 | 
						
							
							
								
								feat: handover filter增加筛选条件
							
							
							
							
							
						 | 
						
							2024-07-25 08:34:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								47f4222f03
								
							
						 | 
						
							
							
								
								fix: mlog submit wm belong_dept 缺失
							
							
							
							
							
						 | 
						
							2024-07-24 16:43:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3b489fdd52
								
							
						 | 
						
							
							
								
								feat: base permission增加搜索字段
							
							
							
							
							
						 | 
						
							2024-07-24 14:28:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da2e880d66
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-24 13:50:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b98227b032
								
							
						 | 
						
							
							
								
								feat: FtestWorkCreateUpdate 可更新抽检和合格数量
							
							
							
							
							
						 | 
						
							2024-07-24 13:50:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7af77c484b
								
							
						 | 
						
							
							
								
								fix: order destory bug
							
							
							
							
							
						 | 
						
							2024-07-24 13:44:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								34c0f82ed1
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-24 11:20:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3f32932d8
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-24 10:55:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								94c492166d
								
							
						 | 
						
							
							
								
								fix: orderviewset filter属性错误
							
							
							
							
							
						 | 
						
							2024-07-24 10:54:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4bbe973071
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-24 10:52:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e1f94b24c
								
							
						 | 
						
							
							
								
								feat: order增加filter/miosale增加校验
							
							
							
							
							
						 | 
						
							2024-07-24 10:51:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0a1679d8a2
								
							
						 | 
						
							
							
								
								Merge branch 'erp1'
							
							
							
							
							
						 | 
						
							2024-07-23 13:02:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0e26b2188e
								
							
						 | 
						
							
							
								
								feat: 增加ftestwork count_ok 字段
							
							
							
							
							
						 | 
						
							2024-07-23 12:56:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c068c47bc7
								
							
						 | 
						
							
							
								
								feat: 增加外协生产日志功能
							
							
							
							
							
						 | 
						
							2024-07-23 10:11:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								caf83b7e0f
								
							
						 | 
						
							
							
								
								feat: 供应商里增加外协字段
							
							
							
							
							
						 | 
						
							2024-07-23 09:42:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da8e381b3f
								
							
						 | 
						
							
							
								
								doc: 添加NotokOption注释
							
							
							
							
							
						 | 
						
							2024-07-23 08:39:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0ab6e0bc72
								
							
						 | 
						
							
							
								
								feat: 增加不合格项接口
							
							
							
							
							
						 | 
						
							2024-07-22 17:58:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec0df66542
								
							
						 | 
						
							
							
								
								feat: 完成返工交接2
							
							
							
							
							
						 | 
						
							2024-07-22 15:32:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c67675ca7
								
							
						 | 
						
							
							
								
								feat: 完成返工交接
							
							
							
							
							
						 | 
						
							2024-07-22 15:26:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19cac7729a
								
							
						 | 
						
							
							
								
								feat: handoverserializer type设置为非必填
							
							
							
							
							
						 | 
						
							2024-07-19 10:24:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92fc1e9e0a
								
							
						 | 
						
							
							
								
								feat: 添加返修交接支持
							
							
							
							
							
						 | 
						
							2024-07-19 10:04:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cb5ede39f0
								
							
						 | 
						
							
							
								
								feat: process admin 字段展示
							
							
							
							
							
						 | 
						
							2024-07-18 16:46:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a3e51a84db
								
							
						 | 
						
							
							
								
								refector: HandoverSerializer validate 优化
							
							
							
							
							
						 | 
						
							2024-07-18 16:32:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								30be6dc291
								
							
						 | 
						
							
							
								
								fix: mlogchange 改 mlogupdate
							
							
							
							
							
						 | 
						
							2024-07-18 15:58:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fd2f2a009
								
							
						 | 
						
							
							
								
								fix: MyThread 调用错误
							
							
							
							
							
						 | 
						
							2024-07-18 15:36:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								950b017073
								
							
						 | 
						
							
							
								
								feat: mlog_submit 时校验handle_date
							
							
							
							
							
						 | 
						
							2024-07-18 14:48:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9b3cbe75ae
								
							
						 | 
						
							
							
								
								feat: submit时校验mlogbout
							
							
							
							
							
						 | 
						
							2024-07-18 14:48:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6778af3f07
								
							
						 | 
						
							
							
								
								fix: 增加mlogb.update权限标识
							
							
							
							
							
						 | 
						
							2024-07-18 14:31:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8d75f3f251
								
							
						 | 
						
							
							
								
								feat: 增加mlogb.update权限标识
							
							
							
							
							
						 | 
						
							2024-07-18 14:26:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6a51fd1177
								
							
						 | 
						
							
							
								
								feat: 添加筛选条件和mlogbin 校验
							
							
							
							
							
						 | 
						
							2024-07-18 13:46:16 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								83ec822f9d
								
							
						 | 
						
							
							
								
								fix: db_insert_mplogx bug
							
							
							
							
							
						 | 
						
							2024-07-16 15:36:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d31cf4d143
								
							
						 | 
						
							
							
								
								feat: 从数据库转存到超表做count限制
							
							
							
							
							
						 | 
						
							2024-07-16 14:50:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf98ea8a48
								
							
						 | 
						
							
							
								
								feat: 从数据库转存到超表
							
							
							
							
							
						 | 
						
							2024-07-16 14:06:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab413eed81
								
							
						 | 
						
							
							
								
								feat: 停机记录在小于60s可删除
							
							
							
							
							
						 | 
						
							2024-07-16 10:58:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								061a291889
								
							
						 | 
						
							
							
								
								feat: 增加handover和mio的查询条件
							
							
							
							
							
						 | 
						
							2024-07-15 17:57:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								876c18149e
								
							
						 | 
						
							
							
								
								feat: route增加返回字段
							
							
							
							
							
						 | 
						
							2024-07-15 17:32:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								79900462ff
								
							
						 | 
						
							
							
								
								feat: 交接记录receive_dept非必填
							
							
							
							
							
						 | 
						
							2024-07-15 17:05:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								07680704ec
								
							
						 | 
						
							
							
								
								feat: cal_mtask_progress_from_mlog
							
							
							
							
							
						 | 
						
							2024-07-15 16:57:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e904f083a
								
							
						 | 
						
							
							
								
								fix: gen_material_out 优化
							
							
							
							
							
						 | 
						
							2024-07-12 10:58:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af80e3ce5b
								
							
						 | 
						
							
							
								
								fix: mlogb type filter bug
							
							
							
							
							
						 | 
						
							2024-07-12 10:50:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4934327808
								
							
						 | 
						
							
							
								
								feat: mlogbout url register
							
							
							
							
							
						 | 
						
							2024-07-11 17:44:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d38e91667e
								
							
						 | 
						
							
							
								
								fix: mlogb init serializer bug
							
							
							
							
							
						 | 
						
							2024-07-11 17:04:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b33c86fd6e
								
							
						 | 
						
							
							
								
								feat: mlogb in update 接口
							
							
							
							
							
						 | 
						
							2024-07-11 15:58:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac1b4b6c3e
								
							
						 | 
						
							
							
								
								feat: mlogb增加筛选条件
							
							
							
							
							
						 | 
						
							2024-07-11 15:57:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								debc268c88
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格项目字段=
							
							
							
							
							
						 | 
						
							2024-07-11 15:57:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								deeda736b9
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格项目字段
							
							
							
							
							
						 | 
						
							2024-07-11 15:55:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								12fb18205d
								
							
						 | 
						
							
							
								
								feat: 增加route和routepack查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 13:28:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4177ba93f8
								
							
						 | 
						
							
							
								
								feat: wmaterial增加mgroupx 查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 13:13:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5ad15c0a9e
								
							
						 | 
						
							
							
								
								feat: MlogbIn create时同步创建out
							
							
							
							
							
						 | 
						
							2024-07-11 13:06:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d522a1fd4
								
							
						 | 
						
							
							
								
								feat: route增加batch_bind字段/mlogbin接口
							
							
							
							
							
						 | 
						
							2024-07-11 11:26:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f08b9ce81
								
							
						 | 
						
							
							
								
								feat: mtask 添加route查询条件
							
							
							
							
							
						 | 
						
							2024-07-11 11:24:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2e60cb7eaf
								
							
						 | 
						
							
							
								
								feat: mlog change接口
							
							
							
							
							
						 | 
						
							2024-07-11 08:44:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2f5edc041c
								
							
						 | 
						
							
							
								
								feat: mlog init
							
							
							
							
							
						 | 
						
							2024-07-10 15:32:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4c93bb98de
								
							
						 | 
						
							
							
								
								fix: daoru_mb cal_material bug
							
							
							
							
							
						 | 
						
							2024-07-09 16:16:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6754b668bc
								
							
						 | 
						
							
							
								
								fix: handover serializer validate bug
							
							
							
							
							
						 | 
						
							2024-07-09 14:03:44 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								56e40e6dd3
								
							
						 | 
						
							
							
								
								fix: 更改mythread的使用
							
							
							
							
							
						 | 
						
							2024-07-05 10:49:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b9f2264ff4
								
							
						 | 
						
							
							
								
								fix: base thread添加日志
							
							
							
							
							
						 | 
						
							2024-07-05 10:46:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								24b2a98440
								
							
						 | 
						
							
							
								
								refecor: 一些处理
							
							
							
							
							
						 | 
						
							2024-07-05 08:49:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								df2db0ddd9
								
							
						 | 
						
							
							
								
								fix: schedue_mtasks serializer用错
							
							
							
							
							
						 | 
						
							2024-07-04 17:26:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e4f9fd34f0
								
							
						 | 
						
							
							
								
								fix: schedule_type 单词错误
							
							
							
							
							
						 | 
						
							2024-07-04 17:20:20 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								ffc9f0ee4d
								
							
						 | 
						
							
							
								
								feat: base 增加自定义的thread以记录日志或发送邮件
							
							
							
							
							
						 | 
						
							2024-07-04 09:45:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								436719d9ff
								
							
						 | 
						
							
							
								
								feat: 依据routepack进行任务派发
							
							
							
							
							
						 | 
						
							2024-07-03 16:46:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								14994b424a
								
							
						 | 
						
							
							
								
								fix: enp添加设备权限bug
							
							
							
							
							
						 | 
						
							2024-07-03 15:56:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a0dae66cf7
								
							
						 | 
						
							
							
								
								feat: 根据光芯需求对wpm做兼容性处理2
							
							
							
							
							
						 | 
						
							2024-07-03 13:19:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								439c8a0f88
								
							
						 | 
						
							
							
								
								feat: routepack增加返回信息
							
							
							
							
							
						 | 
						
							2024-07-03 13:02:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								59b8634d3e
								
							
						 | 
						
							
							
								
								fix: handover serializer bug2
							
							
							
							
							
						 | 
						
							2024-07-02 23:25:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67ca07bb35
								
							
						 | 
						
							
							
								
								fix: handover serializer bug
							
							
							
							
							
						 | 
						
							2024-07-02 23:04:16 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								427bf31d50
								
							
						 | 
						
							
							
								
								fix: mlogb 取material bug
							
							
							
							
							
						 | 
						
							2024-07-02 12:09:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a6a3dcf33c
								
							
						 | 
						
							
							
								
								fix: handover validate bug
							
							
							
							
							
						 | 
						
							2024-07-01 16:21:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d579a7358d
								
							
						 | 
						
							
							
								
								feat: 根据光芯需求对wpm做兼容性处理
							
							
							
							
							
						 | 
						
							2024-07-01 10:07:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3c52125440
								
							
						 | 
						
							
							
								
								feat: wm,handover,mlog增加检索条件
							
							
							
							
							
						 | 
						
							2024-06-28 15:29:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9572614b02
								
							
						 | 
						
							
							
								
								fix: enstat to_repre时若使用query时的bug
							
							
							
							
							
						 | 
						
							2024-06-27 09:05:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								85bbdd6cd9
								
							
						 | 
						
							
							
								
								feat: 优化transfer_mpoint_val_to_ep_running_state
							
							
							
							
							
						 | 
						
							2024-06-26 10:11:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								02d672a39d
								
							
						 | 
						
							
							
								
								feat: 增加mpoint查询条件
							
							
							
							
							
						 | 
						
							2024-06-26 10:11:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								450fe06093
								
							
						 | 
						
							
							
								
								fix: schedue_mtasks schedue_type bug
							
							
							
							
							
						 | 
						
							2024-06-25 15:50:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d766d880e7
								
							
						 | 
						
							
							
								
								feat: utask支持恢复任务/排产支持传入to_day
							
							
							
							
							
						 | 
						
							2024-06-24 18:23:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								643efa448e
								
							
						 | 
						
							
							
								
								fix: mpointserializer获取last_data优化
							
							
							
							
							
						 | 
						
							2024-06-24 16:45:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								499e5732aa
								
							
						 | 
						
							
							
								
								fix: 更新所监测设备测点的total_production忽略必须指定设备
							
							
							
							
							
						 | 
						
							2024-06-24 10:02:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac7e0a84ea
								
							
						 | 
						
							
							
								
								feat: pm 添加工时字段
							
							
							
							
							
						 | 
						
							2024-06-21 15:48:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2bb860f8dd
								
							
						 | 
						
							
							
								
								feat: 添加工时字段
							
							
							
							
							
						 | 
						
							2024-06-21 14:31:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5efd9888dd
								
							
						 | 
						
							
							
								
								feat: 交接记录提交只要是同部门的就可以2
							
							
							
							
							
						 | 
						
							2024-06-21 13:27:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7c0df5f804
								
							
						 | 
						
							
							
								
								fix: raise 工艺路线未配置
							
							
							
							
							
						 | 
						
							2024-06-21 11:15:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								966821fad6
								
							
						 | 
						
							
							
								
								feat: 交接记录提交只要是同部门的就可以
							
							
							
							
							
						 | 
						
							2024-06-21 10:40:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								96e96ef8cc
								
							
						 | 
						
							
							
								
								fix: KingClient 添加日志4
							
							
							
							
							
						 | 
						
							2024-06-20 09:21:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1d4239c28a
								
							
						 | 
						
							
							
								
								fix: KingClient 添加日志3
							
							
							
							
							
						 | 
						
							2024-06-19 18:23:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								98d10405e4
								
							
						 | 
						
							
							
								
								fix: KingClient 添加日志2
							
							
							
							
							
						 | 
						
							2024-06-19 18:13:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c42dafcb44
								
							
						 | 
						
							
							
								
								fix: KingClient 添加日志
							
							
							
							
							
						 | 
						
							2024-06-19 17:45:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								97f8a1e143
								
							
						 | 
						
							
							
								
								fix: kingclient set token bug
							
							
							
							
							
						 | 
						
							2024-06-19 15:54:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b0dfb020ce
								
							
						 | 
						
							
							
								
								fix: 添加亚控通用调用接口 bug2
							
							
							
							
							
						 | 
						
							2024-06-19 15:38:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d78c8b10dc
								
							
						 | 
						
							
							
								
								fix: 添加亚控通用调用接口 bug
							
							
							
							
							
						 | 
						
							2024-06-19 15:35:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7867fe0e67
								
							
						 | 
						
							
							
								
								feat: 添加亚控通用调用接口
							
							
							
							
							
						 | 
						
							2024-06-19 15:23:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f612c8e662
								
							
						 | 
						
							
							
								
								fix: dispath_checkwork_task bug2
							
							
							
							
							
						 | 
						
							2024-06-18 17:58:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								51e32f24b1
								
							
						 | 
						
							
							
								
								fix: dispath_checkwork_task bug
							
							
							
							
							
						 | 
						
							2024-06-18 17:55:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								de6c57b5c9
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-06-18 17:54:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1d7babafe7
								
							
						 | 
						
							
							
								
								feat: 添加hazard路由
							
							
							
							
							
						 | 
						
							2024-06-18 17:54:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								ab358abf80
								
							
						 | 
						
							
							
								
								fix: edu.url edu.view
							
							
							
							
							
						 | 
						
							2024-06-12 18:07:17 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								d8f9dbfcfb
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-06-12 10:47:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5f4884e83d
								
							
						 | 
						
							
							
								
								fix: edu/model 、serializers、view 删减参与部门
							
							
							
							
							
						 | 
						
							2024-06-12 10:46:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5778381189
								
							
						 | 
						
							
							
								
								feat: dpm checkwork增加字段2
							
							
							
							
							
						 | 
						
							2024-06-12 10:45:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dc5be36e78
								
							
						 | 
						
							
							
								
								feat: dpm checkwork增加字段
							
							
							
							
							
						 | 
						
							2024-06-12 10:45:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								63dbc00a12
								
							
						 | 
						
							
							
								
								fix: dispatch_checkwork_task自动添加time_end
							
							
							
							
							
						 | 
						
							2024-06-12 10:13:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7f3da29560
								
							
						 | 
						
							
							
								
								fix: 注册dpm task
							
							
							
							
							
						 | 
						
							2024-06-11 17:11:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e95b7b73bc
								
							
						 | 
						
							
							
								
								feat: 注册dpm task
							
							
							
							
							
						 | 
						
							2024-06-11 16:38:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f596a6ab1a
								
							
						 | 
						
							
							
								
								feat: 注释掉reload_web_git
							
							
							
							
							
						 | 
						
							2024-06-11 16:19:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								388b28133f
								
							
						 | 
						
							
							
								
								fix: checktaskset create bug
							
							
							
							
							
						 | 
						
							2024-06-11 16:08:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a9cbd846cd
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-06-11 16:01:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b913928ac6
								
							
						 | 
						
							
							
								
								feat: 风险管控表精简
							
							
							
							
							
						 | 
						
							2024-06-11 16:01:00 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								423eca445e
								
							
						 | 
						
							
							
								
								fix: edu/ExamRecordSerializer
							
							
							
							
							
						 | 
						
							2024-06-11 14:17:07 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								f4e003b9f0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
							
							
							修改edu/examrecord 
							
						 | 
						
							2024-06-11 14:04:39 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5178cb0daa
								
							
						 | 
						
							
							
								
								fix: edu/Examrecord
							
							
							
							
							
						 | 
						
							2024-06-11 14:03:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6851dd3f94
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-06-11 11:29:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af879ca01b
								
							
						 | 
						
							
							
								
								fix: myschedule 保存时的bug
							
							
							
							
							
						 | 
						
							2024-06-11 11:28:58 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								18b0429044
								
							
						 | 
						
							
							
								
								fix: edu/submit
							
							
							
							
							
						 | 
						
							2024-06-11 09:11:32 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								71e7d4d187
								
							
						 | 
						
							
							
								
								feat: base send_mail_task支持发送多人
							
							
							
							
							
						 | 
						
							2024-06-07 17:08:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7258d2e0ca
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-06-07 16:51:02 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								87311668f5
								
							
						 | 
						
							
							
								
								fix: exam attend bulk_create bug
							
							
							
							
							
						 | 
						
							2024-06-07 16:50:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c55005994b
								
							
						 | 
						
							
							
								
								feat: base myschedule加入url
							
							
							
							
							
						 | 
						
							2024-06-07 16:01:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								255867b2d3
								
							
						 | 
						
							
							
								
								fix: myscheduleserializer 返回字段bug
							
							
							
							
							
						 | 
						
							2024-06-07 15:46:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								108e40bb3d
								
							
						 | 
						
							
							
								
								feat: base 去除MySchedule的权限控制
							
							
							
							
							
						 | 
						
							2024-06-07 13:41:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6eccfb67cb
								
							
						 | 
						
							
							
								
								feat: 增加riskpoint返回信息
							
							
							
							
							
						 | 
						
							2024-06-07 09:50:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fe40facfa2
								
							
						 | 
						
							
							
								
								fix: base 对循环引用抛出异常
							
							
							
							
							
						 | 
						
							2024-06-07 09:49:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a14c411795
								
							
						 | 
						
							
							
								
								fix: base 调整handle_parent
							
							
							
							
							
						 | 
						
							2024-06-06 14:50:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d36de5bc00
								
							
						 | 
						
							
							
								
								feat: 正式添加dpm模块
							
							
							
							
							
						 | 
						
							2024-06-06 14:50:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9e0241f209
								
							
						 | 
						
							
							
								
								fix: 改变培训级别以与风险点一致
							
							
							
							
							
						 | 
						
							2024-06-06 09:13:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								917f3ff52b
								
							
						 | 
						
							
							
								
								feat: 增加edu 线下培训表
							
							
							
							
							
						 | 
						
							2024-06-05 14:43:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16ead75d3b
								
							
						 | 
						
							
							
								
								feat: 获取子集的性能优化2
							
							
							
							
							
						 | 
						
							2024-06-05 14:07:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a54030e9c0
								
							
						 | 
						
							
							
								
								feat: 获取子集的性能优化及删除提示
							
							
							
							
							
						 | 
						
							2024-06-05 12:50:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b1013ea64
								
							
						 | 
						
							
							
								
								fix: 完善父子关系parent_link处理
							
							
							
							
							
						 | 
						
							2024-06-05 12:49:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a590eb298b
								
							
						 | 
						
							
							
								
								feat: base 增加parentmodel
							
							
							
							
							
						 | 
						
							2024-06-05 10:24:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d7f1152ff
								
							
						 | 
						
							
							
								
								fix: 只继承CustomGenericViewSet的设置perms_map为{}2
							
							
							
							
							
						 | 
						
							2024-06-05 10:24:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c8d58c35c
								
							
						 | 
						
							
							
								
								fix: 解决swagger显示错误
							
							
							
							
							
						 | 
						
							2024-06-05 09:31:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								14e421dd5b
								
							
						 | 
						
							
							
								
								fix: 只继承CustomGenericViewSet的设置perms_map为{}
							
							
							
							
							
						 | 
						
							2024-06-05 09:31:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5b8b262e42
								
							
						 | 
						
							
							
								
								feat: base 在第一次实例化时添加权限标识
							
							
							
							
							
						 | 
						
							2024-06-05 09:27:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e656f3e542
								
							
						 | 
						
							
							
								
								feat: edu接口完善
							
							
							
							
							
						 | 
						
							2024-06-05 08:36:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8548004690
								
							
						 | 
						
							
							
								
								fix: 用于混料的原料不与车间库存交互
							
							
							
							
							
						 | 
						
							2024-06-04 09:11:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f6610c821
								
							
						 | 
						
							
							
								
								feat: 添加questioncat_name字段
							
							
							
							
							
						 | 
						
							2024-06-03 17:42:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								db39aa6519
								
							
						 | 
						
							
							
								
								feat: 添加examlist can_attend返回
							
							
							
							
							
						 | 
						
							2024-06-03 17:41:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								57acaa2e06
								
							
						 | 
						
							
							
								
								feat: examserializer增加返回数据
							
							
							
							
							
						 | 
						
							2024-06-03 10:08:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f5428febf3
								
							
						 | 
						
							
							
								
								feat: 增加examdetail serializer
							
							
							
							
							
						 | 
						
							2024-06-03 08:40:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								62b012b690
								
							
						 | 
						
							
							
								
								feat: base 增加get_queryset_custom
							
							
							
							
							
						 | 
						
							2024-06-03 08:36:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e695543932
								
							
						 | 
						
							
							
								
								doc: CustomListmixin添加注释
							
							
							
							
							
						 | 
						
							2024-05-31 18:59:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac49088efa
								
							
						 | 
						
							
							
								
								feat: 暂时去除多余的paper_json字段
							
							
							
							
							
						 | 
						
							2024-05-31 18:26:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								84eaf31fff
								
							
						 | 
						
							
							
								
								feat: examserializer添加字段
							
							
							
							
							
						 | 
						
							2024-05-31 18:26:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bbee8defa8
								
							
						 | 
						
							
							
								
								feat: 修改drain字段属性
							
							
							
							
							
						 | 
						
							2024-05-31 16:39:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								49f3341a01
								
							
						 | 
						
							
							
								
								feat: 添加edu模块
							
							
							
							
							
						 | 
						
							2024-05-31 15:42:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0fcecf9a64
								
							
						 | 
						
							
							
								
								feat: base 增加了baseserializermixin
							
							
							
							
							
						 | 
						
							2024-05-31 14:12:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0473be4d30
								
							
						 | 
						
							
							
								
								feat: 检验撤回test_date在count_notok时直接置空
							
							
							
							
							
						 | 
						
							2024-05-30 10:55:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								458385c0f6
								
							
						 | 
						
							
							
								
								feat: material增加count_mb字段
							
							
							
							
							
						 | 
						
							2024-05-28 14:29:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2ac4f5b04f
								
							
						 | 
						
							
							
								
								refector: get_analyse_data_mgroups_duration 增加run_hour返回
							
							
							
							
							
						 | 
						
							2024-05-22 17:11:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8627d5f9dc
								
							
						 | 
						
							
							
								
								feat: 增加工段数据按任意时间范围分析
							
							
							
							
							
						 | 
						
							2024-05-22 17:04:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf5df19a59
								
							
						 | 
						
							
							
								
								feat: mlog添加两个不合格项目
							
							
							
							
							
						 | 
						
							2024-05-22 14:53:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7819aa5b5e
								
							
						 | 
						
							
							
								
								feat: stlog的sflog的cascad改一下
							
							
							
							
							
						 | 
						
							2024-05-21 18:18:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dd5b88e300
								
							
						 | 
						
							
							
								
								feat: 增加吨熟料电耗计算功能
							
							
							
							
							
						 | 
						
							2024-05-21 18:17:51 +08:00 |