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 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d483bb6b61
								
							
						 | 
						
							
							
								
								fix: mlog update时mlogb不更新
							
							
							
							
							
						 | 
						
							2024-01-28 00:18:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								08f9fa106a
								
							
						 | 
						
							
							
								
								feat: ptest增加test_user_name
							
							
							
							
							
						 | 
						
							2024-01-25 09:52:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d0b13ac215
								
							
						 | 
						
							
							
								
								feat: do_in时增加更完整的提示信息
							
							
							
							
							
						 | 
						
							2024-01-25 09:49:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								30dbeacdd0
								
							
						 | 
						
							
							
								
								fix: 修改mio查询条件以支持materials为空的情况
							
							
							
							
							
						 | 
						
							2024-01-25 09:45:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1d2f9f09eb
								
							
						 | 
						
							
							
								
								feat: mioviewset prefetch_related_fields优化
							
							
							
							
							
						 | 
						
							2024-01-24 12:35:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6cb22744c2
								
							
						 | 
						
							
							
								
								fix: 增加materials__type__in筛选
							
							
							
							
							
						 | 
						
							2024-01-24 12:31:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a0f73c783
								
							
						 | 
						
							
							
								
								feat: 增加materials 筛选
							
							
							
							
							
						 | 
						
							2024-01-24 11:48:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								20e209ced2
								
							
						 | 
						
							
							
								
								fix: update_mb更新物料库存的bug
							
							
							
							
							
						 | 
						
							2024-01-23 18:03:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e81acb7aa7
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-01-22 08:27:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ddd0d2a6df
								
							
						 | 
						
							
							
								
								feat: enp调整
							
							
							
							
							
						 | 
						
							2024-01-22 08:27:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6827b72231
								
							
						 | 
						
							
							
								
								feat: base 增加最大获取列表数
							
							
							
							
							
						 | 
						
							2024-01-21 00:23:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e193a663c6
								
							
						 | 
						
							
							
								
								feat: 取消dataset exec 日志记录及可直接抛出错误
							
							
							
							
							
						 | 
						
							2024-01-21 00:06:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6f8c7c0567
								
							
						 | 
						
							
							
								
								feat: mlog validate时计算count_notok
							
							
							
							
							
						 | 
						
							2024-01-20 23:30:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c88f33ad4d
								
							
						 | 
						
							
							
								
								feat: 增加material name查询条件
							
							
							
							
							
						 | 
						
							2024-01-19 14:56:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								679e6bac4f
								
							
						 | 
						
							
							
								
								feat: 增加物料导入功能
							
							
							
							
							
						 | 
						
							2024-01-19 14:36:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								61801784fc
								
							
						 | 
						
							
							
								
								feat: equip增加tags字段
							
							
							
							
							
						 | 
						
							2024-01-19 11:37:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								318a39c948
								
							
						 | 
						
							
							
								
								fix: 成品检验 perform_create的bug
							
							
							
							
							
						 | 
						
							2024-01-19 09:57:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								387bb66914
								
							
						 | 
						
							
							
								
								feat: 增加equip的name contains查询条件
							
							
							
							
							
						 | 
						
							2024-01-19 09:45:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec70aceb76
								
							
						 | 
						
							
							
								
								feat: count_sampling 默认为0
							
							
							
							
							
						 | 
						
							2024-01-18 15:14:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								78fd0c9721
								
							
						 | 
						
							
							
								
								feat: 日志撤回后修改任务状态
							
							
							
							
							
						 | 
						
							2024-01-18 10:55:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a4d23f534a
								
							
						 | 
						
							
							
								
								fix: mlog validate bug
							
							
							
							
							
						 | 
						
							2024-01-18 10:27:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67d8ede2a4
								
							
						 | 
						
							
							
								
								feat: 计算count_sampling
							
							
							
							
							
						 | 
						
							2024-01-17 16:56:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5ba779b00
								
							
						 | 
						
							
							
								
								feat: 增加产品检验
							
							
							
							
							
						 | 
						
							2024-01-17 15:55:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c11132e38f
								
							
						 | 
						
							
							
								
								feat: 添加drainequip及其返回envdata信息
							
							
							
							
							
						 | 
						
							2024-01-15 17:30:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a6aabd860
								
							
						 | 
						
							
							
								
								fix: do_in new_count为0时wm.delete
							
							
							
							
							
						 | 
						
							2024-01-12 16:45:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c84ea3bdef
								
							
						 | 
						
							
							
								
								feat: 增加timescaledb的支持
							
							
							
							
							
						 | 
						
							2024-01-12 14:32:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7ca12228e2
								
							
						 | 
						
							
							
								
								feat: 库存减到0时删除该记录
							
							
							
							
							
						 | 
						
							2024-01-11 17:56:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90e0513db6
								
							
						 | 
						
							
							
								
								refector: 取消未填写mlog的校验,由前端来做
							
							
							
							
							
						 | 
						
							2024-01-10 15:46:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c61507c7dd
								
							
						 | 
						
							
							
								
								feat: 增加Drain cate help_text
							
							
							
							
							
						 | 
						
							2024-01-10 15:35:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a7a8f98ae
								
							
						 | 
						
							
							
								
								feat: 添加enp模块
							
							
							
							
							
						 | 
						
							2024-01-10 15:30:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								da087ebace
								
							
						 | 
						
							
							
								
								fix: base- put config 时update_dict的bug
							
							
							
							
							
						 | 
						
							2024-01-10 10:54:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1eec1c24b4
								
							
						 | 
						
							
							
								
								feat: base- 基于项目code返回或更改配置信息
							
							
							
							
							
						 | 
						
							2024-01-10 10:11:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a905118bdf
								
							
						 | 
						
							
							
								
								feat: develop增加项目管理
							
							
							
							
							
						 | 
						
							2024-01-10 10:10:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7078aee577
								
							
						 | 
						
							
							
								
								feat: 短信发送异常时的返回格式
							
							
							
							
							
						 | 
						
							2024-01-04 09:18:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								89215d4752
								
							
						 | 
						
							
							
								
								feat: 任务停止后日志不可再提交
							
							
							
							
							
						 | 
						
							2024-01-04 09:11:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5bbb48ceb
								
							
						 | 
						
							
							
								
								fix: 停止任务的bug
							
							
							
							
							
						 | 
						
							2024-01-04 09:07:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae0832010f
								
							
						 | 
						
							
							
								
								feat: MtaskSerializer 返回submit_user_name
							
							
							
							
							
						 | 
						
							2023-12-28 18:37:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6165af7c47
								
							
						 | 
						
							
							
								
								feat: mlog_submit返回更详细的报错
							
							
							
							
							
						 | 
						
							2023-12-28 17:28:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								66f2623c24
								
							
						 | 
						
							
							
								
								refector: 修改access_token的时间
							
							
							
							
							
						 | 
						
							2023-12-28 15:36:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1330b732c0
								
							
						 | 
						
							
							
								
								fix: base user phone校验可为空
							
							
							
							
							
						 | 
						
							2023-12-28 10:31:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								059aee0acf
								
							
						 | 
						
							
							
								
								feat: material增加筛选条件
							
							
							
							
							
						 | 
						
							2023-12-28 09:55:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a09ae16fa0
								
							
						 | 
						
							
							
								
								fix: mtask_submit bug
							
							
							
							
							
						 | 
						
							2023-12-27 15:13:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1134fc3809
								
							
						 | 
						
							
							
								
								feat: equip增加工段等筛选条件
							
							
							
							
							
						 | 
						
							2023-12-27 11:06:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c91533a328
								
							
						 | 
						
							
							
								
								feat: mlog增加equipments字段
							
							
							
							
							
						 | 
						
							2023-12-27 09:51:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6515324b5c
								
							
						 | 
						
							
							
								
								feat: 更改gitignore
							
							
							
							
							
						 | 
						
							2023-12-27 09:03:26 +08:00 |