From a7a5c6df3617f879ed502be8a1895f4bf4be7559 Mon Sep 17 00:00:00 2001
From: LSH <brook_w@163.com>
Date: 星期四, 18 八月 2022 13:39:56 +0800
Subject: [PATCH] Revert "#"

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 102f0bc..34ec9c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -521,8 +521,10 @@
             throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
 //        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
 //            throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
-        }else if(sourceLoc.getLocType1()!=loc.getLocType1()){
-            throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+        }else if(sourceLoc.getPackStatus()!=3){
+            if(sourceLoc.getLocType1()!=loc.getLocType1()){
+                throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+            }
         }
         Date now = new Date();
         // 鑾峰彇宸ヤ綔鍙�

--
Gitblit v1.9.1