登录

src/main/java/com/gaotao/modules/automatedWarehouse/entity/CheckPalletResult.java

@@ -46,6 +46,11 @@ public class CheckPalletResult {
      * 站点类型
      */
     private String stationType;
+
+    /**
+     * 站点类型
+     */
+    private String locationCode;
     
     /**
      * 是否可操作（Y-可操作，N-不可操作）

src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsIntegrationServiceImpl.java

@@ -2492,8 +2492,7 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
     public CheckPalletResult checkPalletWcsStatus(CancelWcsPalletData data) {
         String site = data.getSite();
         String palletId = data.getPalletId();
-        //如果当前site是盘点模式就不允许操作
-        countModeChecker.checkNotInCountMode(site);
+
         // 如果最后一位是R或L，则去掉 - rqrq
         String originalPalletId = palletId;
         if (palletId != null && palletId.length() > 0) {
@@ -2508,7 +2507,10 @@ public class WcsIntegrationServiceImpl implements WcsIntegrationService {
 
         // 查询栈板状态 - rqrq
         CheckPalletResult result = wcsIntegrationMapper.checkPalletWcsStatus(site, palletId);
-
+        if(!warehouseErrorLocation.equals(result.getLocationCode())) {
+            //如果当前site是盘点模式就不允许操作，异常位除外
+            countModeChecker.checkNotInCountMode(site);
+        }
         if (result == null) {
             throw new RuntimeException("栈板不存在");
         }

src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml

@@ -1579,6 +1579,7 @@
     <select id="checkPalletWcsStatus" resultType="CheckPalletResult">
         SELECT 
             p.pallet_id AS palletId,
+            p.location_code AS location_code,
             p.calling_flag AS callingFlag,
             CASE 
                 WHEN EXISTS (