caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebd9c96300
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2023-10-23 09:07:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d0b40cfd3d
								
							
						 | 
						
							
							
								
								feat: handle_user也作为约束条件
							
							
							
							
							
						 | 
						
							2023-10-23 09:07:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2725a97213
								
							
						 | 
						
							
							
								
								feat: handle_user也作为约束条件
							
							
							
							
							
						 | 
						
							2023-10-23 09:02:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a1c74a0fa6
								
							
						 | 
						
							
							
								
								feat: 增加多个友好接口
							
							
							
							
							
						 | 
						
							2023-10-23 09:02:37 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a69fa79de8
								
							
						 | 
						
							
							
								
								feat:  获取指定车间指定日期的最后工序生产任务
							
							
							
							
							
						 | 
						
							2023-10-20 16:55:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0843cf6ce3
								
							
						 | 
						
							
							
								
								fix: mtasks_submit 时未填写日志校验
							
							
							
							
							
						 | 
						
							2023-10-20 15:36:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d8be8665eb
								
							
						 | 
						
							
							
								
								fix: 提交任务submit_related_same_day
							
							
							
							
							
						 | 
						
							2023-10-20 14:51:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c142f00bf3
								
							
						 | 
						
							
							
								
								feat: 增加handle_date及相应的校验
							
							
							
							
							
						 | 
						
							2023-10-20 14:50:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f9b3a69552
								
							
						 | 
						
							
							
								
								fix: update_mtask bug
							
							
							
							
							
						 | 
						
							2023-10-20 14:49:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								47895ac109
								
							
						 | 
						
							
							
								
								fix: 修改订单状态显示
							
							
							
							
							
						 | 
						
							2023-10-20 09:25:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3fd0347837
								
							
						 | 
						
							
							
								
								feat: 增加utask过滤条件
							
							
							
							
							
						 | 
						
							2023-10-20 09:24:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3d407795a9
								
							
						 | 
						
							
							
								
								feat: 增加utask
							
							
							
							
							
						 | 
						
							2023-10-20 09:08:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								53d2276998
								
							
						 | 
						
							
							
								
								fix: mlog confirm bug
							
							
							
							
							
						 | 
						
							2023-10-19 14:07:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								21f53dd3ef
								
							
						 | 
						
							
							
								
								fix: 采购入库创建与提交
							
							
							
							
							
						 | 
						
							2023-10-19 14:06:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4a1996c4e9
								
							
						 | 
						
							
							
								
								fix: 生产日志提交时逻辑bug
							
							
							
							
							
						 | 
						
							2023-10-19 14:05:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								80b2685417
								
							
						 | 
						
							
							
								
								fix: 采购入库逻辑的bug
							
							
							
							
							
						 | 
						
							2023-10-19 14:04:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0965e6c68e
								
							
						 | 
						
							
							
								
								fix: 任务创建只是用create
							
							
							
							
							
						 | 
						
							2023-10-19 14:03:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c3afc248ab
								
							
						 | 
						
							
							
								
								feat: 增加sam返回字段
							
							
							
							
							
						 | 
						
							2023-10-18 16:29:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93d0c43b05
								
							
						 | 
						
							
							
								
								feat: 优化mtask创建
							
							
							
							
							
						 | 
						
							2023-10-18 16:28:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e8a8c1d078
								
							
						 | 
						
							
							
								
								feat: 增加字段和material查询条件
							
							
							
							
							
						 | 
						
							2023-10-18 16:27:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8b7f6395d4
								
							
						 | 
						
							
							
								
								feat: 增加字段和material查询条件
							
							
							
							
							
						 | 
						
							2023-10-18 16:27:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8fd6f82bc2
								
							
						 | 
						
							
							
								
								feat: 增加字段和material查询条件
							
							
							
							
							
						 | 
						
							2023-10-18 16:27:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								84db42e7c4
								
							
						 | 
						
							
							
								
								refector: 更新物料总量用update
							
							
							
							
							
						 | 
						
							2023-10-18 16:26:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5e34558c02
								
							
						 | 
						
							
							
								
								feat: route增加主要输入和输出以及自动排产逻辑修改
							
							
							
							
							
						 | 
						
							2023-10-16 16:50:46 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ad84876712
								
							
						 | 
						
							
							
								
								feat: order, pu_order 返回更多信息
							
							
							
							
							
						 | 
						
							2023-10-16 10:43:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f3b43ab0ce
								
							
						 | 
						
							
							
								
								fix: mgroup 增加need_enm字段
							
							
							
							
							
						 | 
						
							2023-10-13 13:13:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ff58685cbc
								
							
						 | 
						
							
							
								
								fix: 订单明细添加权限
							
							
							
							
							
						 | 
						
							2023-10-12 10:49:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								177aeb4bed
								
							
						 | 
						
							
							
								
								fix: update order submit_time ignore
							
							
							
							
							
						 | 
						
							2023-10-12 10:08:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								450381d7fb
								
							
						 | 
						
							
							
								
								fix: puorder puplan submit_time不可更改
							
							
							
							
							
						 | 
						
							2023-10-12 08:39:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af920a66f7
								
							
						 | 
						
							
							
								
								fix: add_from_planitems bug
							
							
							
							
							
						 | 
						
							2023-10-12 08:34:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3a224eafec
								
							
						 | 
						
							
							
								
								feat: 增加filter_custom必要时可复写
							
							
							
							
							
						 | 
						
							2023-10-11 16:38:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								56ed286eaf
								
							
						 | 
						
							
							
								
								feat: mio和mioitem的权限控制
							
							
							
							
							
						 | 
						
							2023-10-11 16:27:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1cc632b35b
								
							
						 | 
						
							
							
								
								feat: 添加has_perm方法typing
							
							
							
							
							
						 | 
						
							2023-10-11 15:35:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e41710e438
								
							
						 | 
						
							
							
								
								feat: 添加has_perm方法
							
							
							
							
							
						 | 
						
							2023-10-11 15:30:38 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								65c6dab239
								
							
						 | 
						
							
							
								
								feat: 优化mio list请求
							
							
							
							
							
						 | 
						
							2023-10-11 15:23:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae43296ab5
								
							
						 | 
						
							
							
								
								fix: puorderitem create bug
							
							
							
							
							
						 | 
						
							2023-10-11 15:19:26 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9461d57159
								
							
						 | 
						
							
							
								
								feat: 出入库记录新增分多个接口
							
							
							
							
							
						 | 
						
							2023-10-11 15:16:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aff046db88
								
							
						 | 
						
							
							
								
								fix: add_from_planitems bug
							
							
							
							
							
						 | 
						
							2023-10-11 10:29:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c6f9b749c7
								
							
						 | 
						
							
							
								
								feat: mlog增加handle_user
							
							
							
							
							
						 | 
						
							2023-10-10 16:43:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								604b4abe21
								
							
						 | 
						
							
							
								
								feat: 增加mtask查询条件
							
							
							
							
							
						 | 
						
							2023-10-10 15:54:09 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f5067e3163
								
							
						 | 
						
							
							
								
								fix: clear_bgl_r 跳出循环
							
							
							
							
							
						 | 
						
							2023-10-10 12:08:01 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5d405dbe8d
								
							
						 | 
						
							
							
								
								fix: clear_bgl_r
							
							
							
							
							
						 | 
						
							2023-10-10 12:05:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								702fe8f87e
								
							
						 | 
						
							
							
								
								fix: clear_bgl_r
							
							
							
							
							
						 | 
						
							2023-10-10 12:04:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3a07c2b47c
								
							
						 | 
						
							
							
								
								feat: 直接使用大华的门禁权限接口吧
							
							
							
							
							
						 | 
						
							2023-10-10 09:34:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9c0423d0dc
								
							
						 | 
						
							
							
								
								feat: 批量清空办公室打卡门禁的相关方权限
							
							
							
							
							
						 | 
						
							2023-10-09 17:29:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								29e94f8546
								
							
						 | 
						
							
							
								
								fix: 删除门禁权限的bug
							
							
							
							
							
						 | 
						
							2023-10-09 17:22:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7f1f3df956
								
							
						 | 
						
							
							
								
								feat: 煤粉热值系数修改
							
							
							
							
							
						 | 
						
							2023-10-09 16:52:16 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4ca344a86a
								
							
						 | 
						
							
							
								
								feat: doorauth增加查询条件
							
							
							
							
							
						 | 
						
							2023-10-09 15:34:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3b0710626a
								
							
						 | 
						
							
							
								
								feat: employeeshort增加type
							
							
							
							
							
						 | 
						
							2023-10-09 14:20:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6b6175803c
								
							
						 | 
						
							
							
								
								fix: door_auth bulk_create id bug
							
							
							
							
							
						 | 
						
							2023-10-09 12:36:42 +08:00 |