caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b765e87517
								
							
						 | 
						
							
							
								
								feat: equipment的导入3
							
							
							
							
							
						 | 
						
							2023-12-20 17:17:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6dddf17980
								
							
						 | 
						
							
							
								
								feat: equipment的导入2
							
							
							
							
							
						 | 
						
							2023-12-20 17:09:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								873dda9296
								
							
						 | 
						
							
							
								
								feat: equipment的导入
							
							
							
							
							
						 | 
						
							2023-12-20 17:02:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0f2d2dbee9
								
							
						 | 
						
							
							
								
								feat: 其他生产记录增加查询handle_date
							
							
							
							
							
						 | 
						
							2023-12-20 15:17:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								85a49c4b0f
								
							
						 | 
						
							
							
								
								feat: material 返回 __str__修改
							
							
							
							
							
						 | 
						
							2023-12-20 15:05:22 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								570570b517
								
							
						 | 
						
							
							
								
								feat: materialserializer 也返回full_name
							
							
							
							
							
						 | 
						
							2023-12-20 14:47:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1e6faad79b
								
							
						 | 
						
							
							
								
								feat: material_simple_serializer full_name完整信息
							
							
							
							
							
						 | 
						
							2023-12-20 14:41:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ea8465cb2e
								
							
						 | 
						
							
							
								
								feat: route serializer增加返回数据
							
							
							
							
							
						 | 
						
							2023-12-20 14:31:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4ac4da7959
								
							
						 | 
						
							
							
								
								fix: get_file_list 默认返回空列表
							
							
							
							
							
						 | 
						
							2023-12-19 20:50:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7bfe74b97f
								
							
						 | 
						
							
							
								
								feat: pu_orderitem权限修改
							
							
							
							
							
						 | 
						
							2023-12-19 17:20:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a9b81849b2
								
							
						 | 
						
							
							
								
								fix: opencv在启动时不import
							
							
							
							
							
						 | 
						
							2023-12-19 12:40:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0870b13ea3
								
							
						 | 
						
							
							
								
								feat: mioitem增加入厂检验
							
							
							
							
							
						 | 
						
							2023-12-18 15:52:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								043869e828
								
							
						 | 
						
							
							
								
								feat: mlog增加不合格原因字段
							
							
							
							
							
						 | 
						
							2023-12-18 14:21:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1de76ffc33
								
							
						 | 
						
							
							
								
								fix: create_auditlog update不记录的bug
							
							
							
							
							
						 | 
						
							2023-12-18 13:24:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0a3e434a7e
								
							
						 | 
						
							
							
								
								fix: create_auditlog bug
							
							
							
							
							
						 | 
						
							2023-12-18 13:07:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1e2f12df7
								
							
						 | 
						
							
							
								
								fix: compare_lists_of_dicts的bug
							
							
							
							
							
						 | 
						
							2023-12-18 13:01:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bf5d62e99d
								
							
						 | 
						
							
							
								
								fix: mlog提交时如有mtask则handle_date为mtask日期2
							
							
							
							
							
						 | 
						
							2023-12-18 12:25:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6182ef3c58
								
							
						 | 
						
							
							
								
								feat: mlog提交时如有mtask则handle_date为mtask日期
							
							
							
							
							
						 | 
						
							2023-12-18 11:20:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a9c16c4a9d
								
							
						 | 
						
							
							
								
								feat: 日志提交和撤回返回序列化信息
							
							
							
							
							
						 | 
						
							2023-12-18 11:12:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								94c026f23f
								
							
						 | 
						
							
							
								
								feat: create_auditlog bug
							
							
							
							
							
						 | 
						
							2023-12-18 10:25:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								625074049e
								
							
						 | 
						
							
							
								
								feat: mlog日志撤回
							
							
							
							
							
						 | 
						
							2023-12-18 09:18:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								845a510068
								
							
						 | 
						
							
							
								
								fix: mlog撤回1未完成
							
							
							
							
							
						 | 
						
							2023-12-18 08:08:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c43f8ec62
								
							
						 | 
						
							
							
								
								fix: handover update validate更严谨一些
							
							
							
							
							
						 | 
						
							2023-12-17 19:55:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e954b37404
								
							
						 | 
						
							
							
								
								feat: 添加与任务相关的日志信息peifen_kg
							
							
							
							
							
						 | 
						
							2023-12-17 19:55:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1b5c910cf8
								
							
						 | 
						
							
							
								
								fix: 交接记录的提交bug
							
							
							
							
							
						 | 
						
							2023-12-16 13:00:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dff1e412b6
								
							
						 | 
						
							
							
								
								feat: 修改material __str__
							
							
							
							
							
						 | 
						
							2023-12-16 12:00:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aa2dc2e0fc
								
							
						 | 
						
							
							
								
								feat: 增加materialsimpleserializer的返回full_name
							
							
							
							
							
						 | 
						
							2023-12-16 11:56:51 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f1ae6ddc6
								
							
						 | 
						
							
							
								
								fix: mlogsubmit bug
							
							
							
							
							
						 | 
						
							2023-12-16 11:46:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd6b4a5f82
								
							
						 | 
						
							
							
								
								fix: gen_by_wm需提供send_mgroup
							
							
							
							
							
						 | 
						
							2023-12-16 11:42:38 +08:00 | 
						
					
				
					
						
							
							
								
								 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 |