From 84ec044f3d05e91cff53ab1b02d3ec85c8f2b6f8 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Tue, 23 Aug 2022 13:05:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LnshPalletizingManipulatorSiteDeviceDriver.java  | 12 ++++++++++++
 .../acs/instruction/service/InstructionService.java  |  8 ++++++++
 .../service/impl/InstructionServiceImpl.java         |  8 ++++++++
 .../nl/acs/task/service/impl/TaskServiceImpl.java    |  2 ++
 4 files changed, 30 insertions(+)

diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
index 2d11490..8b51941 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_palletizing_manipulator_site/LnshPalletizingManipulatorSiteDeviceDriver.java
@@ -629,6 +629,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         String action = "";
         String io_action = "";
         String move = "";
+        String status = "";
         if (this.getMode() == 0) {
             mode = "未联机";
         } else if (this.getMode() == 1) {
@@ -668,6 +669,14 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
             io_action = "允许进出";
         }
 
+        if (this.getStatus() == 1) {
+            status = "待机";
+        } else if (this.getStatus() == 2) {
+            status = "生产中";
+        } else if (this.getStatus() == 3) {
+            status = "故障";
+        }
+
         if (this.getMove() == 0) {
             move = "无货";
         } else if (this.getMove() == 1) {
@@ -679,6 +688,7 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         jo.put("mode", mode);
         jo.put("move", move);
         jo.put("action", action);
+        jo.put("status", status);
         jo.put("io_action", io_action);
         jo.put("hasGoods", this.getHasGoods());
         jo.put("isOnline", this.getIsonline());
@@ -695,6 +705,8 @@ public class LnshPalletizingManipulatorSiteDeviceDriver extends AbstractOpcDevic
         jo.put("Htrapezoidal", this.getHtrapezoidal());
         jo.put("Wthickness", this.getWthickness());
         jo.put("batch", this.getBatch());
+        jo.put("order_No", this.getOrder_No());
+        jo.put("order_qty", this.getOrder_qty());
         return jo;
     }
 
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
index aab9050..e07884a 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
@@ -86,6 +86,14 @@ public interface InstructionService {
      */
     Instruction findByTaskcode(String code);
 
+    /**
+     * 根据任务code查询
+     *
+     * @param code code
+     * @return Instruction
+     */
+    Instruction findByTaskcodeToWms(String code);
+
     /**
      * 根据任务id查询
      *
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index bbaa3ee..ac98704 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -215,6 +215,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
         return obj;
     }
 
+    @Override
+    public Instruction findByTaskcodeToWms(String code) {
+        WQLObject wo = WQLObject.getWQLObject("acs_instruction");
+        JSONObject json = wo.query("task_code ='" + code + "'","create_time desc").uniqueResult(0);
+        final Instruction obj = json.toJavaObject(Instruction.class);
+        return obj;
+    }
+
     @Override
     public Instruction findByTaskid(String id, String wherecaluse) {
         if (!StrUtil.isEmpty(wherecaluse)) {
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
index 1992626..22d4d9b 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
@@ -720,9 +720,11 @@ public class TaskServiceImpl implements TaskService, ApplicationAutoInitial {
         if (!StrUtil.startWith(entity.getTask_code(), "-") && StrUtil.equals(hasWms, "1")) {
             TaskFeedbackDto feefbackdto = taskFeedbackService.findByCode(entity.getTask_code());
             JSONObject feed_jo = new JSONObject();
+            Instruction inst = instructionservice.findByTaskcodeToWms(entity.getTask_code());
             feed_jo.put("ext_task_uuid", entity.getExt_task_uuid());
             feed_jo.put("task_code", entity.getTask_code());
             feed_jo.put("task_status", entity.getTask_status());
+            feed_jo.put("car_no", inst.getCarno());
             JSONArray ja = new JSONArray();
             ja.add(feed_jo);
             String message = null;