|  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 | a6b29949ef | Merge branch 'erp1' | 2024-08-02 21:13:33 +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 |