From 77db84d63aa23dfa63bdc667f73ee6507369fd9a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 03 十一月 2022 10:57:40 +0800
Subject: [PATCH] #pda同步优化   根据用户编号查询用户码

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |    7 +++++--
 1 files changed, 5 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 99fbca5..34ec9c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -517,11 +517,14 @@
         LocMast loc = locMastService.selectById(locNo);
         if (Cools.isEmpty(loc)){
             throw new CoolException("鏈壘鍒板簱浣�");
-        }else if (loc.getPackStatus()==2){
+        }else if (sourceLoc.getPackStatus()==2){
             throw new CoolException("浜у搧鍦ㄦ祴璇曚腑锛岀姝㈠簱浣嶇Щ鏍�");
 //        }else if (!sourceLoc.getCrnNo().equals(loc.getCrnNo())) {
 //            throw new CoolException("绉昏浆搴撲綅灞炰簬涓嶅悓鍫嗗灈鏈�");
-        }else {
+        }else if(sourceLoc.getPackStatus()!=3){
+            if(sourceLoc.getLocType1()!=loc.getLocType1()){
+                throw new CoolException("婧愬簱涓轰笌鐩爣搴撲綅鐨勫簱浣嶇被鍨嬩笉鍚�");
+            }
         }
         Date now = new Date();
         // 鑾峰彇宸ヤ綔鍙�

--
Gitblit v1.9.1