rev 监控页面异常信息显示

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_auto_cache_line/HailiangAutoCacheLineDeviceDriver.java

@@ -349,7 +349,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                 chm.put("error_code", "0");
                 acsToWmsService.feedDeviceStatusType(chm);
                 feedDeviceStatusFlag = true;
-            } else if (this.itemProtocol.getIsonline() && !feedDeviceStatusFlag) {
+            } else if (this.itemProtocol.getIsonline() && error != 0 && !feedDeviceStatusFlag) {
                 JSONObject chm = new JSONObject();
                 chm.put("device_code", this.getDevice_code());
                 //设备报警
@@ -403,6 +403,8 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
                             JSONObject qtyJson = JSONObject.parseObject(qtyArr);
                             String qty = qtyJson.getString(String.valueOf(prepare_barcode));
                             taskDto.setQtyArr(qty);
+                            inst.setQuantity(qty);
+                            instructionService.update(inst);
                         }
                         taskserver.update(taskDto);
                     }
@@ -975,7 +977,7 @@ public class HailiangAutoCacheLineDeviceDriver extends AbstractOpcDeviceDriver i
         jo.put("hoist_target_layer", hoist_target_layer);
         jo.put("task", task);
         jo.put("prepare_barcode", prepare_barcode);
-        jo.put("prepare_barcode", prepare_barcode);
+        jo.put("docking_barcode", docking_barcode);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("error", ErrorUtil.getDictDetail("cache_line_error_type", String.valueOf(this.getError())));
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_device/HailiangOldSpecialDeviceDriver.java

@@ -30,7 +30,6 @@ import org.nl.acs.order.service.dto.ProduceshiftorderDto;
 import org.nl.modules.wql.util.SpringContextHolder;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -117,7 +116,7 @@ public class HailiangOldSpecialDeviceDriver extends AbstractOpcDeviceDriver impl
                     DeviceErrorLogDto dto = new DeviceErrorLogDto();
                     dto.setDevice_code(device_code);
                     dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("error_type", String.valueOf(error)));
+                    dto.setError_info(ErrorUtil.getDictDetail("special_error_type", String.valueOf(error)));
                     deviceErrorLogService.create(dto);
                 }
                 if (error == 1 || error == 51 || error == 0) {

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_empty_station/HailiangOldSpecialEmptyStationDeviceDriver.java

@@ -127,13 +127,6 @@ public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDevic
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("full_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
         } catch (Exception var17) {
@@ -238,7 +231,6 @@ public class HailiangOldSpecialEmptyStationDeviceDriver extends AbstractOpcDevic
         jo.put("mode", mode == 1 ? "联机" : "单机");
         jo.put("move", move == 1 ? "无货" : "有货");
         jo.put("order", order);
-        jo.put("error", ErrorUtil.getDictDetail("empty_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_full_station/HailiangOldSpecialFullStationDeviceDriver.java

@@ -138,13 +138,6 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice
             }
 
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("full_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
 
@@ -325,7 +318,6 @@ public class HailiangOldSpecialFullStationDeviceDriver extends AbstractOpcDevice
         jo.put("order", order);
         jo.put("full_number", full_number);
         jo.put("requireSucess", requireSucess.toString());
-        jo.put("error", ErrorUtil.getDictDetail("full_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pick_station/HailiangOldSpecialPickStationDeviceDriver.java

@@ -79,13 +79,6 @@ public class HailiangOldSpecialPickStationDeviceDriver extends AbstractOpcDevice
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号now_one_prod_num：" + last_now_one_prod_num + "->" + now_one_prod_num);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
 
@@ -117,7 +110,6 @@ public class HailiangOldSpecialPickStationDeviceDriver extends AbstractOpcDevice
         JSONObject jo = new JSONObject();
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("isOnline", this.itemProtocol.getIsonline());
-        jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
         jo.put("driver_type", "hailiang_old_special_pick_station");
         return jo;
     }

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_old_special_pour_station/HailiangOldSpecialPourStationDeviceDriver.java

@@ -128,13 +128,6 @@ public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDevice
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("pour_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
             if (task != last_task) {
@@ -298,7 +291,6 @@ public class HailiangOldSpecialPourStationDeviceDriver extends AbstractOpcDevice
         jo.put("order", order);
         jo.put("storage_stock_num", storage_stock_num);
         jo.put("requireSucess", requireSucess.toString());
-        jo.put("error", ErrorUtil.getDictDetail("pour_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_device/HailiangSpecialDeviceDriver.java

@@ -123,7 +123,7 @@ public class HailiangSpecialDeviceDriver extends AbstractOpcDeviceDriver impleme
                     DeviceErrorLogDto dto = new DeviceErrorLogDto();
                     dto.setDevice_code(device_code);
                     dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("error_type", String.valueOf(error)));
+                    dto.setError_info(ErrorUtil.getDictDetail("special_error_type", String.valueOf(error)));
                     deviceErrorLogService.create(dto);
                 }
                 if (error == 1 || error == 51 || error == 0) {

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_empty_station/HailiangSpecialEmptyStationDeviceDriver.java

@@ -126,13 +126,6 @@ public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDr
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("full_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
 
@@ -238,7 +231,6 @@ public class HailiangSpecialEmptyStationDeviceDriver extends AbstractOpcDeviceDr
         jo.put("mode", mode == 1 ? "联机" : "单机");
         jo.put("move", move == 1 ? "无货" : "有货");
         jo.put("order", order);
-        jo.put("error", ErrorUtil.getDictDetail("empty_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_full_station/HailiangSpecialFullStationDeviceDriver.java

@@ -138,13 +138,6 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri
             }
 
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("full_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
 
@@ -328,7 +321,6 @@ public class HailiangSpecialFullStationDeviceDriver extends AbstractOpcDeviceDri
         jo.put("order", order);
         jo.put("requireSucess", requireSucess.toString());
         jo.put("full_number", full_number);
-        jo.put("error", ErrorUtil.getDictDetail("full_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pick_station/HailiangSpecialPickStationDeviceDriver.java

@@ -85,13 +85,6 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号now_one_box_num：" + last_now_one_box_num + "->" + now_one_box_num);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
 
@@ -129,7 +122,6 @@ public class HailiangSpecialPickStationDeviceDriver extends AbstractOpcDeviceDri
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("now_one_box_num", now_one_box_num);
         jo.put("isOnline", this.itemProtocol.getIsonline());
-        jo.put("error", ErrorUtil.getDictDetail("error_type", String.valueOf(this.getError())));
         jo.put("driver_type", "hailiang_special_pick_station");
         return jo;
     }

wcs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/hailiang_one/hailiang_special_pour_station/HailiangSpecialPourStationDeviceDriver.java

@@ -21,9 +21,7 @@ import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.ext.wms.service.AcsToWmsService;
 import org.nl.acs.ext.wms.service.impl.AcsToWmsServiceImpl;
 import org.nl.acs.acsEnum.StatusEnum;
-import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.history.service.DeviceErrorLogService;
-import org.nl.acs.history.service.dto.DeviceErrorLogDto;
 import org.nl.acs.history.service.impl.DeviceErrorLogServiceImpl;
 import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.dto.Instruction;
@@ -132,14 +130,6 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号order：" + last_order + "->" + order);
             }
             if (error != last_error) {
-                if (error != 0) {
-                    DeviceErrorLogDto dto = new DeviceErrorLogDto();
-                    dto.setDevice_code(device_code);
-                    dto.setError_code(String.valueOf(error));
-                    dto.setError_info(ErrorUtil.getDictDetail("pour_error_type", String.valueOf(error)));
-                    deviceErrorLogService.create(dto);
-                }
-                logServer.deviceItemValue(this.device_code, "error", String.valueOf(error));
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号error：" + last_error + "->" + error);
             }
             if (storage_stock_num != last_storage_stock_num) {
@@ -306,7 +296,6 @@ public class HailiangSpecialPourStationDeviceDriver extends AbstractOpcDeviceDri
         jo.put("order", order);
         jo.put("storage_stock_num", storage_stock_num);
         jo.put("requireSucess", requireSucess.toString());
-        jo.put("error", ErrorUtil.getDictDetail("pour_error_type", String.valueOf(this.getError())));
         jo.put("task", task);
         jo.put("isOnline", this.itemProtocol.getIsonline());
         jo.put("isError", this.getIserror());

wcs/nladmin-system/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java

@@ -95,7 +95,7 @@ public class DictDetailServiceImpl implements DictDetailService {
         // 清理缓存
         delCaches(dictDetail);
         dictDetailRepository.deleteById(id);
-        Dict dict = dictRepository.findById(id).get();
+        Dict dict = dictRepository.findById(dictDetail.getDict().getId()).get();
         ErrorUtil.dictMap.put(dict.getName(), this.getDictByName(dict.getName()));
     }