From 86e005744587683735b46454aa436a9fbd824e49 Mon Sep 17 00:00:00 2001
From: "USER-20220102CG\\noblelift" <546428999@qq.com>
Date: Wed, 19 Apr 2023 10:56:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E7=AB=8B=E5=BA=93=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=97=B6=E9=87=8D=E5=A4=8D=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E7=AB=8B=E5=BA=93=E5=8F=96=E6=B6=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java   | 2 +-
 .../java/org/nl/acs/instruction/service/InstructionService.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
index a09703451..0acfcf874 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/LiKuToAcsServiceImpl.java
@@ -102,7 +102,7 @@ public class LiKuToAcsServiceImpl implements LiKuToAcsService {
             // 5 取消指令
         } else if(StrUtil.equals(status,"5")) {
 
-            instructionService.cancel(inst.getInstruction_id());
+            instructionService.forceCancel(inst.getInstruction_id());
         }
         InStoreReportResponse inStoreReportResponse = new InStoreReportResponse();
         inStoreReportResponse.setOrderId(inst_code);
diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
index 1884f590c..5681fb899 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/instruction/service/InstructionService.java
@@ -178,7 +178,7 @@ public interface InstructionService {
     void cancel(String id) throws Exception;
 
     /**
-     * 取消指令
+     * 强制取消指令
      *
      * @param id
      */