caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ca32d9f20f
								
							
						 | 
						
							
							
								
								fix: base permission获取优化
							
							
							
							
							
						 | 
						
							2024-10-20 10:46:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								27f7b3c076
								
							
						 | 
						
							
							
								
								feat: check_remployee_leave触发账户禁用
							
							
							
							
							
						 | 
						
							2024-10-17 13:39:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								deb0cb48df
								
							
						 | 
						
							
							
								
								fix: check_remployee_leave转task
							
							
							
							
							
						 | 
						
							2024-10-17 11:12:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7dd39d75bf
								
							
						 | 
						
							
							
								
								fix: 相关方分配管理员重置岗位
							
							
							
							
							
						 | 
						
							2024-10-17 10:28:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b28174309a
								
							
						 | 
						
							
							
								
								feat: 从车间库存明细获取物料标签
							
							
							
							
							
						 | 
						
							2024-10-16 11:13:25 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								46dd264dba
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-10-15 09:54:54 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								e6e18c6c30
								
							
						 | 
						
							
							
								
								feat: enm/task nick_name
							
							
							
							
							
						 | 
						
							2024-10-15 09:54:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3d7a9fb481
								
							
						 | 
						
							
							
								
								feat: labelmat 返回state_name
							
							
							
							
							
						 | 
						
							2024-10-14 13:20:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af751f5a9d
								
							
						 | 
						
							
							
								
								feat: 增加从车间库存明细获取物料标签
							
							
							
							
							
						 | 
						
							2024-10-14 09:09:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ebf3bbe257
								
							
						 | 
						
							
							
								
								feat: get_from_mb 返回更多信息
							
							
							
							
							
						 | 
						
							2024-10-11 15:54:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0157daa0ab
								
							
						 | 
						
							
							
								
								feat: 获取标签明细3
							
							
							
							
							
						 | 
						
							2024-10-11 15:41:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ef28e1ba47
								
							
						 | 
						
							
							
								
								feat: 获取标签明细2
							
							
							
							
							
						 | 
						
							2024-10-11 15:39:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								52a7d41518
								
							
						 | 
						
							
							
								
								feat: 获取标签明细
							
							
							
							
							
						 | 
						
							2024-10-11 15:38:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								419dbf3560
								
							
						 | 
						
							
							
								
								feat: 获取物料标签信息
							
							
							
							
							
						 | 
						
							2024-10-11 15:34:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								107818301f
								
							
						 | 
						
							
							
								
								feat: 改变条码格式
							
							
							
							
							
						 | 
						
							2024-10-11 15:28:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c524d1b9a5
								
							
						 | 
						
							
							
								
								feat: 添加条码二维码管理的app
							
							
							
							
							
						 | 
						
							2024-10-11 15:26:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8e918e9a7e
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-10-11 13:36:56 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ed8ee4e68d
								
							
						 | 
						
							
							
								
								feat: materialbatch 添加supplier字段
							
							
							
							
							
						 | 
						
							2024-10-11 13:36:53 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5203719023
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-10-10 13:34:16 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								96f4b0c445
								
							
						 | 
						
							
							
								
								feat: apps/enm 新增成本计算
							
							
							
							
							
						 | 
						
							2024-10-10 13:33:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c546e25808
								
							
						 | 
						
							
							
								
								fix: base get_alld_perms 传参
							
							
							
							
							
						 | 
						
							2024-10-09 14:18:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f347630981
								
							
						 | 
						
							
							
								
								feat: base 优化permission缓存处理
							
							
							
							
							
						 | 
						
							2024-10-09 13:57:35 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bc77137093
								
							
						 | 
						
							
							
								
								feat: base perm变动时出发get_alld_perms
							
							
							
							
							
						 | 
						
							2024-10-09 13:56:20 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								552055e6c5
								
							
						 | 
						
							
							
								
								feat: base 启动时缓存perms_alld_list
							
							
							
							
							
						 | 
						
							2024-10-09 13:55:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5e38f96925
								
							
						 | 
						
							
							
								
								feat: base CustomGenericViewSet 初始化优化
							
							
							
							
							
						 | 
						
							2024-10-09 13:47:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								71ac63bdaf
								
							
						 | 
						
							
							
								
								feat: base 添加全局线程池
							
							
							
							
							
						 | 
						
							2024-10-09 13:46:38 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								74ece85b0a
								
							
						 | 
						
							
							
								
								fix: import edge_tts 在函数中引入
							
							
							
							
							
						 | 
						
							2024-10-09 10:00:46 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7f9e2ad616
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-10-09 09:29:12 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								66af6475d9
								
							
						 | 
						
							
							
								
								feat: 修改采集时候出现0的处理
							
							
							
							
							
						 | 
						
							2024-10-09 09:26:29 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7c71eafa41
								
							
						 | 
						
							
							
								
								feat: 添加edge-tts语音生成
							
							
							
							
							
						 | 
						
							2024-10-08 15:10:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								494b078a09
								
							
						 | 
						
							
							
								
								feat: save_voice_and_speak 优化
							
							
							
							
							
						 | 
						
							2024-10-08 15:10:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								40c6479cf3
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-10-08 12:58:19 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f73aa2030
								
							
						 | 
						
							
							
								
								feat: 检查相关方人员门禁到期设为离职
							
							
							
							
							
						 | 
						
							2024-10-08 12:58:17 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								924d7f2b61
								
							
						 | 
						
							
							
								
								feat: 百度语音的配置
							
							
							
							
							
						 | 
						
							2024-09-30 17:05:43 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								780564f6e1
								
							
						 | 
						
							
							
								
								feat: 煤粉热值处理2
							
							
							
							
							
						 | 
						
							2024-09-30 16:22:30 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								cc5b521f5d
								
							
						 | 
						
							
							
								
								feat: 煤粉热值校正
							
							
							
							
							
						 | 
						
							2024-09-30 16:21:44 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c6e8f5992
								
							
						 | 
						
							
							
								
								fix: 电表水表0值处理
							
							
							
							
							
						 | 
						
							2024-09-30 16:21:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								956500d3aa
								
							
						 | 
						
							
							
								
								fix :enm/serializer round
							
							
							
							
							
						 | 
						
							2024-09-26 15:56:18 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9a3e15f926
								
							
						 | 
						
							
							
								
								feat: 优化mgroup_run_change
							
							
							
							
							
						 | 
						
							2024-09-26 11:51:36 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9f90d84244
								
							
						 | 
						
							
							
								
								fix: em/bug
							
							
							
							
							
						 | 
						
							2024-09-26 11:02:59 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								7517da3e92
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-09-25 16:04:03 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								008219e9ba
								
							
						 | 
						
							
							
								
								fix : em enm wpm 修改更新设备运行状态
							
							
							
							
							
						 | 
						
							2024-09-25 16:03:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c0cb51a5b5
								
							
						 | 
						
							
							
								
								feat: utask生产任务提交
							
							
							
							
							
						 | 
						
							2024-09-25 13:24:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								73aa186293
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-09-24 10:24:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								49712b8211
								
							
						 | 
						
							
							
								
								feat: mio添加mgroup查询条件
							
							
							
							
							
						 | 
						
							2024-09-24 10:24:51 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								dd3c0d6f6b
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-09-23 10:04:46 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								d5e48c1ab8
								
							
						 | 
						
							
							
								
								fix: enm、fim 修改费用过滤和能源加入班组开始结束时间
							
							
							
							
							
						 | 
						
							2024-09-23 10:04:43 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8273a96597
								
							
						 | 
						
							
							
								
								fix: FtestWork 检验数据设置为非负整数
							
							
							
							
							
						 | 
						
							2024-09-20 09:16:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5628a1ff83
								
							
						 | 
						
							
							
								
								feat: ftestwork增加校验
							
							
							
							
							
						 | 
						
							2024-09-19 15:08:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								305fda44c2
								
							
						 | 
						
							
							
								
								feat: wmaterialserializer 增加count_cando返回
							
							
							
							
							
						 | 
						
							2024-09-18 09:34:55 +08:00 |