更新

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_Laminating_machine/LnshLaminatingMachineDeviceDriver.java

@@ -527,7 +527,9 @@ public class LnshLaminatingMachineDeviceDriver extends AbstractOpcDeviceDriver i
         jo.put("container_type", this.getContainer_type());
         jo.put("barcode", this.getBarcode());
         jo.put("task", this.getTask());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("isOnline", this.getIsonline());
         jo.put("isError", this.getIserror());
         jo.put("message", this.getMessage());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java

@@ -1384,7 +1384,9 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD
         jo.put("specifications", this.getSpecifications());
         jo.put("batch", this.getBatch());
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("putStation", this.getPut_station());
         jo.put("barcode", this.getBarcode());
         jo.put("material", this.getMaterial());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator/LnshPalletizingManipulatorDeviceDriver.java

@@ -717,7 +717,9 @@ public class LnshPalletizingManipulatorDeviceDriver extends AbstractOpcDeviceDri
         jo.put("io_action", io_action);
         jo.put("hasGoods", this.getHasGoods());
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("isError", this.getIserror());
         jo.put("message", this.getMessage());
         jo.put("task", this.getTask());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java

@@ -714,7 +714,9 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         jo.put("io_action", io_action);
         jo.put("hasGoods", this.getHasGoods());
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("isError", this.getIserror());
         jo.put("message", this.getMessage());
         jo.put("task", this.getTask());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_rgv/LnshRGVDeviceDriver.java

@@ -752,7 +752,9 @@ public class LnshRGVDeviceDriver extends AbstractOpcDeviceDriver implements Devi
         jo.put("action_1", action_1);
         jo.put("action_2", action_2);
         jo.put("walk_y", walk_y);
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("task1", this.getTask1());
         jo.put("task2", this.getTask2());
         jo.put("isOnline", this.getIsonline());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java

@@ -1220,7 +1220,9 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im
         jo.put("device_name", this.getDevice().getDevice_name());
         jo.put("mode", mode);
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("getStation", this.getGetStation());
         jo.put("barcode", this.getBarcode());
         jo.put("material", this.getMaterial());

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_station/LnshStationDeviceDriver.java

@@ -753,6 +753,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             mode = "单机";
         } else if (this.getMode() == 2) {
             mode = "联机";
+        } else if (this.getMode() == 3) {
+            mode = "运行中";
         } else if (this.getMode() == 4) {
             mode = "叫料";
         } else if (this.getMode() == 5) {
@@ -765,6 +767,8 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
             mode = "申请入窑";
         } else if (this.getMode() == 9) {
             mode = "申请出窑";
+        } else if (this.getMode() == 11) {
+            mode = "强制去包装";
         }
 
         if (this.getAction() == 0) {
@@ -800,15 +804,17 @@ public class LnshStationDeviceDriver extends AbstractOpcDeviceDriver implements
         jo.put("io_action", io_action);
         jo.put("hasGoods", this.getHasGoods());
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("isError", this.getIserror());
         jo.put("message", this.getMessage());
         jo.put("task", this.getTask());
         jo.put("weight", this.getWeight());
         jo.put("material", this.getMaterial());
         jo.put("barcode", this.getBarcode());
-        jo.put("specifications", this.getSpecifications());
+//        jo.put("specifications", this.getSpecifications());
-        jo.put("batch", this.getBatch());
+//        jo.put("batch", this.getBatch());
         jo.put("container_type", this.getContainer_type());
         return jo;
     }

acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/rljn_package_palletSplit_manipulator/RljnPackagePalletSplitManipulatorDeviceDriver.java

@@ -1641,7 +1641,9 @@ public class RljnPackagePalletSplitManipulatorDeviceDriver extends AbstractOpcDe
         jo.put("status", status);
         jo.put("onoff_status", onoff_status);
         jo.put("isOnline", this.getIsonline());
-        jo.put("error", this.getError());
+        if (this.getIserror()) {
+            jo.put("error", "设备有故障");
+        }
         jo.put("putStation", this.getPut_station());
         jo.put("barcode", this.getBarcode());
         jo.put("material", this.getMaterial());

wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java

@@ -380,7 +380,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
         String returnResultMsg = null;
         try {
             returnResultMsg = HttpRequest.post(URL + method)
-                    .body(String.valueOf(jsonObject)).timeout(timeout)
+                    .body(String.valueOf(obj)).timeout(timeout)
                     .execute().body();
         } catch (Exception e) {
             log.info("诺力请求嘉耐回传入窑信息失败！{}",e.getMessage());
@@ -429,7 +429,7 @@ public class WmsToJnServiceImpl implements WmsToJnService {
         String returnResultMsg = null;
         try {
             returnResultMsg = HttpRequest.post(URL + method)
-                    .body(String.valueOf(jsonObject)).timeout(timeout)
+                    .body(String.valueOf(obj)).timeout(timeout)
                     .execute().body();
         } catch (Exception e) {
             log.info("诺力请求嘉耐回传出窑信息失败！{}",e.getMessage());

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/callEmpty/service/impl/CallEmptyServiceImpl.java

@@ -41,7 +41,7 @@ public class CallEmptyServiceImpl implements CallEmptyService {
             throw new PdaRequestException("区域不能为空！");
         }
         String param1 = "";
-        if (area_code.equals("27")) param1 = "上料";
+        if (area_code.equals("27")) param1 = "下料";
         JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).addParam("param", param1).process().getResultJSONArray(0);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");

wms/hd/nladmin-system/src/main/java/org/nl/wms/pda/sendEmpty/service/impl/SendEmptyServiceImpl.java

@@ -37,7 +37,9 @@ public class SendEmptyServiceImpl implements SendEmptyService {
         if (StrUtil.isEmpty(area_code)) {
             throw new PdaRequestException("区域不能为空！");
         }
-        JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).process().getResultJSONArray(0);
+        String param1 = "";
+        if (area_code.equals("27")) param1 = "上料";
+        JSONArray pointArr = WQL.getWO("QPAEMPTY").addParam("flag", "2").addParam("area_type", area_code).addParam("param",param1).process().getResultJSONArray(0);
         JSONObject returnjo = new JSONObject();
         returnjo.put("code", "1");
         returnjo.put("desc", "操作成功！");

wms/hd/nladmin-system/src/main/java/org/nl/wms/st/basedata/service/impl/KilnServiceImpl.java

@@ -150,7 +150,7 @@ public class KilnServiceImpl implements KilnService {
             vehicleGroup.put("material_code", materialObj.getString("material_code"));
             vehicleGroup.put("material_name", materialObj.getString("material_name"));
             vehicleGroup.put("material_spec", materialObj.getString("material_spec"));
-            vehicleGroup.put("task_id", IdUtil.simpleUUID());
+            vehicleGroup.put("task_id", SecurityUtils.getCurrentUserId());
             vehicleGroup.put("create_id", currentUserId);
             vehicleGroup.put("create_name", nickName);
             vehicleGroup.put("create_time", now);
@@ -161,7 +161,7 @@ public class KilnServiceImpl implements KilnService {
             vehicleGroup.put("device_id", jsonObject.getString("device_id"));
             vehicleGroup.put("qty", ivt_qty);
             vehicleGroup.put("is_full", is_full);
-            vehicleGroup.put("material_move_id", IdUtil.simpleUUID());
+            vehicleGroup.put("material_move_id", SecurityUtils.getCurrentUserId());
             vehicleGroupTab.insert(vehicleGroup);
         }
         // 点位修改