From b7d562f09526fc5d1fddc3a692f47aeb3ac956f6 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 04:09:14 +0800
Subject: [PATCH] #退库优化/自动跨巷道移库V1

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

diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index 3239aa1..2d36a55 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -156,7 +156,7 @@
             throw new CoolException("鏈寚瀹氬洖搴撶被鍨嬶紒锛�");
         }
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",mast.getLocNo()));
-        if(mast.getCrnNo() != locMast.getCrnNo()){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�
+        if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�/绌烘澘鐩存帴鍥炴湰宸烽亾
             return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
         }
 
@@ -705,9 +705,7 @@
                 //鍒拌揪鐩殑鍦�
                 //濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
                 if(!Cools.isEmpty(mast.getLocNo())  ){
-                    if(!mast.getStaNo().equals("1070")){  //濡傛灉濡傛灉涓嶆槸鍑哄簱鍒�1070鐨勫垯鑷姩鐢熸垚璺ㄥ簱
-                        mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
-                    }
+                    mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
                 }
                 mast.setWrkSts(14L);
                 if(Cools.isEmpty(mast.getStaNo())){

--
Gitblit v1.9.1