From 4a69020b76602110cfb223d42ff8a62d323e2c82 Mon Sep 17 00:00:00 2001
From: tuqiang <437016993@qq.com>
Date: Wed, 22 May 2024 16:48:44 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E4=BC=98=E5=8C=96=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/InstructionServiceImpl.java   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
index e441959ea..29cda07f2 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
@@ -1146,20 +1146,22 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         }
 
         // != 0 为agv任务 1=magic 2=NDC 3=XZ,4=ZHEDA
-        if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), CommonFinalParam.ONE)
-                && !StrUtil.equals(entity.getSend_status(), "2")) {
-            MagicAgvService magicAgvService = SpringContextHolder.getBean(MagicAgvService.class);
-            magicAgvService.deleteAgvInst(entity.getInstruction_code());
-            flag = true;
-
-        } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "2")) {
+//        if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), CommonFinalParam.ONE)
+//                && !StrUtil.equals(entity.getSend_status(), "2")) {
+//            MagicAgvService magicAgvService = SpringContextHolder.getBean(MagicAgvService.class);
+//            magicAgvService.deleteAgvInst(entity.getInstruction_code());
+//            flag = true;
+//
+//        } else
+        //1=XZ 2=NDC
+        if (entity.getAgv_system_type().equals(CommonFinalParam.TWO)) {
             // NDC agv指令不当场取消指令,需要等agv上报
             if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
                 ndcAgvService.deleteAgvInstToNDC(BeanUtil.copyProperties(entity, Instruction.class));
             } else {
                 flag = true;
             }
-        } else if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")
+        } else if (entity.getAgv_system_type().equals(CommonFinalParam.ONE)
                 && !StrUtil.equals(entity.getSend_status(), "2")) {
             XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
             xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());