caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19a53931c4
								
							
						 | 
						
							
							
								
								fix: mtask update在已提交状态下只更改peifen_kg bug
							
							
							
							
							
						 | 
						
							2023-12-16 10:32:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e5d2d5ef84
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2023-12-16 09:56:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b8b106dc2e
								
							
						 | 
						
							
							
								
								feat: mtask update在已提交状态下只更改peifen_kg
							
							
							
							
							
						 | 
						
							2023-12-16 09:56:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eadf36c1d1
								
							
						 | 
						
							
							
								
								fix: mioitem修改字段名
							
							
							
							
							
						 | 
						
							2023-12-15 19:39:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								128dc2a7e3
								
							
						 | 
						
							
							
								
								feat: utask mtask状态submit调整
							
							
							
							
							
						 | 
						
							2023-12-15 09:05:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4916ae5cff
								
							
						 | 
						
							
							
								
								feat: audit_log返回增加change_user_name
							
							
							
							
							
						 | 
						
							2023-12-14 17:14:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b6ff7cd3c
								
							
						 | 
						
							
							
								
								feat: mlog更新时更新日志
							
							
							
							
							
						 | 
						
							2023-12-14 10:36:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								768a07a39a
								
							
						 | 
						
							
							
								
								feat: mio增加筛选条件
							
							
							
							
							
						 | 
						
							2023-12-13 16:08:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ea63c29a69
								
							
						 | 
						
							
							
								
								feat: mlog有mtask时固定handle_date
							
							
							
							
							
						 | 
						
							2023-12-07 10:55:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								179782c73b
								
							
						 | 
						
							
							
								
								feat: auditlog增加筛选条件
							
							
							
							
							
						 | 
						
							2023-12-07 09:40:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2d8169849f
								
							
						 | 
						
							
							
								
								feat: 将mlog添加审计日志
							
							
							
							
							
						 | 
						
							2023-12-07 09:39:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ba34b26928
								
							
						 | 
						
							
							
								
								feat: 添加审计日志auditlog表
							
							
							
							
							
						 | 
						
							2023-12-07 09:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d9ddefe5db
								
							
						 | 
						
							
							
								
								feat: base 添加了对比字典及其嵌套内容的方法
							
							
							
							
							
						 | 
						
							2023-12-07 09:37:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5dab6b0815
								
							
						 | 
						
							
							
								
								feat: base 增加了get_model_info
							
							
							
							
							
						 | 
						
							2023-12-07 09:37:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								33ea769ad4
								
							
						 | 
						
							
							
								
								feat: 增加任务类型 mass
							
							
							
							
							
						 | 
						
							2023-12-05 17:25:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95f67b6543
								
							
						 | 
						
							
							
								
								feat: is_hidden的物料也需要进行车间库存管理
							
							
							
							
							
						 | 
						
							2023-12-05 13:02:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1ef6826776
								
							
						 | 
						
							
							
								
								feat: base 修改版本号
							
							
							
							
							
						 | 
						
							2023-12-05 08:54:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b744ac4591
								
							
						 | 
						
							
							
								
								feat: base 做到celery在项目间完全隔离
							
							
							
							
							
						 | 
						
							2023-12-05 08:51:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1a09787853
								
							
						 | 
						
							
							
								
								feat: base redis配置加入conf.py
							
							
							
							
							
						 | 
						
							2023-12-04 17:08:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7bd8d0dd1f
								
							
						 | 
						
							
							
								
								fix: base permission去除数据库约束
							
							
							
							
							
						 | 
						
							2023-12-04 08:37:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ac323781eb
								
							
						 | 
						
							
							
								
								feat 增加wm查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 15:51:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3c0273e0d
								
							
						 | 
						
							
							
								
								feat: 增加material查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 15:25:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e3d37c6dfa
								
							
						 | 
						
							
							
								
								feat: wm增加查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 14:16:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9d847c8d87
								
							
						 | 
						
							
							
								
								feat: 采购计划和订单都增加提交人
							
							
							
							
							
						 | 
						
							2023-12-01 13:51:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dc8bab86cf
								
							
						 | 
						
							
							
								
								feat: puorder增加materials字段
							
							
							
							
							
						 | 
						
							2023-12-01 13:40:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dc47570a5b
								
							
						 | 
						
							
							
								
								feat: wm增加查询条件
							
							
							
							
							
						 | 
						
							2023-12-01 11:33:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c827c7d55d
								
							
						 | 
						
							
							
								
								fix: route创建时的校验
							
							
							
							
							
						 | 
						
							2023-12-01 10:28:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								68c2891839
								
							
						 | 
						
							
							
								
								fix: route创建时的校验
							
							
							
							
							
						 | 
						
							2023-12-01 09:53:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6dfa2b1696
								
							
						 | 
						
							
							
								
								fix: route创建时的校验
							
							
							
							
							
						 | 
						
							2023-12-01 09:50:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e8d78a5e9
								
							
						 | 
						
							
							
								
								doc: 增加注释
							
							
							
							
							
						 | 
						
							2023-11-30 17:10:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d94424131f
								
							
						 | 
						
							
							
								
								feat: materialbatch增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-30 17:05:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								cc0a2719de
								
							
						 | 
						
							
							
								
								feat: mtask增加submit_time
							
							
							
							
							
						 | 
						
							2023-11-30 16:30:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e041ec93b
								
							
						 | 
						
							
							
								
								fix: 任务提交接口改为单个提交
							
							
							
							
							
						 | 
						
							2023-11-30 16:00:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								81e97c4789
								
							
						 | 
						
							
							
								
								feat: 日志提交时间校验
							
							
							
							
							
						 | 
						
							2023-11-30 14:48:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9dc31b366b
								
							
						 | 
						
							
							
								
								fix: handover submit bug
							
							
							
							
							
						 | 
						
							2023-11-30 14:14:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73a463dd2f
								
							
						 | 
						
							
							
								
								feat: 增加mtask查询条件
							
							
							
							
							
						 | 
						
							2023-11-30 13:38:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								abb3fef89f
								
							
						 | 
						
							
							
								
								feat: 交接记录修改
							
							
							
							
							
						 | 
						
							2023-11-30 10:47:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a7ff21bb80
								
							
						 | 
						
							
							
								
								fix: handover增加送料工段
							
							
							
							
							
						 | 
						
							2023-11-30 10:15:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3a24e6f858
								
							
						 | 
						
							
							
								
								feat: handover增加送料工段
							
							
							
							
							
						 | 
						
							2023-11-29 16:52:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								eb665c7943
								
							
						 | 
						
							
							
								
								feat: mlog增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-29 16:23:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e07034919d
								
							
						 | 
						
							
							
								
								feat: mgroup增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-29 16:12:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ab0bc60c23
								
							
						 | 
						
							
							
								
								feat: utask增加返回数据
							
							
							
							
							
						 | 
						
							2023-11-29 10:57:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d9dcaf0d18
								
							
						 | 
						
							
							
								
								feat: 增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-29 10:29:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								429c0b6d5b
								
							
						 | 
						
							
							
								
								feat: 增加route查询条件
							
							
							
							
							
						 | 
						
							2023-11-29 09:47:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3ca0a3b533
								
							
						 | 
						
							
							
								
								feat: equipment description字段可不填
							
							
							
							
							
						 | 
						
							2023-11-28 15:32:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c8beedbcee
								
							
						 | 
						
							
							
								
								feat: 订单非创建中不可删除
							
							
							
							
							
						 | 
						
							2023-11-28 14:57:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e24a16b692
								
							
						 | 
						
							
							
								
								fix: mlog设置必填项目
							
							
							
							
							
						 | 
						
							2023-11-28 00:23:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ccc87a5a5c
								
							
						 | 
						
							
							
								
								fix: mioitem select_related bug
							
							
							
							
							
						 | 
						
							2023-11-27 23:29:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9ba83cc1fe
								
							
						 | 
						
							
							
								
								feat: 交接记录增加查询条件
							
							
							
							
							
						 | 
						
							2023-11-27 23:19:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								64ac57d217
								
							
						 | 
						
							
							
								
								feat: handover material必填
							
							
							
							
							
						 | 
						
							2023-11-27 23:15:19 +08:00 |