From c8ffad2a1b5d278824aa2650a4ff461ec738af9f Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期四, 07 十一月 2024 22:00:31 +0800
Subject: [PATCH] #update

---
 src/main/java/com/zy/common/service/CommonService.java |   37 +++++++++++--------------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index af52410..32af254 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -92,7 +92,7 @@
      * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
      * @param staDescId 璺緞宸ヤ綔绫诲瀷
      * @param sourceStaNo 婧愮珯
-     * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+     * @param matNos 鍝佸彿闆嗗悎
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
@@ -148,7 +148,7 @@
                 if (row == 1) {
                     shallowLocNo = locNo;
                 } else {
-                    shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
+                    shallowLocNo = zerofill(String.valueOf(2), 2) + locNo.substring(2);
                 }
                 // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                 LocMast shallowLoc = locMastService.selectById(shallowLocNo);
@@ -169,32 +169,17 @@
             List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
             if (locMasts.size() > 0) {
                 for (LocMast loc : locMasts) {
-                    //if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
-                    //    continue;
-                    //}
 
                     int row = Integer.parseInt(loc.getLocNo().substring(0, 2));
-                    //濡傛灉涓烘祬搴撲綅鍒欏垽鏂繁搴撲綅鏄惁浣跨敤
-
-
                     String shallowLocNo = "";
-                    if (row == 1) {
-                        shallowLocNo = loc.getLocNo();
-                    } else if (row == 2){
-                        LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(3), 2) + locMast.getLocNo().substring(2));
-                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
-                            continue;
-                        }
-                        shallowLocNo = loc.getLocNo();
-                    } else {
-                        LocMast deepLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + locMast.getLocNo().substring(2));
-                        if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
-                            continue;
-                        }
-                        shallowLocNo = loc.getLocNo();
+                    if (row == 1 || row == 2) {
+                        continue;
                     }
-
-
+                    LocMast trgerLoc = locMastService.selectById(zerofill(String.valueOf(2), 2) + loc.getLocNo().substring(2));
+                    if (!trgerLoc.getLocSts().equals("O")) {
+                        continue;
+                    }
+                    shallowLocNo = trgerLoc.getLocNo();
 
                     // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
                     LocMast shallowLoc = locMastService.selectById(shallowLocNo);
@@ -375,12 +360,12 @@
      * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
      * @param staDescId 璺緞宸ヤ綔绫诲瀷
      * @param sourceStaNo 婧愮珯
-     * @param matnr 鍟嗗搧缂栧彿闆嗗悎
+     * @param matnr 鍝佸彿闆嗗悎
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
     public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
-        if (Cools.isEmpty(matnr)) {  //鐗╂枡鍙�
+        if (Cools.isEmpty(matnr)) {  //鍝佸彿
             matnr = "";
         }
         if (Cools.isEmpty(batch)) {  //绠卞彿

--
Gitblit v1.9.1