|  caoqianming | 077707f493 | fix: celeryinfo取值错误 | 2024-03-15 16:41:13 +08:00 | 
				
					
						|  caoqianming | c0567f5a55 | feat: 返回redis和celery的一些监控数据 | 2024-03-15 16:01:26 +08:00 | 
				
					
						|  caoqianming | 966edbacd4 | feat: 添加celery监控信息2 | 2024-03-13 17:41:16 +08:00 | 
				
					
						|  caoqianming | 0af253fb0b | feat: 添加celery监控信息 | 2024-03-13 17:39:45 +08:00 | 
				
					
						|  caoqianming | 718f594a4b | feat: 添加是否新能源字段 | 2024-03-13 17:39:23 +08:00 | 
				
					
						|  caoqianming | 38b7d0c586 | feat: time_20_y 改为6点半 | 2024-03-11 15:38:09 +08:00 | 
				
					
						|  caoqianming | a32cefb939 | feat: operationlist增加筛选条件 | 2024-03-11 09:04:10 +08:00 | 
				
					
						|  caoqianming | 7eba5a8e13 | feat: base 从request.data获取page和size | 2024-03-11 08:45:21 +08:00 | 
				
					
						|  caoqianming | 779488589a | fix: handover_submit针对混料特殊处理的bug3 | 2024-03-06 22:24:11 +08:00 | 
				
					
						|  caoqianming | 2addfc8433 | fix: handover_submit针对混料特殊处理的bug2 | 2024-03-06 21:52:55 +08:00 | 
				
					
						|  caoqianming | 3ddb050330 | fix: handover_submit针对混料特殊处理的bug | 2024-03-06 21:45:17 +08:00 | 
				
					
						|  caoqianming | b429ad9059 | fix: 废弃一些接口 | 2024-03-06 18:01:24 +08:00 | 
				
					
						|  caoqianming | 8a32690395 | feat: handoverserializer返回更多数据 | 2024-03-06 17:44:50 +08:00 | 
				
					
						|  caoqianming | abdee3d2d5 | feat: 增加wmaterial查询条件 | 2024-03-06 17:21:48 +08:00 | 
				
					
						|  caoqianming | 4c3610ac25 | feat: 混料支持车间库存 | 2024-03-06 17:07:51 +08:00 | 
				
					
						|  caoqianming | f6db92f815 | feat: 增加wmaterial查询条件 | 2024-03-06 15:50:29 +08:00 | 
				
					
						|  caoqianming | 02344da862 | feat: 增加equipment设备类型 | 2024-03-06 09:53:16 +08:00 | 
				
					
						|  caoqianming | 0de0489272 | feat: 增加箱中破不合格字段 | 2024-03-05 10:11:33 +08:00 | 
				
					
						|  caoqianming | 5c0c016872 | fix: correct_tuihuo_log矫正退火日志2 | 2024-03-04 15:50:49 +08:00 | 
				
					
						|  caoqianming | c1d5ef86f1 | fix: correct_tuihuo_log矫正退火日志 | 2024-03-04 14:58:36 +08:00 | 
				
					
						|  caoqianming | 5aab22e9d9 | fix: 工段删除同时更新route | 2024-03-04 14:22:22 +08:00 | 
				
					
						|  caoqianming | e99854b56f | fix: mlog填写时进行更进一步校验 | 2024-03-04 13:54:31 +08:00 | 
				
					
						|  caoqianming | eecda9e5a6 | fix: material导入可更改count_safe | 2024-03-04 10:44:42 +08:00 | 
				
					
						|  caoqianming | 70b5a4d87e | fix: material unit 忽略大小写2 | 2024-03-04 10:37:33 +08:00 | 
				
					
						|  caoqianming | 9cd5bfc8f9 | fix: material unit 忽略大小写 | 2024-03-04 10:25:58 +08:00 | 
				
					
						|  caoqianming | fcc613170e | feat: 物料信息导入功能 | 2024-03-04 09:58:09 +08:00 | 
				
					
						|  caoqianming | 1c802eafb1 | fix: check_same_allow_minute_and_raise_event 判断错误 | 2024-03-02 09:47:53 +08:00 | 
				
					
						|  caoqianming | 652ee31f6f | fix: check_same_allow_minute_and_raise_event 判断错误 | 2024-03-02 09:41:47 +08:00 | 
				
					
						|  caoqianming | 641c4cefc6 | fix: snap_and_analyse ecs为空就不创建事件 | 2024-03-02 08:59:47 +08:00 | 
				
					
						|  caoqianming | 39d69952f1 | fix: check_same_allow_minute_and_raise_event bug | 2024-03-01 18:56:49 +08:00 | 
				
					
						|  caoqianming | 61c8e6ab98 | feat: ecm提出check_same_allow_minute_and_raise_event方法 | 2024-03-01 18:49:40 +08:00 | 
				
					
						|  caoqianming | f51075e1ef | feat: 采购入库和销售出库订单可为空 | 2024-03-01 17:36:43 +08:00 | 
				
					
						|  caoqianming | 373a4999c3 | fix: materialcreateserializer bug | 2024-03-01 15:58:04 +08:00 | 
				
					
						|  caoqianming | d3ae9d4a79 | fix: mgroup筛选bug | 2024-03-01 15:57:19 +08:00 | 
				
					
						|  caoqianming | 3c87e157de | fix: puorder update bug | 2024-03-01 15:50:50 +08:00 | 
				
					
						|  caoqianming | 2a3bcc1b33 | fix: ftest中type设置为必填 | 2024-03-01 15:34:56 +08:00 | 
				
					
						|  caoqianming | ab3bcee0f8 | fix: 生产领料反向操作bug | 2024-03-01 15:16:19 +08:00 | 
				
					
						|  caoqianming | 4c75328e67 | feat: materialbatch默认按update_time倒序排列 | 2024-03-01 15:09:41 +08:00 | 
				
					
						|  caoqianming | eef99ed624 | feat: 出入库操作支持提交后可撤销功能 | 2024-02-29 17:10:50 +08:00 | 
				
					
						|  caoqianming | 33e661b1dc | fix: 调整envdata的字段格式 | 2024-02-28 17:20:49 +08:00 | 
				
					
						|  caoqianming | 4ddfbb266c | fix: em可返回envdata | 2024-02-28 17:20:28 +08:00 | 
				
					
						|  caoqianming | 820f316511 | fix: envdata因未配置ordering触发bug | 2024-02-28 16:34:48 +08:00 | 
				
					
						|  caoqianming | 1b6c58e7c8 | feat: jsonfield默认blank=True | 2024-02-28 16:19:10 +08:00 | 
				
					
						|  caoqianming | 983e11af74 | fix: jsonfield 默认blank=True | 2024-02-28 16:18:50 +08:00 | 
				
					
						|  caoqianming | 2e15c8ff31 | feat: em返回数据可携带环保数据信息 | 2024-02-28 15:02:19 +08:00 | 
				
					
						|  caoqianming | d4bf7a7e19 | perf: 一些性能优化 | 2024-02-28 15:01:52 +08:00 | 
				
					
						|  caoqianming | 2c2e5bc4cd | feat: base 可给list返回数据添加额外信息 | 2024-02-28 15:00:53 +08:00 | 
				
					
						|  caoqianming | 080c14b5f8 | feat: 增加drain查询条件 | 2024-02-27 17:41:46 +08:00 | 
				
					
						|  caoqianming | 7f93c453e6 | feat: 修改drain2serializer返回数据 | 2024-02-27 15:50:46 +08:00 | 
				
					
						|  caoqianming | 44c4a34c69 | feat: 增加drain2serializer返回数据 | 2024-02-27 14:46:28 +08:00 | 
				
					
						|  caoqianming | 666d317f01 | feat: carwash增加返回记录 | 2024-02-27 14:31:35 +08:00 | 
				
					
						|  caoqianming | bb05ba8c5c | feat: 增加DrainEquipEnvSerializer返回数据 | 2024-02-27 10:40:04 +08:00 | 
				
					
						|  caoqianming | 096650e592 | feat: emserializer增加返回cate信息 | 2024-02-27 09:20:47 +08:00 | 
				
					
						|  caoqianming | 31b4af5fbb | doc: 增加config查询文档 | 2024-02-27 09:20:27 +08:00 | 
				
					
						|  caoqianming | 34aaf22650 | feat: base viewset增加query定制返回参数 | 2024-02-27 09:14:27 +08:00 | 
				
					
						|  caoqianming | 9d48575be4 | feat: enp count_cate接口 | 2024-02-26 15:22:36 +08:00 | 
				
					
						|  caoqianming | 826cb8c8b1 | feat: count_state统计数据增加 | 2024-02-26 15:22:14 +08:00 | 
				
					
						|  caoqianming | b71a8921c3 | feat: 设备运行状态count统计接口 | 2024-02-26 14:22:43 +08:00 | 
				
					
						|  caoqianming | 53193650f6 | feat: 增加ecate筛选条件 | 2024-02-26 10:48:47 +08:00 | 
				
					
						|  caoqianming | d2a503c482 | feat: 增加ecate表 | 2024-02-26 10:31:12 +08:00 | 
				
					
						|  caoqianming | e7f8086f23 | feat: base 提供查询子集数据方法 | 2024-02-26 08:08:47 +08:00 | 
				
					
						|  caoqianming | a1ef065e8c | feat: base 优化utils queryset查询 | 2024-02-25 21:12:46 +08:00 | 
				
					
						|  caoqianming | f252f206ac | fix: access_time 错误 | 2024-02-23 13:51:28 +08:00 | 
				
					
						|  caoqianming | a00a02bde6 | feat: 模拟车辆出入厂数据 | 2024-02-23 13:47:11 +08:00 | 
				
					
						|  caoqianming | dcaf7b1ca1 | fix: ftest test_group可以为空 | 2024-02-22 09:41:56 +08:00 | 
				
					
						|  caoqianming | 2e0f2ec263 | feat: 设备表增加字段 | 2024-02-22 09:37:11 +08:00 | 
				
					
						|  caoqianming | af5a6c3d55 | feat: 添加drain2serializer | 2024-02-21 09:54:42 +08:00 | 
				
					
						|  caoqianming | 46d8bd7ef6 | feat: 增加设备tags查询 | 2024-02-21 09:54:00 +08:00 | 
				
					
						|  caoqianming | c265295159 | feat: base 增加MyJsonListFilter | 2024-02-21 09:53:41 +08:00 | 
				
					
						|  caoqianming | 00dfebd0c9 | feat: carwash模拟数据 | 2024-02-21 08:56:00 +08:00 | 
				
					
						|  caoqianming | 8916349240 | feat: abc!000增加default password | 2024-02-19 16:36:02 +08:00 | 
				
					
						|  caoqianming | 1934768b88 | feat: base 增加DEFAULT_PWD | 2024-02-19 16:35:22 +08:00 | 
				
					
						|  caoqianming | 113a8c501f | feat: 增加洗车记录 | 2024-02-05 11:05:02 +08:00 | 
				
					
						|  caoqianming | 4c774399b4 | fix: 增加drainequip返回数据 | 2024-02-04 16:13:42 +08:00 | 
				
					
						|  caoqianming | b8a9ca3782 | feat: 增加drainequip返回数据 | 2024-02-04 16:10:42 +08:00 | 
				
					
						|  caoqianming | dc453433a0 | fix: drain mrgoup_name | 2024-02-04 09:25:37 +08:00 | 
				
					
						|  caoqianming | 887d549e7d | fix: enp_envdata migrations | 2024-02-04 09:20:42 +08:00 | 
				
					
						|  caoqianming | ff99772f94 | feat: drainserializer mgroup_name | 2024-02-01 18:09:17 +08:00 | 
				
					
						|  caoqianming | c2e087acf0 | feat: EnvDataExportSerializer固定typechoice | 2024-02-01 14:00:28 +08:00 | 
				
					
						|  caoqianming | 34f487064b | feat: 初步添加envdata数据导出功能 | 2024-02-01 13:57:54 +08:00 | 
				
					
						|  caoqianming | 0d79685b1e | feat: 优化drainequip查询 | 2024-01-31 17:10:31 +08:00 | 
				
					
						|  caoqianming | 11d7438cb8 | feat: 优化drainequip查询 | 2024-01-31 17:09:06 +08:00 | 
				
					
						|  caoqianming | 803affa7ce | fix: DrainEquipEnvSerializer增加更完整的返回 | 2024-01-31 16:59:36 +08:00 | 
				
					
						|  caoqianming | 24020ea122 | feat: DrainEquipEnvSerializer增加更完整的返回 | 2024-01-31 16:53:40 +08:00 | 
				
					
						|  caoqianming | 635e9df408 | feat: 取消attendance联合约束 | 2024-01-31 11:25:59 +08:00 | 
				
					
						|  caoqianming | 19527f9736 | feat: 变更attendance查询和排序条件 | 2024-01-31 10:24:40 +08:00 | 
				
					
						|  caoqianming | 8b2761b027 | feat: 增加attendance查询和排序条件 | 2024-01-31 10:18:24 +08:00 | 
				
					
						|  caoqianming | d6618ce25d | fix: 修复可能的attendancecreatebug | 2024-01-31 10:07:53 +08:00 | 
				
					
						|  caoqianming | 986e9265d2 | feat: bi报错信息完善2 | 2024-01-31 09:37:36 +08:00 | 
				
					
						|  caoqianming | f050a335cc | feat: bi报错信息完善 | 2024-01-30 17:45:53 +08:00 | 
				
					
						|  caoqianming | 83da22160f | fix: enp增加设备编号返回bug | 2024-01-30 17:03:33 +08:00 | 
				
					
						|  caoqianming | 17c12cba85 | feat: enp增加设备编号返回 | 2024-01-30 17:01:02 +08:00 | 
				
					
						|  caoqianming | e089a02a32 | feat: Material create校验是否存在 | 2024-01-29 18:25:10 +08:00 | 
				
					
						|  caoqianming | e1fae87bcb | feat: 更改物料排序 | 2024-01-29 18:15:57 +08:00 | 
				
					
						|  caoqianming | 32733e9800 | fix: materialserializer count只读 | 2024-01-29 18:10:07 +08:00 | 
				
					
						|  caoqianming | 22978de879 | feat: enp增加车辆出入记录 | 2024-01-29 16:38:00 +08:00 | 
				
					
						|  caoqianming | 9ff3ee2040 | feat: 修改物料清单默认排序 | 2024-01-29 16:00:00 +08:00 | 
				
					
						|  caoqianming | 1a65e95127 | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-01-29 15:57:41 +08:00 | 
				
					
						|  caoqianming | c8cc3469e1 | feat: 物料批次导入功能 | 2024-01-29 15:57:40 +08:00 | 
				
					
						|  caoqianming | 51893d23e0 | fix: 去除不必要的print | 2024-01-28 00:20:17 +08:00 |