caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								72604f9992
								
							
						 | 
						
							
							
								
								feat: speaker 接口忽略采集器2
							
							
							
							
							
						 | 
						
							2024-11-20 16:28:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ae15f1a33c
								
							
						 | 
						
							
							
								
								feat: speaker 接口忽略采集器
							
							
							
							
							
						 | 
						
							2024-11-20 16:24:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8667267046
								
							
						 | 
						
							
							
								
								feat: equipment 列表支持is_deleted查询
							
							
							
							
							
						 | 
						
							2024-11-20 13:18:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16272cd15f
								
							
						 | 
						
							
							
								
								feat: save_voice_and_speak 添加日志
							
							
							
							
							
						 | 
						
							2024-11-20 09:56:00 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								598cadc4bb
								
							
						 | 
						
							
							
								
								feat: 添加事件喇叭播放测试api
							
							
							
							
							
						 | 
						
							2024-11-20 09:49:42 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a11ce128be
								
							
						 | 
						
							
							
								
								feat: 喇叭播放的日志
							
							
							
							
							
						 | 
						
							2024-11-20 09:45:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								5730a00742
								
							
						 | 
						
							
							
								
								feat: ftest更新ftestwork的count_sampling等字段
							
							
							
							
							
						 | 
						
							2024-11-19 17:52:57 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1cb64b26af
								
							
						 | 
						
							
							
								
								feat: mlog list 接口一点优化
							
							
							
							
							
						 | 
						
							2024-11-19 09:25:36 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7c85d3df65
								
							
						 | 
						
							
							
								
								fix: mlog select_related_fields bug2
							
							
							
							
							
						 | 
						
							2024-11-18 17:38:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a0423cbd3f
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-18 17:28:03 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								af72749b8a
								
							
						 | 
						
							
							
								
								fix: mlog select_related_fields bug
							
							
							
							
							
						 | 
						
							2024-11-18 17:27:41 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								13751b8a76
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-18 13:51:09 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								3fff294189
								
							
						 | 
						
							
							
								
								fix : enm 修改 单位产品综合能耗
							
							
							
							
							
						 | 
						
							2024-11-18 13:51:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e67bd892ae
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-18 10:42:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								71db15bacd
								
							
						 | 
						
							
							
								
								feat: 添加cms模块创建article表
							
							
							
							
							
						 | 
						
							2024-11-18 10:42:33 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								c2cae12c4f
								
							
						 | 
						
							
							
								
								fix:enm/service 修改小数点
							
							
							
							
							
						 | 
						
							2024-11-18 09:34:27 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9d5d7eceaf
								
							
						 | 
						
							
							
								
								fix : tkx enm bug fix
							
							
							
							
							
						 | 
						
							2024-11-14 17:48:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4518344fa6
								
							
						 | 
						
							
							
								
								fix: do_out 领料时的material_ofrom
							
							
							
							
							
						 | 
						
							2024-11-14 13:04:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6ef01ee301
								
							
						 | 
						
							
							
								
								fix: 其他出入库错误
							
							
							
							
							
						 | 
						
							2024-11-14 12:26:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								95739bc3bb
								
							
						 | 
						
							
							
								
								feat: wmaterial增加查询条件
							
							
							
							
							
						 | 
						
							2024-11-14 12:12:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6006d42f9d
								
							
						 | 
						
							
							
								
								fix: do_in bug
							
							
							
							
							
						 | 
						
							2024-11-14 11:54:55 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a00f533752
								
							
						 | 
						
							
							
								
								fix: mlog submit 关于wm.batch_ofrom的bug
							
							
							
							
							
						 | 
						
							2024-11-14 11:39:17 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9fb09f7c2a
								
							
						 | 
						
							
							
								
								fix: mlog submit 关于count_n的bug
							
							
							
							
							
						 | 
						
							2024-11-14 11:24:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdb06c6883
								
							
						 | 
						
							
							
								
								fix: 非合格/返修品不可使用 报错
							
							
							
							
							
						 | 
						
							2024-11-14 11:17:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								384bef705c
								
							
						 | 
						
							
							
								
								fix: MaterialBatch 添加字段以支持追踪原料批次6
							
							
							
							
							
						 | 
						
							2024-11-14 11:02:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e92ceca953
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次5
							
							
							
							
							
						 | 
						
							2024-11-14 10:52:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b5928b2927
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次4
							
							
							
							
							
						 | 
						
							2024-11-14 10:40:14 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								b9d9cf42cb
								
							
						 | 
						
							
							
								
								feat: mlog serializer添加batch_ofrom等
							
							
							
							
							
						 | 
						
							2024-11-14 08:47:31 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								90e699155c
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次3
							
							
							
							
							
						 | 
						
							2024-11-13 18:16:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								27c646e6df
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次2
							
							
							
							
							
						 | 
						
							2024-11-13 17:23:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4016c421be
								
							
						 | 
						
							
							
								
								feat: MaterialBatch 添加字段以支持追踪原料批次
							
							
							
							
							
						 | 
						
							2024-11-13 17:22:25 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7d9582fe34
								
							
						 | 
						
							
							
								
								feat: mlogb添加字段以追踪原料批次
							
							
							
							
							
						 | 
						
							2024-11-13 15:56:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c1d140a082
								
							
						 | 
						
							
							
								
								feat: mpointstat filterset 支持hour,day,month,year
							
							
							
							
							
						 | 
						
							2024-11-12 15:26:02 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6698e38d32
								
							
						 | 
						
							
							
								
								feat: wmaterial增加字段
							
							
							
							
							
						 | 
						
							2024-11-12 14:51:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0d66ae5e90
								
							
						 | 
						
							
							
								
								feat: generate_new_batch 中添加-变为>
							
							
							
							
							
						 | 
						
							2024-11-12 14:13:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a6fadedee2
								
							
						 | 
						
							
							
								
								fix: handle_date使用localdate获取日期
							
							
							
							
							
						 | 
						
							2024-11-11 17:00:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								96ba8c8223
								
							
						 | 
						
							
							
								
								feat: base permission serializer修改继承
							
							
							
							
							
						 | 
						
							2024-11-11 10:53:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ec834e27df
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-07 17:51:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								764396f42c
								
							
						 | 
						
							
							
								
								feat: base 支持树型的递归分页查询以传with_children参数
							
							
							
							
							
						 | 
						
							2024-11-07 17:50:48 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								feae902704
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-07 16:50:15 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								9c8e0081e2
								
							
						 | 
						
							
							
								
								feat: 修改 last_val - first_val 值
							
							
							
							
							
						 | 
						
							2024-11-07 16:50:11 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6eec199488
								
							
						 | 
						
							
							
								
								feat: mlog create时校验mtask是否是下达状态
							
							
							
							
							
						 | 
						
							2024-11-07 09:40:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								79b1317cc6
								
							
						 | 
						
							
							
								
								feat: count_running_state返回更多信息2
							
							
							
							
							
						 | 
						
							2024-11-07 09:03:54 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0ba6737661
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-07 09:02:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c8d7af1ba
								
							
						 | 
						
							
							
								
								feat: count_running_state返回更多信息
							
							
							
							
							
						 | 
						
							2024-11-07 09:01:53 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								aa75148878
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-06 10:43:50 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								8ec5f8c6dd
								
							
						 | 
						
							
							
								
								feat: enm 回转窑综合电耗计算
							
							
							
							
							
						 | 
						
							2024-11-06 10:43:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								98e3520127
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-05 17:43:50 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bce4a44408
								
							
						 | 
						
							
							
								
								feat: wmaterial可按mtask进行查询过滤
							
							
							
							
							
						 | 
						
							2024-11-05 17:43:34 +08:00 | 
						
					
				
					
						
							
							
								
								 zty
							
						 | 
						
							
							
							
							
							
								
							
							
								5fe86c3e98
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-11-05 13:34:45 +08:00 |