|  caoqianming | 1cb9b3495a | feat: mpoitstatserializer增加mpoint_nickname返回 | 2024-05-07 13:50:13 +08:00 | 
				
					
						|  caoqianming | ec9260f353 | feat: mpointstat增加排序条件 | 2024-05-07 13:37:10 +08:00 | 
				
					
						|  caoqianming | 03e073e00a | feat: mpointstat增加查询条件 | 2024-05-07 13:19:59 +08:00 | 
				
					
						|  caoqianming | 25965c7072 | fix: transfer_mpoint_val_to_ep_running_state 对expr_str的replace | 2024-05-07 13:07:52 +08:00 | 
				
					
						|  caoqianming | 52fc0c6bd3 | fix: translate_eval_formula enm_lhxs的处理 | 2024-05-07 11:09:19 +08:00 | 
				
					
						|  caoqianming | ce38c3e338 | fix: get_total_hour_now exclude 错误 | 2024-05-07 10:16:22 +08:00 | 
				
					
						|  caoqianming | 6ee42a6993 | fix: get_total_hour_now默认参数为空 | 2024-05-07 10:00:24 +08:00 | 
				
					
						|  caoqianming | 02a8693a65 | fix: cal_enstat前调用一下get_total_hour_now | 2024-05-07 09:58:32 +08:00 | 
				
					
						|  caoqianming | 35d6d7beb9 | feat: 监控测点掉线函数优化 | 2024-05-06 18:33:16 +08:00 | 
				
					
						|  caoqianming | cb1576b797 | fix: 尝试修改信号量计算测点 | 2024-05-06 18:13:32 +08:00 | 
				
					
						|  caoqianming | d73cc1af5b | feat: 料耗系数可用于测点 | 2024-05-06 16:14:35 +08:00 | 
				
					
						|  caoqianming | 6ae849150f | fix: cache_key mpoint保留 | 2024-05-06 00:10:47 +08:00 | 
				
					
						|  caoqianming | 6cd255173f | refector: 改mpoint的处理逻辑添加mpoint_affect支持并重构部分代码 | 2024-05-06 00:06:08 +08:00 | 
				
					
						|  caoqianming | a46cfe59ed | feat: 添加mpoint_affect字段 | 2024-05-06 00:05:24 +08:00 | 
				
					
						|  caoqianming | a1999fb53d | fix: 上个改动没有必要现在回退 | 2024-05-02 00:33:57 +08:00 | 
				
					
						|  caoqianming | ca15092c5c | feat: shutdown_or_startup 如果不是工段不用关心其开停 | 2024-05-02 00:25:37 +08:00 | 
				
					
						|  caoqianming | 634884f336 | doc: 增加注释 | 2024-05-02 00:02:41 +08:00 | 
				
					
						|  caoqianming | 6ea5e0b5d7 | fix: make_sflogs当天班生成缺少的bug | 2024-05-02 00:01:47 +08:00 | 
				
					
						|  caoqianming | 2263c0decb | fix: 如果结束时间为0点则取开始时间来返回年月日2 | 2024-04-30 19:00:19 +08:00 | 
				
					
						|  caoqianming | a6914413f7 | fix: 如果结束时间为0点则取开始时间来返回年月日 | 2024-04-30 18:20:31 +08:00 | 
				
					
						|  caoqianming | 69db9db180 | fix: 全厂电量计算enstat2.elec_consume拿不到默认0,3 | 2024-04-30 18:01:15 +08:00 | 
				
					
						|  caoqianming | a7d03321d8 | fix: 全厂电量计算enstat2.elec_consume拿不到默认0,2 | 2024-04-30 17:49:53 +08:00 | 
				
					
						|  caoqianming | 94c34480ec | fix: 全厂电量计算enstat2.elec_consume拿不到默认0 | 2024-04-30 17:39:57 +08:00 | 
				
					
						|  caoqianming | 59c000670a | fix: 全厂电量计算bug | 2024-04-30 16:53:06 +08:00 | 
				
					
						|  caoqianming | cb766247b0 | fix: water_consume | 2024-04-30 16:23:57 +08:00 | 
				
					
						|  caoqianming | 5f20247818 | feat: 添加一个log排查逻辑错误 | 2024-04-30 14:21:09 +08:00 | 
				
					
						|  caoqianming | dddab37c63 | fix: get_sflog 取的时候与happen_time对比错误 | 2024-04-30 12:59:38 +08:00 | 
				
					
						|  caoqianming | 90ed2927e6 | feat: cal_mpointstat_hour 添加一个日志 | 2024-04-30 12:39:43 +08:00 | 
				
					
						|  caoqianming | 1e8e4c6f70 | refector: formular无需用$符号 | 2024-04-30 11:01:56 +08:00 | 
				
					
						|  caoqianming | 5f67673c45 | feat: base 完整的task on_failure日志记录和邮件推送 | 2024-04-29 21:46:49 +08:00 | 
				
					
						|  caoqianming | 513d37e9ac | feat: base 完整的task on_failure日志记录和邮件推送 | 2024-04-29 21:45:35 +08:00 | 
				
					
						|  caoqianming | 3a0d229ec0 | feat: mpoint view增加查询条件 | 2024-04-29 21:31:28 +08:00 | 
				
					
						|  caoqianming | 9c9164b176 | fix: translate_eval_formula 执行时不try | 2024-04-29 21:28:29 +08:00 | 
				
					
						|  caoqianming | 836c2a2baf | fix: translate_eval_formula bug2 | 2024-04-29 17:29:04 +08:00 | 
				
					
						|  caoqianming | 2e4f6f0445 | fix: translate_eval_formula bug | 2024-04-29 16:52:01 +08:00 | 
				
					
						|  caoqianming | 48c6ad53b9 | fix: 计算统计测点的时候按顺序计算 | 2024-04-29 16:15:11 +08:00 | 
				
					
						|  caoqianming | 3fcb015fdd | feat: 添加多个函数来监测测点、设备、工段的运行或离线状态 | 2024-04-29 14:45:11 +08:00 | 
				
					
						|  caoqianming | 408bb37b67 | fix: is_runing字段错误 | 2024-04-29 14:43:45 +08:00 | 
				
					
						|  caoqianming | a26656109c | feat: 优化mpointstat计算点选择 | 2024-04-29 12:53:55 +08:00 | 
				
					
						|  caoqianming | 32a1cd08d0 | feat: check offline 关于mgroup更完善 | 2024-04-29 10:21:22 +08:00 | 
				
					
						|  caoqianming | d720dc9c9b | fix: mgroup is_running字段更改2 | 2024-04-29 10:17:42 +08:00 | 
				
					
						|  caoqianming | fa6d6da1d2 | fix: mgroup is_running字段更改 | 2024-04-29 10:17:31 +08:00 | 
				
					
						|  caoqianming | 1f227c7645 | feat: 优化shutdown_or_startup导致的并发存库问题 | 2024-04-28 18:22:25 +08:00 | 
				
					
						|  caoqianming | 61e84bd302 | feat: mpoint增加查询条件need_display | 2024-04-28 17:52:12 +08:00 | 
				
					
						|  caoqianming | df5a6d5d96 | feat: 生成值班记录只对工段 | 2024-04-28 17:50:44 +08:00 | 
				
					
						|  caoqianming | 5b1575bca0 | fix: update_mpoint_cache 更新设备信号的bug | 2024-04-28 15:25:08 +08:00 | 
				
					
						|  caoqianming | 13adb0d4ea | feat: 添加一处log以定位问题 | 2024-04-28 15:19:32 +08:00 | 
				
					
						|  caoqianming | 107f0fc61d | fix: 监控掉线的bug | 2024-04-28 15:07:17 +08:00 | 
				
					
						|  caoqianming | 85fce01834 | fix: shutdown_or_startup 启动 | 2024-04-28 14:56:27 +08:00 | 
				
					
						|  caoqianming | 601bb0ae60 | fix: set_eq_rs 更新设备状态忘记传参数 | 2024-04-28 14:45:28 +08:00 | 
				
					
						|  caoqianming | ece11699f8 | feat: sflogexp返回更多信息 | 2024-04-28 13:32:53 +08:00 | 
				
					
						|  caoqianming | acad9c6acf | fix: stlog create时validate3 | 2024-04-28 13:10:01 +08:00 | 
				
					
						|  caoqianming | 8375345e56 | fix: stlog create时validate2 | 2024-04-28 11:30:05 +08:00 | 
				
					
						|  caoqianming | 05f675f610 | fix: stlog create时validate | 2024-04-28 11:26:55 +08:00 | 
				
					
						|  caoqianming | b803cac69f | fix: 测点orderingbug | 2024-04-28 10:10:49 +08:00 | 
				
					
						|  caoqianming | 6f98d9dfb3 | fix: stlog validate total_secondsbug | 2024-04-28 10:04:30 +08:00 | 
				
					
						|  caoqianming | d01bb012b9 | fix: 异常值班处理的权限 | 2024-04-28 09:35:16 +08:00 | 
				
					
						|  caoqianming | c179d91ebd | feat: 采集逻辑优化 | 2024-04-28 09:34:33 +08:00 | 
				
					
						|  caoqianming | 9805b471d4 | feat: 添加料耗系数 | 2024-04-26 15:24:42 +08:00 | 
				
					
						|  caoqianming | 7642f23423 | fix: return self.request | 2024-04-26 10:47:55 +08:00 | 
				
					
						|  caoqianming | 070ccd72f4 | fix:  insert_mplogx_item忽略唯一性插入错误 | 2024-04-26 10:31:55 +08:00 | 
				
					
						|  caoqianming | a4cecb86cb | fix: king request 6 | 2024-04-25 21:46:18 +08:00 | 
				
					
						|  caoqianming | 932ef2d2c8 | fix: king request 6 | 2024-04-25 21:37:58 +08:00 | 
				
					
						|  caoqianming | dd61b1ba01 | fix: king request 5 | 2024-04-25 20:54:35 +08:00 | 
				
					
						|  caoqianming | 4004278f31 | fix: kingClient get_token request 4 | 2024-04-25 18:43:44 +08:00 | 
				
					
						|  caoqianming | 1a2baa82d9 | fix: kingClient get_token request 3 | 2024-04-25 18:35:33 +08:00 | 
				
					
						|  caoqianming | 41c79c1fdd | fix: kingClient get_token request 2 | 2024-04-25 18:25:38 +08:00 | 
				
					
						|  caoqianming | facecacc38 | fix: kingClient get_token request | 2024-04-25 18:05:02 +08:00 | 
				
					
						|  caoqianming | 00e3129751 | feat: 设备运行状态的缓存优化 | 2024-04-25 15:12:39 +08:00 | 
				
					
						|  caoqianming | 7d8585856d | feat: kingclient优化 | 2024-04-25 14:59:46 +08:00 | 
				
					
						|  caoqianming | 9600e95272 | fix: check_equipment_offline后需更新缓存 | 2024-04-25 13:45:07 +08:00 | 
				
					
						|  caoqianming | 8b8b65c8ba | fix: kingclient err_detail记录错误 | 2024-04-25 13:01:53 +08:00 | 
				
					
						|  caoqianming | bf3b61413a | fix: kingclient logout不抛出异常只记录日志 | 2024-04-25 12:50:02 +08:00 | 
				
					
						|  caoqianming | f1e1ae5dc6 | feat: kingClient登录优化 | 2024-04-25 12:34:56 +08:00 | 
				
					
						|  caoqianming | 0c6fe5e37c | Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server | 2024-04-25 12:24:36 +08:00 | 
				
					
						|  caoqianming | 9164464b10 | fix: kingclient get_token问题 | 2024-04-25 12:24:34 +08:00 | 
				
					
						|  caoqianming | 8cb9cfb849 | feat: set_equip_rs | 2024-04-25 00:02:20 +08:00 | 
				
					
						|  caoqianming | 53b1ceafa0 | feat: ctask_run delay执行及相应优化 | 2024-04-24 23:54:35 +08:00 | 
				
					
						|  caoqianming | c834f996f5 | fix: 获取val_mrs错误 | 2024-04-24 18:32:30 +08:00 | 
				
					
						|  caoqianming | 4ff503f1b0 | fix: update_mpoint_cache state变动或超时更新设备运行状态2 | 2024-04-24 18:20:39 +08:00 | 
				
					
						|  caoqianming | ecb95da787 | fix: update_mpoint_cache state变动或超时更新设备运行状态 | 2024-04-24 18:13:21 +08:00 | 
				
					
						|  caoqianming | 4c3fa8acac | fix: update_mpoint_cache 更新错误 | 2024-04-24 18:07:45 +08:00 | 
				
					
						|  caoqianming | 14bcf0833f | feat: 通过restful获取测点值 | 2024-04-24 17:57:31 +08:00 | 
				
					
						|  caoqianming | 53ce0ea0f7 | feat: runningstate统一修改 | 2024-04-24 16:23:13 +08:00 | 
				
					
						|  caoqianming | 7b83cd1095 | refector: 检验撤回根据count_notok进行update_mb | 2024-04-24 16:22:36 +08:00 | 
				
					
						|  caoqianming | e33b4e5902 | fix: dahua_enabled通过getattr获取 | 2024-04-24 15:55:58 +08:00 | 
				
					
						|  caoqianming | f3c5698283 | feat: 优化cal_mpointstat_hour支持float int | 2024-04-24 15:00:08 +08:00 | 
				
					
						|  caoqianming | 86053bed93 | feat: mpoint增加是否可手动录入的字段 | 2024-04-24 14:59:37 +08:00 | 
				
					
						|  caoqianming | 54fc93de73 | feat: 根据测点采集监测设备是否掉线使用celery | 2024-04-23 16:56:08 +08:00 | 
				
					
						|  caoqianming | c1d55ce618 | fix: rename mplogx to val_mrs | 2024-04-23 16:28:26 +08:00 | 
				
					
						|  caoqianming | 339fc639e8 | fix: king insert mplogx 参数1获取 | 2024-04-23 16:18:50 +08:00 | 
				
					
						|  caoqianming | 41cd2f343d | fix: king self._get_token bug | 2024-04-23 16:13:04 +08:00 | 
				
					
						|  caoqianming | 1a80031d6e | fix: 亚控请求修改2 | 2024-04-23 15:03:35 +08:00 | 
				
					
						|  caoqianming | 8fe2069948 | fix: 亚控请求修改 | 2024-04-23 15:00:49 +08:00 | 
				
					
						|  caoqianming | 22e5ff6180 | refector: 检验撤回的优化 | 2024-04-23 09:13:21 +08:00 | 
				
					
						|  caoqianming | aecec48002 | fix: mpoint_last_timex 处理的优化 | 2024-04-22 15:30:42 +08:00 | 
				
					
						|  caoqianming | 45fda773ab | fix: mqtt插入数据时需校验enabled | 2024-04-22 15:23:24 +08:00 | 
				
					
						|  caoqianming | 6f8ab25b5c | feat: 增加半成品检验撤回功能 | 2024-04-22 11:14:53 +08:00 | 
				
					
						|  caoqianming | e0d4c4beff | feat: base wxmp, wx无需显示在conf指定 | 2024-04-19 16:28:05 +08:00 | 
				
					
						|  caoqianming | 3e56fa7390 | feat: 物料删除时进行校验和相应的数据矫正 | 2024-04-19 14:32:06 +08:00 | 
				
					
						|  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 | 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 | 
				
					
						|  caoqianming | 0b193c6950 | fix: correct_mb优化 | 2024-04-02 22:39:24 +08:00 | 
				
					
						|  caoqianming | 2982bccf7f | fix: 多了一次save调用 | 2024-04-02 17:22:56 +08:00 | 
				
					
						|  caoqianming | 759bd3e149 | feat: mio支持从明细批次号查询 | 2024-04-02 17:19:07 +08:00 | 
				
					
						|  caoqianming | c5ae117436 | feat: mioitem增加划伤字段 | 2024-04-02 17:11:02 +08:00 | 
				
					
						|  caoqianming | 6254e251d3 | feat: 生产领料半成品时需校验是否经过检验 | 2024-04-02 17:07:22 +08:00 | 
				
					
						|  caoqianming | 462a25bb9a | feat: 生产入库update_mb时记录production_dept | 2024-04-02 16:46:13 +08:00 | 
				
					
						|  caoqianming | aaa5545c30 | feat: 增加correct_material_batch以矫正mb | 2024-04-02 16:14:33 +08:00 | 
				
					
						|  caoqianming | 3eb7b76095 | fix: material create指定所到工序校验 | 2024-04-02 16:12:14 +08:00 | 
				
					
						|  caoqianming | 5078a516d2 | feat: mlog增加退火后碎字段 | 2024-04-02 15:44:19 +08:00 | 
				
					
						|  caoqianming | c8bcbc62c3 | feat: inm支持小数点后3位 | 2024-04-02 12:27:19 +08:00 | 
				
					
						|  caoqianming | bec6644138 | feat: enm mpoint增加third_info字段 | 2024-04-02 12:07:53 +08:00 | 
				
					
						|  caoqianming | 2d8f546104 | fix: cache_mpoints 标注错误 | 2024-04-02 11:40:46 +08:00 | 
				
					
						|  caoqianming | 7d5b1223d5 | feat: inm mioitem同步数据库 | 2024-04-02 11:40:07 +08:00 | 
				
					
						|  caoqianming | 7e18ea572a | feat: mioitem添加检验备注等字段 | 2024-04-02 10:21:22 +08:00 | 
				
					
						|  caoqianming | 567c40e962 | feat: 完善mqtt获取数据 | 2024-04-02 10:19:17 +08:00 | 
				
					
						|  caoqianming | a104191341 | feat: 从kioserver中获取数据 | 2024-04-02 10:18:42 +08:00 | 
				
					
						|  caoqianming | 76ccb4dc55 | feat: 性能测试提供search字段 | 2024-04-01 14:43:22 +08:00 | 
				
					
						|  caoqianming | 7604ee9af3 | feat: 更改供应商部分字段可不填 | 2024-03-29 09:44:47 +08:00 | 
				
					
						|  caoqianming | 356ef262de | feat: mpoint增加interval字段 | 2024-03-22 18:22:06 +08:00 | 
				
					
						|  caoqianming | 4d524e3bf8 | refector: mqtt优化 | 2024-03-22 18:21:41 +08:00 | 
				
					
						|  caoqianming | 33dba0a30e | refector: 重构一点third中的三方client代码 | 2024-03-22 15:30:00 +08:00 | 
				
					
						|  caoqianming | 0e0262d170 | feat: mioitem添加js,qx字段 | 2024-03-22 14:57:06 +08:00 | 
				
					
						|  caoqianming | a737343d3a | feat: 添加亚控restful接口 | 2024-03-21 18:44:02 +08:00 | 
				
					
						|  caoqianming | 6e4298873f | feat: 增加周预估消耗量字段 | 2024-03-20 17:39:44 +08:00 | 
				
					
						|  caoqianming | fd8040b20e | feat: bi exec 默认raise_exception | 2024-03-20 15:24:22 +08:00 | 
				
					
						|  caoqianming | de0b1ade8d | refector: dataset list 排序 | 2024-03-19 17:13:02 +08:00 | 
				
					
						|  caoqianming | bff47cbac3 | feat: 优化dataset exec | 2024-03-19 13:23:10 +08:00 | 
				
					
						|  caoqianming | f548785014 | fix: dataset exec query update逻辑变化 | 2024-03-19 13:15:41 +08:00 | 
				
					
						|  caoqianming | d05ee1595c | feat: bi dataset 表增加字段 | 2024-03-19 11:30:20 +08:00 | 
				
					
						|  caoqianming | eaf1a5671f | fix: 用于correct utask错误数据 | 2024-03-18 16:29:53 +08:00 | 
				
					
						|  caoqianming | f456c7cbc8 | fix: mtask_submit后不更改utask状态的bug | 2024-03-18 16:13:04 +08:00 | 
				
					
						|  caoqianming | 37d8baa875 | fix: opeation filter暂不支持cates多对多in | 2024-03-18 10:43:17 +08:00 | 
				
					
						|  caoqianming | 370ae64299 | feat: 添加mqtt脚本并增加require | 2024-03-17 22:14:23 +08:00 | 
				
					
						|  caoqianming | 077707f493 | fix: celeryinfo取值错误 | 2024-03-15 16:41:13 +08:00 | 
				
					
						|  caoqianming | c0567f5a55 | feat: 返回redis和celery的一些监控数据 | 2024-03-15 16:01:26 +08:00 | 
				
					
						|  caoqianming | 966edbacd4 | feat: 添加celery监控信息2 | 2024-03-13 17:41:16 +08:00 | 
				
					
						|  caoqianming | 0af253fb0b | feat: 添加celery监控信息 | 2024-03-13 17:39:45 +08:00 | 
				
					
						|  caoqianming | 718f594a4b | feat: 添加是否新能源字段 | 2024-03-13 17:39:23 +08:00 | 
				
					
						|  caoqianming | 38b7d0c586 | feat: time_20_y 改为6点半 | 2024-03-11 15:38:09 +08:00 | 
				
					
						|  caoqianming | a32cefb939 | feat: operationlist增加筛选条件 | 2024-03-11 09:04:10 +08:00 | 
				
					
						|  caoqianming | 7eba5a8e13 | feat: base 从request.data获取page和size | 2024-03-11 08:45:21 +08:00 | 
				
					
						|  caoqianming | 779488589a | fix: handover_submit针对混料特殊处理的bug3 | 2024-03-06 22:24:11 +08:00 | 
				
					
						|  caoqianming | 2addfc8433 | fix: handover_submit针对混料特殊处理的bug2 | 2024-03-06 21:52:55 +08:00 | 
				
					
						|  caoqianming | 3ddb050330 | fix: handover_submit针对混料特殊处理的bug | 2024-03-06 21:45:17 +08:00 | 
				
					
						|  caoqianming | b429ad9059 | fix: 废弃一些接口 | 2024-03-06 18:01:24 +08:00 | 
				
					
						|  caoqianming | 8a32690395 | feat: handoverserializer返回更多数据 | 2024-03-06 17:44:50 +08:00 | 
				
					
						|  caoqianming | abdee3d2d5 | feat: 增加wmaterial查询条件 | 2024-03-06 17:21:48 +08:00 | 
				
					
						|  caoqianming | 4c3610ac25 | feat: 混料支持车间库存 | 2024-03-06 17:07:51 +08:00 | 
				
					
						|  caoqianming | f6db92f815 | feat: 增加wmaterial查询条件 | 2024-03-06 15:50:29 +08:00 | 
				
					
						|  caoqianming | 02344da862 | feat: 增加equipment设备类型 | 2024-03-06 09:53:16 +08:00 | 
				
					
						|  caoqianming | 0de0489272 | feat: 增加箱中破不合格字段 | 2024-03-05 10:11:33 +08:00 | 
				
					
						|  caoqianming | 5c0c016872 | fix: correct_tuihuo_log矫正退火日志2 | 2024-03-04 15:50:49 +08:00 | 
				
					
						|  caoqianming | c1d5ef86f1 | fix: correct_tuihuo_log矫正退火日志 | 2024-03-04 14:58:36 +08:00 | 
				
					
						|  caoqianming | 5aab22e9d9 | fix: 工段删除同时更新route | 2024-03-04 14:22:22 +08:00 | 
				
					
						|  caoqianming | e99854b56f | fix: mlog填写时进行更进一步校验 | 2024-03-04 13:54:31 +08:00 | 
				
					
						|  caoqianming | eecda9e5a6 | fix: material导入可更改count_safe | 2024-03-04 10:44:42 +08:00 | 
				
					
						|  caoqianming | 70b5a4d87e | fix: material unit 忽略大小写2 | 2024-03-04 10:37:33 +08:00 | 
				
					
						|  caoqianming | 9cd5bfc8f9 | fix: material unit 忽略大小写 | 2024-03-04 10:25:58 +08:00 | 
				
					
						|  caoqianming | fcc613170e | feat: 物料信息导入功能 | 2024-03-04 09:58:09 +08:00 | 
				
					
						|  caoqianming | 1c802eafb1 | fix: check_same_allow_minute_and_raise_event 判断错误 | 2024-03-02 09:47:53 +08:00 | 
				
					
						|  caoqianming | 652ee31f6f | fix: check_same_allow_minute_and_raise_event 判断错误 | 2024-03-02 09:41:47 +08:00 | 
				
					
						|  caoqianming | 641c4cefc6 | fix: snap_and_analyse ecs为空就不创建事件 | 2024-03-02 08:59:47 +08:00 | 
				
					
						|  caoqianming | 39d69952f1 | fix: check_same_allow_minute_and_raise_event bug | 2024-03-01 18:56:49 +08:00 | 
				
					
						|  caoqianming | 61c8e6ab98 | feat: ecm提出check_same_allow_minute_and_raise_event方法 | 2024-03-01 18:49:40 +08:00 | 
				
					
						|  caoqianming | f51075e1ef | feat: 采购入库和销售出库订单可为空 | 2024-03-01 17:36:43 +08:00 | 
				
					
						|  caoqianming | 373a4999c3 | fix: materialcreateserializer bug | 2024-03-01 15:58:04 +08:00 | 
				
					
						|  caoqianming | d3ae9d4a79 | fix: mgroup筛选bug | 2024-03-01 15:57:19 +08:00 | 
				
					
						|  caoqianming | 3c87e157de | fix: puorder update bug | 2024-03-01 15:50:50 +08:00 | 
				
					
						|  caoqianming | 2a3bcc1b33 | fix: ftest中type设置为必填 | 2024-03-01 15:34:56 +08:00 | 
				
					
						|  caoqianming | ab3bcee0f8 | fix: 生产领料反向操作bug | 2024-03-01 15:16:19 +08:00 | 
				
					
						|  caoqianming | 4c75328e67 | feat: materialbatch默认按update_time倒序排列 | 2024-03-01 15:09:41 +08:00 | 
				
					
						|  caoqianming | eef99ed624 | feat: 出入库操作支持提交后可撤销功能 | 2024-02-29 17:10:50 +08:00 | 
				
					
						|  caoqianming | 33e661b1dc | fix: 调整envdata的字段格式 | 2024-02-28 17:20:49 +08:00 | 
				
					
						|  caoqianming | 4ddfbb266c | fix: em可返回envdata | 2024-02-28 17:20:28 +08:00 | 
				
					
						|  caoqianming | 820f316511 | fix: envdata因未配置ordering触发bug | 2024-02-28 16:34:48 +08:00 | 
				
					
						|  caoqianming | 1b6c58e7c8 | feat: jsonfield默认blank=True | 2024-02-28 16:19:10 +08:00 | 
				
					
						|  caoqianming | 983e11af74 | fix: jsonfield 默认blank=True | 2024-02-28 16:18:50 +08:00 | 
				
					
						|  caoqianming | 2e15c8ff31 | feat: em返回数据可携带环保数据信息 | 2024-02-28 15:02:19 +08:00 | 
				
					
						|  caoqianming | d4bf7a7e19 | perf: 一些性能优化 | 2024-02-28 15:01:52 +08:00 | 
				
					
						|  caoqianming | 2c2e5bc4cd | feat: base 可给list返回数据添加额外信息 | 2024-02-28 15:00:53 +08:00 | 
				
					
						|  caoqianming | 080c14b5f8 | feat: 增加drain查询条件 | 2024-02-27 17:41:46 +08:00 | 
				
					
						|  caoqianming | 7f93c453e6 | feat: 修改drain2serializer返回数据 | 2024-02-27 15:50:46 +08:00 | 
				
					
						|  caoqianming | 44c4a34c69 | feat: 增加drain2serializer返回数据 | 2024-02-27 14:46:28 +08:00 | 
				
					
						|  caoqianming | 666d317f01 | feat: carwash增加返回记录 | 2024-02-27 14:31:35 +08:00 | 
				
					
						|  caoqianming | bb05ba8c5c | feat: 增加DrainEquipEnvSerializer返回数据 | 2024-02-27 10:40:04 +08:00 | 
				
					
						|  caoqianming | 096650e592 | feat: emserializer增加返回cate信息 | 2024-02-27 09:20:47 +08:00 | 
				
					
						|  caoqianming | 31b4af5fbb | doc: 增加config查询文档 | 2024-02-27 09:20:27 +08:00 | 
				
					
						|  caoqianming | 34aaf22650 | feat: base viewset增加query定制返回参数 | 2024-02-27 09:14:27 +08:00 | 
				
					
						|  caoqianming | 9d48575be4 | feat: enp count_cate接口 | 2024-02-26 15:22:36 +08:00 | 
				
					
						|  caoqianming | 826cb8c8b1 | feat: count_state统计数据增加 | 2024-02-26 15:22:14 +08:00 | 
				
					
						|  caoqianming | b71a8921c3 | feat: 设备运行状态count统计接口 | 2024-02-26 14:22:43 +08:00 | 
				
					
						|  caoqianming | 53193650f6 | feat: 增加ecate筛选条件 | 2024-02-26 10:48:47 +08:00 | 
				
					
						|  caoqianming | d2a503c482 | feat: 增加ecate表 | 2024-02-26 10:31:12 +08:00 | 
				
					
						|  caoqianming | e7f8086f23 | feat: base 提供查询子集数据方法 | 2024-02-26 08:08:47 +08:00 | 
				
					
						|  caoqianming | a1ef065e8c | feat: base 优化utils queryset查询 | 2024-02-25 21:12:46 +08:00 | 
				
					
						|  caoqianming | f252f206ac | fix: access_time 错误 | 2024-02-23 13:51:28 +08:00 | 
				
					
						|  caoqianming | a00a02bde6 | feat: 模拟车辆出入厂数据 | 2024-02-23 13:47:11 +08:00 | 
				
					
						|  caoqianming | dcaf7b1ca1 | fix: ftest test_group可以为空 | 2024-02-22 09:41:56 +08:00 | 
				
					
						|  caoqianming | 2e0f2ec263 | feat: 设备表增加字段 | 2024-02-22 09:37:11 +08:00 | 
				
					
						|  caoqianming | af5a6c3d55 | feat: 添加drain2serializer | 2024-02-21 09:54:42 +08:00 | 
				
					
						|  caoqianming | 46d8bd7ef6 | feat: 增加设备tags查询 | 2024-02-21 09:54:00 +08:00 | 
				
					
						|  caoqianming | c265295159 | feat: base 增加MyJsonListFilter | 2024-02-21 09:53:41 +08:00 |