caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								06bd6a7544
								
							
						 | 
						
							
							
								
								feat: base 调整项目可自定义配置精简settings.py
							
							
							
							
							
						 | 
						
							2024-03-17 22:06:52 +08:00 | 
						
					
				
					
						
							
							
								
								 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
							
						 | 
						
							
							
							
							
							
								
							
							
								8a388928f0
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-03-13 17:41:14 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								a891692b71
								
							
						 | 
						
							
							
								
								feat: base 提供监测celery的实例
							
							
							
							
							
						 | 
						
							2024-03-13 17:37:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								33a0ddad4c
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-03-12 18:41:58 +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
							
						 | 
						
							
							
							
							
							
								
							
							
								6589364eb4
								
							
						 | 
						
							
							
								
								fix: base 支持从request.data中获取page和page_size
							
							
							
							
							
						 | 
						
							2024-03-08 18:15:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d5e06241d
								
							
						 | 
						
							
							
								
								fix: base 支持从request.data中获取page和page_size
							
							
							
							
							
						 | 
						
							2024-03-08 18:14:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								78306f7a29
								
							
						 | 
						
							
							
								
								feat: base complexserializer 非必填
							
							
							
							
							
						 | 
						
							2024-03-08 17:59:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c159409c3a
								
							
						 | 
						
							
							
								
								feat: base complexserializer支持传入page或自行在url中传page
							
							
							
							
							
						 | 
						
							2024-03-08 17:56:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								87cd39ee89
								
							
						 | 
						
							
							
								
								feat: base 支持从request.data中获取page和page_size
							
							
							
							
							
						 | 
						
							2024-03-08 17:56:04 +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 |