caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								196209d60c
								
							
						 | 
						
							
							
								
								feat: 支持多种开停信号联动
							
							
							
							
							
						 | 
						
							2024-04-19 13:03:30 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								a8fb69d747
								
							
						 | 
						
							
							
								
								fix: 去除mpoint无用字段及相应逻辑变动
							
							
							
							
							
						 | 
						
							2024-04-18 15:01:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								aee63ef771
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-18 13:46:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								17953a42aa
								
							
						 | 
						
							
							
								
								style: 代码格式化
							
							
							
							
							
						 | 
						
							2024-04-18 13:46:58 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f7d5375a5f
								
							
						 | 
						
							
							
								
								fix: 优化物料批次导入
							
							
							
							
							
						 | 
						
							2024-04-17 22:46:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								92bf0ac29e
								
							
						 | 
						
							
							
								
								fix: enp drain2serializer sql查询优化
							
							
							
							
							
						 | 
						
							2024-04-17 11:18:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fdc7ceff8d
								
							
						 | 
						
							
							
								
								fix: 优化模拟数据生成generate_envdata
							
							
							
							
							
						 | 
						
							2024-04-16 15:23:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								ff035096e5
								
							
						 | 
						
							
							
								
								feat: update mplogx表结构
							
							
							
							
							
						 | 
						
							2024-04-16 15:11:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								dfaed5e5e5
								
							
						 | 
						
							
							
								
								feat: 采集逻辑整体重构
							
							
							
							
							
						 | 
						
							2024-04-16 15:03:59 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								10632d9cae
								
							
						 | 
						
							
							
								
								fix: 启动时无需缓存测点
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:53 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								f9fc6f9d96
								
							
						 | 
						
							
							
								
								feat: equipment字段增加
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:27 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								86e9bf6776
								
							
						 | 
						
							
							
								
								feat: 设备运行状态改变触发函数
							
							
							
							
							
						 | 
						
							2024-04-16 15:02:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e78511b556
								
							
						 | 
						
							
							
								
								style: 格式调整
							
							
							
							
							
						 | 
						
							2024-04-16 15:01:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								640d1a1bce
								
							
						 | 
						
							
							
								
								fix: 去除is_online字段引发的变动
							
							
							
							
							
						 | 
						
							2024-04-16 14:59:07 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6e84e70852
								
							
						 | 
						
							
							
								
								fix: 生成envdata数据2
							
							
							
							
							
						 | 
						
							2024-04-16 14:47:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								67c0777fc9
								
							
						 | 
						
							
							
								
								fix: 生成envdata数据
							
							
							
							
							
						 | 
						
							2024-04-16 14:41:15 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								141e8ad4c8
								
							
						 | 
						
							
							
								
								Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server
							
							
							
							
							
						 | 
						
							2024-04-16 13:22:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								7b1eea0e20
								
							
						 | 
						
							
							
								
								feat: 添加check设备离线的脚本
							
							
							
							
							
						 | 
						
							2024-04-16 13:22:45 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								153fca308e
								
							
						 | 
						
							
							
								
								feat: base systemuser增加筛选条件
							
							
							
							
							
						 | 
						
							2024-04-12 16:43:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								35387a8333
								
							
						 | 
						
							
							
								
								fix: envdata list filter bug
							
							
							
							
							
						 | 
						
							2024-04-12 16:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								13c63a7aff
								
							
						 | 
						
							
							
								
								feat: 调整独立运行的scripts的文件位置
							
							
							
							
							
						 | 
						
							2024-04-12 10:40:05 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								2ea048cc53
								
							
						 | 
						
							
							
								
								fix: mqtt 包引入调整
							
							
							
							
							
						 | 
						
							2024-04-11 21:31:49 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3e75683ee1
								
							
						 | 
						
							
							
								
								fix: EnvDataSerializer round处理2
							
							
							
							
							
						 | 
						
							2024-04-11 16:59:18 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								68933e3e16
								
							
						 | 
						
							
							
								
								fix: EnvDataSerializer round处理
							
							
							
							
							
						 | 
						
							2024-04-11 16:57:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								99e4079c52
								
							
						 | 
						
							
							
								
								fix: equipment evdata add_info_for_list2
							
							
							
							
							
						 | 
						
							2024-04-11 16:38:24 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d191a18f7b
								
							
						 | 
						
							
							
								
								fix: equipment evdata add_info_for_list
							
							
							
							
							
						 | 
						
							2024-04-11 16:32:52 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0061285355
								
							
						 | 
						
							
							
								
								feat: 变更一下envdata表结构
							
							
							
							
							
						 | 
						
							2024-04-11 15:49:44 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								74cbaa8497
								
							
						 | 
						
							
							
								
								refector: 修改函数名
							
							
							
							
							
						 | 
						
							2024-04-11 15:01:23 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								bd1897f6f6
								
							
						 | 
						
							
							
								
								feat: correct_material_cate
							
							
							
							
							
						 | 
						
							2024-04-11 11:29:21 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								16417e0016
								
							
						 | 
						
							
							
								
								feat: 优化亚控测点批量存库及相应enm逻辑更改
							
							
							
							
							
						 | 
						
							2024-04-11 11:08:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								6fde78574b
								
							
						 | 
						
							
							
								
								fix: base period_dict错误修改
							
							
							
							
							
						 | 
						
							2024-04-11 10:59:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0fdb230822
								
							
						 | 
						
							
							
								
								feat: mplog视图层转mplogx
							
							
							
							
							
						 | 
						
							2024-04-11 10:58:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								1139bb6119
								
							
						 | 
						
							
							
								
								feat: 优化make_sflog/get_sflog
							
							
							
							
							
						 | 
						
							2024-04-11 10:56:32 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								d8de59c3f2
								
							
						 | 
						
							
							
								
								feat: base 增加ctask_run将普通函数转celery执行
							
							
							
							
							
						 | 
						
							2024-04-11 10:53:39 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								813301e7e1
								
							
						 | 
						
							
							
								
								feat: 变更mpoint字段
							
							
							
							
							
						 | 
						
							2024-04-11 10:52:13 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								23eac91491
								
							
						 | 
						
							
							
								
								feat: enm启动时缓存测点
							
							
							
							
							
						 | 
						
							2024-04-11 10:47:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								19f6e18154
								
							
						 | 
						
							
							
								
								feat: material的count改为对所有库存进行统计
							
							
							
							
							
						 | 
						
							2024-04-09 08:40:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								9b2dbb8a01
								
							
						 | 
						
							
							
								
								feat: 增加矫正correct_material_count的task
							
							
							
							
							
						 | 
						
							2024-04-08 18:34:04 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								8c798984f3
								
							
						 | 
						
							
							
								
								fix:  correct_mb_count_notok
							
							
							
							
							
						 | 
						
							2024-04-08 17:08:08 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fa3452088f
								
							
						 | 
						
							
							
								
								fix:  correct_mb_count_notok
							
							
							
							
							
						 | 
						
							2024-04-08 17:03:48 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								e8802c09b2
								
							
						 | 
						
							
							
								
								fix: 矫正mioitem count_notok错误的数据
							
							
							
							
							
						 | 
						
							2024-04-08 16:30:28 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								fe19847458
								
							
						 | 
						
							
							
								
								feat: mioitem增加扁不合格项字段
							
							
							
							
							
						 | 
						
							2024-04-08 13:53:12 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								4f0ef8b4ac
								
							
						 | 
						
							
							
								
								feat: kingclient兼容处理
							
							
							
							
							
						 | 
						
							2024-04-07 19:15:34 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								3c1319d48f
								
							
						 | 
						
							
							
								
								feat: material增加search字段
							
							
							
							
							
						 | 
						
							2024-04-07 19:15:10 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								93022f7c40
								
							
						 | 
						
							
							
								
								feat: king_sync以d做name
							
							
							
							
							
						 | 
						
							2024-04-07 18:34:47 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								c6222c65f6
								
							
						 | 
						
							
							
								
								feat: 半成品检验有关库存消耗完的逻辑处理
							
							
							
							
							
						 | 
						
							2024-04-07 18:33:40 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								29f085253c
								
							
						 | 
						
							
							
								
								fix: MIOPurSerializer添加supplier
							
							
							
							
							
						 | 
						
							2024-04-07 15:18:41 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								0cf9f14a5c
								
							
						 | 
						
							
							
								
								fix: generate_envdata 优化
							
							
							
							
							
						 | 
						
							2024-04-04 01:03:06 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								76f5d12b34
								
							
						 | 
						
							
							
								
								feat: envdata生成模拟数据
							
							
							
							
							
						 | 
						
							2024-04-03 16:45:33 +08:00 | 
						
					
				
					
						
							
							
								
								 caoqianming
							
						 | 
						
							
							
							
							
							
								
							
							
								68fc7f4217
								
							
						 | 
						
							
							
								
								feat: 生产领料校验优化
							
							
							
							
							
						 | 
						
							2024-04-03 09:23:27 +08:00 |