From 8f877a3192c14f171d4c80b39201d48308283990 Mon Sep 17 00:00:00 2001
From: loujf <loujingfei666@163.com>
Date: Mon, 4 Jul 2022 09:43:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=81=E7=BE=8E=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java    | 17 +++++++++++++++--
 .../service/impl/StageActorServiceImpl.java     |  2 ++
 .../ajm/service/impl/JMHandServiceImpl.java     |  2 +-
 3 files changed, 18 insertions(+), 3 deletions(-)

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 1a8cd0d..56ef99c 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
@@ -453,9 +453,23 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
                 dto.setCompound_inst_data(task.getCompound_task_data());
             }
         }
+
+        //如果为true，则不是前三条指令，非前三条指令情况下的输送入库指令agv类型都为 1
+        Boolean createLock = false;
+
+        Device deviceByCode = deviceAppService.findDeviceByCode(task.getStart_device_code());
+        StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
+        if (deviceByCode.getDeviceDriver() instanceof StandardCoveyorControlWithScannerDeviceDriver) {
+            standardCoveyorControlWithScannerDeviceDriver = (StandardCoveyorControlWithScannerDeviceDriver) deviceByCode.getDeviceDriver();
+            createLock = standardCoveyorControlWithScannerDeviceDriver.getCreateLock();
+        }
         String agvType = "";
         if (task.getTask_type().equals("2")) {
-            agvType = "3";
+            if (createLock) {
+                agvType = "1";
+            } else {
+                agvType = "3";
+            }
         } else if (task.getTask_type().equals("12")) {
             agvType = "2";
         } else {
@@ -474,7 +488,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
 
         StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
         LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
-        StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver;
         StandardCoveyorControlWithPlcScannerDeviceDriver standardCoveyorControlWithPlcScannerDeviceDriver;
         StandardCoveyorControlDeviceDriver standardCoveyorControlDeviceDriver;
         StandardStorageDeviceDriver standardStorageDeviceDriver;
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
index 780bb38..bc4c435 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/stage/service/impl/StageActorServiceImpl.java
@@ -924,6 +924,8 @@ public class StageActorServiceImpl implements StageActorService {
                             agvTaskTypeNmae = "入库";
                         } else if (jmAgvDeviceDriver.getAgvTaskType().equals("11")) {
                             agvTaskTypeNmae = "出库";
+                        } else if (jmAgvDeviceDriver.getAgvTaskType().equals("20")) {
+                            agvTaskTypeNmae = "禁用";
                         }
                         obj.put("devicede_name", jmAgvDeviceDriver.getDevice().getDevice_name());
                         jo.put("mode",mode);
diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/hand/ajm/service/impl/JMHandServiceImpl.java b/acs/hd/nladmin-system/src/main/java/org/nl/hand/ajm/service/impl/JMHandServiceImpl.java
index caa4805..6b6b75f 100644
--- a/acs/hd/nladmin-system/src/main/java/org/nl/hand/ajm/service/impl/JMHandServiceImpl.java
+++ b/acs/hd/nladmin-system/src/main/java/org/nl/hand/ajm/service/impl/JMHandServiceImpl.java
@@ -766,7 +766,7 @@ public class JMHandServiceImpl implements JMHandService {
             instdto.setInstruction_id(IdUtil.simpleUUID());
             instdto.setInstruction_code(CodeUtil.getNewCode("INSTRUCT_NO"));
             instdto.setRemark(taskjo.optString("remark"));
-            instdto.setMaterial(taskjo.optString("taskjo"));
+            instdto.setMaterial(taskjo.optString("material"));
             instdto.setTask_id(taskjo.optString("task_id"));
             instdto.setTask_code(taskjo.optString("task_code"));
             instdto.setVehicle_code(taskjo.optString("vehicle_code"));