From e81c1dcf8d2cd9a0095039670a1f34e28078fd97 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 26 十二月 2023 16:25:30 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |   34 ++++
 src/main/java/com/zy/asrs/mapper/LocDetlMapper.java            |    1 
 src/main/java/com/zy/asrs/utils/VersionUtils.java              |    8 +
 src/main/java/com/zy/asrs/service/LocDetlService.java          |    2 
 src/main/resources/mapper/LocDetlMapper.xml                    |   27 +++
 src/main/resources/mapper/LocMastMapper.xml                    |   14 +
 src/main/resources/mapper/WrkMastMapper.xml                    |   16 ++
 src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java |    4 
 src/main/java/com/zy/common/web/WcsController.java             |    6 
 src/main/java/com/zy/asrs/service/WrkMastService.java          |    1 
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |    8 
 src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java |    5 
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java            |    4 
 src/main/java/com/zy/asrs/mapper/WrkMastMapper.java            |    1 
 src/main/java/com/zy/asrs/service/LocMastService.java          |    8 
 src/main/java/com/zy/common/service/CommonService.java         |  285 ++++++++++++++++++-----------------
 16 files changed, 273 insertions(+), 151 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index c5d7a11..dd5443e 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -112,4 +112,5 @@
     List<WrkDetlLogAllViewParam> selectAllWrkDetlLogAllViewParamByMatnrE(Map<String, Object> map);
     Integer selectAllWrkDetlLogAllViewParamByMatnrCount(Map<String, Object> map);
 
+    List<String> selectSameDetl(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
 }
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index c9bcea1..769a90d 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -36,4 +36,8 @@
 
 
     LocMast selectByLoc(String locNo);
+
+    List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo);
+
+    List<LocMast> selectAllLocNotEmpty(@Param("groupLoc") List<String> groupOuterLoc);
 }
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index af926a6..82dddf6 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -22,4 +22,5 @@
 
     List<InOutCountDto> selectTop100();
 
+    List<WrkMast> selectSameMatnrs(@Param("matnr") String matnr, @Param("batch") String batch, @Param("grade") String grade);
 }
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 60633c0..1070041 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -87,4 +87,6 @@
     String selectLocNoF(String locNo);
 
     List<LocDetlAll> selectOwnerAllAnfme();
+
+    List<String> getSameDetl(String matnr, String batch, String grade);
 }
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 6a9da74..17d7af3 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -25,7 +25,7 @@
      * @param locMast
      * @return
      */
-    Boolean checkEmptyCount(LocMast locMast);
+    Boolean checkEmptyCount(LocMast locMast, int quaOfBlank);
 
     /**
      * 褰撳墠搴撳瓨鏄庣粏鏄惁涓烘暣鎵�
@@ -51,4 +51,10 @@
     List<LocMast> selectNodeELocByLev(Integer lev);
 
     LocMast selectByLoc(String loc);
+
+    LocMast findNearloc(String locNo);
+
+    List<LocMast> selectAreaEmpty(Short locType1, Integer crnNo);
+
+    boolean checkAllLocEmpty(List<String> groupLoc);
 }
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 0620a9a..3d315b4 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -27,4 +27,5 @@
 
     List<InOutCountDto> selectTop100();
 
+    List<WrkMast> selectSameMatnrs(String matnr, String batch, String grade);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 1854311..418883e 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -232,4 +232,8 @@
     public List<LocDetlAll> selectOwnerAllAnfme() {
         return this.baseMapper.selectOwnerAllAnfme();
     }
+    @Override
+    public List<String> getSameDetl(String matnr, String batch, String grade) {
+        return this.baseMapper.selectSameDetl(matnr, batch, grade);
+    }
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 5cc778f..6d6b86b 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,6 +7,7 @@
 import com.zy.asrs.mapper.LocMastMapper;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.Utils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -36,11 +37,11 @@
     }
 
     @Override
-    public Boolean checkEmptyCount(LocMast locMast) {
+    public Boolean checkEmptyCount(LocMast locMast, int quaOfBlank) {
         if (locMast == null) {
             return false;
         }
-        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
+        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > quaOfBlank;
     }
 
     @Override
@@ -85,10 +86,39 @@
     }
 
     @Override
+    public LocMast findNearloc(String locNo) {
+        LocMast locMast = null;
+        List<String> groupOuterLoc = Utils.getGroupLocNo(locNo, true);
+        if (!Cools.isEmpty(groupOuterLoc)) {
+            for (String loc : groupOuterLoc) {
+                LocMast tmp = this.baseMapper.selectByLoc(loc);
+                if (tmp == null) {
+                    continue;
+                }
+
+                if (tmp.getLocSts().equals("O")) {
+                    locMast = tmp;
+                    break;
+                }
+            }
+        }
+        return locMast;
+    }
+
+    @Override
     public List<LocMast> selectByLocNo(List<String> locNo) {
         return this.baseMapper.selectByLocNo(locNo);
     }
 
+    @Override
+    public List<LocMast> selectAreaEmpty(Short locType1,Integer crnNo) {
+        return this.baseMapper.selectAreaEmpty(locType1,crnNo);
+    }
 
+    @Override
+    public boolean checkAllLocEmpty(List<String> groupOuterLoc) {
+        List<LocMast> result = this.baseMapper.selectAllLocNotEmpty(groupOuterLoc);
+        return result.size() <= 0;
+    }
 
 }
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 6d3bdc3..ea59cc7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -90,7 +90,7 @@
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
         List<String> matnrs = param.getList().stream().map(FullStoreParam.MatCodeStore::getMatnr).distinct().collect(Collectors.toList());
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 1, param.getDevpNo(), matnrs, locTypeDto, 0);
+        StartupDto dto = commonService.getLocNo(1, 1, null, null,null,null,0, locTypeDto,0);
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
@@ -374,7 +374,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
         // 妫�绱㈠簱浣�
         LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
-        StartupDto dto = commonService.getLocNo(DEFAULT_ROW_NO_TYPE, 10, devpNo, null, locTypeDto, 0);
+        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -1041,14 +1041,14 @@
                 Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
                 targetLoc = locMastService.queryFreeLocMast(deepRow, locMast.getLocType1());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(targetLoc)) {
+                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                     continue;
                 }
             }
             if (Cools.isEmpty(targetLoc)) {
                 targetLoc = locMastService.queryFreeLocMast(curRow, locMast.getLocType1());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(targetLoc)) {
+                if (!locMastService.checkEmptyCount(targetLoc,10)) {
                     continue;
                 }
                 // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 30043c7..915d446 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -55,5 +55,10 @@
     public List<InOutCountDto> selectTop100() {
         return this.baseMapper.selectTop100();
     }
+    @Override
+    public List<WrkMast> selectSameMatnrs(String matnr, String batch, String grade) {
+        return this.baseMapper.selectSameMatnrs(matnr, batch, grade);
+    }
+
 
 }
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 09ef9c2..ad8cd6f 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -10,6 +10,14 @@
  */
 public class VersionUtils {
 
+    public static boolean checkLocType(LocMast loc, LocTypeDto dto){
+        //搴撲綅绫诲瀷蹇呴』鍜屼紶鍏ョ殑搴撲綅淇″彿涓�鑷�
+        if (loc.getLocType1().equals(dto.getLocType1())) {
+            return true;
+        }
+        return false;
+    }
+
 
     // 涓氬姟 ----------------------------------------------------------------------
 
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e2676b5..86f0301 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -92,73 +92,115 @@
      * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
      * @param staDescId 璺緞宸ヤ綔绫诲瀷
      * @param sourceStaNo 婧愮珯
-     * @param matNos 鍟嗗搧缂栧彿闆嗗悎
+
      * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
      */
     @Transactional
-    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos, LocTypeDto locTypeDto, int times) {
-//        whsType = getWhsType(sourceStaNo, times);
-        StartupDto startupDto = new StartupDto();
-
-
-
-        RowLastno rowLastno = rowLastnoService.selectById(whsType);
-        if (Cools.isEmpty(rowLastno)) {
-            throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠$悊鍛�");
-        }
-
-        // ===============>>>> 寮�濮嬫墽琛�
-        int curRow = rowLastno.getCurrentRow();
-        int sRow = rowLastno.getsRow();
-        int eRow = rowLastno.geteRow();
-        int crn_qty = rowLastno.getCrnQty();
-        int rowCount = eRow - sRow + 1;
-        // 鐩爣鍫嗗灈鏈哄彿
-        int crnNo = 0;
+    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
         // 鐩爣搴撲綅
         LocMast locMast = null;
 
-        // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂�
-        if (!Cools.isEmpty(matNos)) {
-            List<String> locNos = locDetlService.getSameDetlToday(matNos.get(0), sRow, eRow);
-            for (String locNo : locNos) {
-                if (Utils.isShallowLoc(slaveProperties, locNo)) {
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+        locMast = getLocNoStep4(staDescId, locTypeDto, sourceStaNo);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //搴撲綅瑙勫垯
+//        locMast = getLocNoStepRule(matnr, locTypeDto);
+//        if (locMast != null) {
+//            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+//            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+//        }
+
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+        locMast = getLocNoStep3(staDescId, matnr, batch, grade, locTypeDto,sourceStaNo);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //鎼滅储鏁翠釜绌哄簱浣嶇粍
+        locMast = getLocNoStepSingle(locTypeDto,sourceStaNo);
+        if (locMast != null) {
+            //鎵惧埌搴撲綅锛岃繑鍥瀌to
+            return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+        }
+
+        //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+        throw new CoolException("娌℃湁绌哄簱浣�");
+
+    }
+
+    // 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
+    private LocMast getLocNoStepSingle(LocTypeDto locTypeDto,Integer sourceStaNo) {
+        LocMast locMast = null;
+        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
+        //鍗曞搧
+        List<LocMast> locMasts = locMastService.selectAreaEmpty(locTypeDto.getLocType1(),staDesc.getCrnNo());//鎼滅储璐х墿
+
+        for (LocMast mast : locMasts) {
+            List<String> groupLoc = Utils.getGroupLocNo(mast.getLocNo(), true);
+            if (!locMastService.checkAllLocEmpty(groupLoc)) {
+                continue;
+            }
+
+            LocMast tmp = null;
+            for (String loc : groupLoc) {
+                LocMast locMast1 = locMastService.selectByLoc(loc);
+                if (locMast1 == null) {
                     continue;
                 }
-                String shallowLocNo = Utils.getShallowLoc(slaveProperties, locNo);
-                // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
-                LocMast shallowLoc = locMastService.selectById(shallowLocNo);
-                if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                    if (VersionUtils.locMoveCheckLocType(shallowLoc, locTypeDto)) {
-                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
-                            locMast = shallowLoc;
-                            crnNo = locMast.getCrnNo();
-                            break;
-                        }
-                    }
+
+                if (!locMast1.getLocSts().equals("O")) {
+                    continue;
                 }
+
+                tmp = locMast1;
+                break;
+            }
+
+            //棰勭暀绌哄簱浣�
+            if (tmp != null && locMastService.checkEmptyCount(mast, 10)) {
+                locMast = tmp;
+                break;
             }
         }
 
-        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
-        if (staDescId == 10) {
-            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", staDescId).eq("stn_no", sourceStaNo));
-            if (Cools.isEmpty(staDesc)){
-                throw new CoolException("绌烘墭鍏ュ簱绔欑偣璺緞涓嶅瓨鍦�");
-            }
-            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow).eq("crn_no",staDesc.getCrnNo()));
-            if (locMasts.size() > 0) {
-                for (LocMast loc : locMasts) {
-                    if (Utils.isShallowLoc(slaveProperties, loc.getLocNo())) {
+        return locMast;
+    }
+    // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+    private LocMast getLocNoStep3(Integer staDescId, String matnr, String batch, String grade, LocTypeDto locTypeDto,Integer sourceStaNo) {
+        LocMast locMast = null;
+        StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>().eq("type_no", 1).eq("stn_no", sourceStaNo));
+        if (staDescId == 1) {
+            //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+            List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matnr, batch, grade);
+            for (WrkMast wrkMast : wrkMasts) {
+                LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
+                if (null != locMast0) {
+                    if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
                         continue;
                     }
-                    String shallowLocNo = Utils.getShallowLoc(slaveProperties,  loc.getLocNo());
-                    // 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
-                    LocMast shallowLoc = locMastService.selectById(shallowLocNo);
-                    if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
-                        if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
-                            locMast = shallowLoc;
-                            crnNo = locMast.getCrnNo();
+                    // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                        locMast = locMast0;
+                    }
+                }
+            }
+            if (Cools.isEmpty(locMast)) {
+                //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
+                List<String> locNos = locDetlService.getSameDetl(matnr, batch, grade);
+                for (String locNo : locNos) {
+                    LocMast locMast0 = locMastService.findNearloc(locNo);
+                    if (null != locMast0) {
+                        if (!staDesc.getCrnNo().equals(locMast0.getCrnNo())){
+                            continue;
+                        }
+                        // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                        if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                            locMast = locMast0;
                             break;
                         }
                     }
@@ -166,116 +208,77 @@
             }
         }
 
-        // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
-        if (null == locMast) {
-            Shelves shelves = new Shelves(rowCount, crn_qty);
-            int divides = (int) Arith.divides(1, curRow - 1, 4);
-            curRow = (int) Arith.remainder(curRow, 4);
-            if (curRow == 0) {
-                curRow = 4;
-            }
-            for (int i = 0; i < shelves.group; i ++) {
-                curRow = shelves.start(curRow);
-                if (curRow < 0) {
-                    throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
-                }
-                Integer crnNo1 = shelves.get(curRow);
-//                crnNo1 = crnNo1 + divides*1;
-                if (basCrnpService.checkSiteError(crnNo1, true)) {
-                    crnNo = crnNo1;
-//                    curRow = curRow + divides*4;
-                    break;
-                }
-            }
-        }
+        return locMast;
+    }
 
-        if (crnNo == 0) {
-            throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
-        }
+
+    //杩斿洖dto
+    private StartupDto getLocNoStep6(Integer staDescId, Integer sourceStaNo, LocMast locMast) {
+        StartupDto startupDto = new StartupDto();
         // 鑾峰彇鐩爣绔�
         Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                 .eq("type_no", staDescId)
                 .eq("stn_no", sourceStaNo)
-                .eq("crn_no", crnNo);
+                .eq("crn_no",locMast.getCrnNo());
         StaDesc staDesc = staDescService.selectOne(wrapper);
         if (Cools.isEmpty(staDesc)) {
-            log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
+            log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
             throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
         }
+
+        // 妫�娴嬬洰鏍囩珯
         BasDevp staNo = basDevpService.selectById(staDesc.getCrnStn());
         if (!staNo.getAutoing().equals("Y")) {
-            throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
+            throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
         }
-
-        // 鏇存柊搴撲綅鎺掑彿
-        rowLastno.setCurrentRow(curRow);
-        rowLastnoService.updateById(rowLastno);
-
-        // 寮�濮嬫煡鎵惧簱浣� ==============================>>
-
-        // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
-        if (locMast == null) {
-            if (Utils.isShallowLoc(slaveProperties, curRow)) {
-                Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
-                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
-                // todo:luxiaotao 濡傛灉鐢ㄦ祬鎺掓壘鍒扮殑娣卞簱浣嶏紝閭d箞鍒欓渶瑕佸垽鏂繖涓繁搴撲綅瀵瑰簲鐨勬祬搴撲綅鏄惁鏈夎揣锛團銆乆銆丏锛�
-                // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(locMast)) {
-                    locMast = null;
-                }
-            }
-            if (Cools.isEmpty(locMast)) {
-                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
-                // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
-                if (!locMastService.checkEmptyCount(locMast)) {
-                    locMast = null;
-                }
-                // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
-                if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
-                    LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
-                    if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
-                        locMast = null;
-                    }
-                }
-                // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
-                if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
-                    LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
-                    if (!shallowLoc.getLocSts().equals("O")) {
-                        locMast = null;
-                    }
-                }
-            }
-        }
-
-        // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
-        if (Cools.isEmpty(locMast)) {
-            // 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
-            if (times < rowCount) {
-                times = times + 1;
-                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
-            }
-
-            // 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
-            if (locTypeDto.getLocType1() == 1) {
-                locTypeDto.setLocType1((short) 2);
-                return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
-            }
-            log.error("绯荤粺娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
-            throw new CoolException("娌℃湁绌哄簱浣�");
-        }
-        String locNo = locMast.getLocNo();
 
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = getWorkNo(0);
         // 杩斿洖dto
         startupDto.setWorkNo(workNo);
-        startupDto.setCrnNo(crnNo);
         startupDto.setSourceStaNo(sourceStaNo);
         startupDto.setStaNo(staNo.getDevNo());
-        startupDto.setLocNo(locNo);
+        startupDto.setLocNo(locMast.getLocNo());
+        startupDto.setCrnNo(locMast.getCrnNo());
         return startupDto;
     }
 
+    // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+    private LocMast getLocNoStep4(Integer staDescId, LocTypeDto locTypeDto, Integer sourceStaNo) {
+        LocMast locMast = null;
+        // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
+        if (staDescId == 10) {
+            // 鑾峰彇鐩爣绔�
+            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+                    .eq("type_no", staDescId)
+                    .eq("stn_no", sourceStaNo);
+            StaDesc staDesc = staDescService.selectOne(wrapper);
+            if (staDesc == null) {
+                throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+            }
+
+            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+                    .eq("loc_sts", "O")
+                    .eq("crn_no", staDesc.getCrnNo())
+                    .eq("loc_type1",locTypeDto.getLocType1())
+                    .orderBy("lev1,bay1,row1"));
+            if (!locMasts.isEmpty()) {
+                for (LocMast loc : locMasts) {
+                    LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
+                    // 娴呭簱浣嶇鍚堝昂瀵告娴�
+                    if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+                        locMast = locMast0;
+                    }
+                }
+            }
+
+            if (locMast == null) {
+                throw new CoolException("缂哄皯绌哄簱浣�");
+            }
+        }
+        return locMast;
+    }
+
 
     public static String zerofill(String msg, Integer count) {
         if (msg.length() == count) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 113b666..5c5fe37 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -116,7 +116,7 @@
         BasDevp sourceStaNo = basDevpService.checkSiteStatus(12, true);
 
         // 妫�绱㈠簱浣�
-        StartupDto dto = commonService.getLocNo(rowLastnoService.selectNextWhsType(), 10, 12, null, locTypeDto,0);
+        StartupDto dto = commonService.getLocNo(1, 10, 12, null,null,null,0, locTypeDto,0);
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
@@ -202,7 +202,7 @@
             }
         }
 
-        StartupDto dto = commonService.getLocNo(integer, 1, devpNo, matNos, locTypeDto,0);
+        StartupDto dto = commonService.getLocNo(1, 1, devpNo, null,null,null,0, locTypeDto,0);
         int workNo = dto.getWorkNo();
         Date now = new Date();
         // 鐢熸垚宸ヤ綔妗�
@@ -293,7 +293,7 @@
             }
         }
         // 妫�绱㈠簱浣�
-        StartupDto dto = commonService.getLocNo(integer, 10, devpNo, null, locTypeDto,0);
+        StartupDto dto = commonService.getLocNo(1, 10, devpNo, null,null,null,0, locTypeDto,0);
         int workNo = dto.getWorkNo();
         // 鐢熸垚宸ヤ綔妗�
         WrkMast wrkMast = new WrkMast();
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e86e860..c710f9a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -808,5 +808,32 @@
         group by a.matnr,a.[year],a.[month],a.[day],a.kun,a.up_down
         ) t
     </select>
+    <select id="selectSameDetl" resultType="java.lang.String">
+        SELECT
+        ld.loc_no
+        FROM asr_loc_detl ld
+        LEFT JOIN asr_loc_mast lm ON ld.loc_no = lm.loc_no
+        LEFT JOIN (
+        select
+        loc_no,
+        count(1) as count
+        from asr_loc_detl
+        where 1=1
+        group by loc_no
+        ) dual on dual.loc_no = lm.loc_no
+        WHERE 1 = 1
+        <if test="matnr != null and matnr != ''">
+            AND ld.matnr = #{matnr}
+        </if>
+        <if test="batch != null and batch != ''">
+            AND ld.batch = #{batch}
+        </if>
+        <if test="grade != null and grade != ''">
+            AND ld.brand = #{grade}
+        </if>
+        AND (lm.loc_sts = 'F')
+        AND dual.count = 1
+        ORDER BY lm.modi_time ASC
+    </select>
 
 </mapper>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 95b5fa0..51a64f3 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -102,6 +102,20 @@
         select * from asr_loc_mast
         where loc_no = #{locNo}
     </select>
+    <select id="selectAreaEmpty" resultMap="BaseResultMap">
+        select * from asr_loc_mast
+        where loc_sts in ('O')
+          and loc_type1 = #{locType1}
+          and crn_no = #{crnNo}
+        ORDER BY lev1,bay1,row1
+    </select>
+
+    <select id="selectAllLocNotEmpty" resultMap="BaseResultMap">
+        SELECT * FROM asr_loc_mast WHERE loc_sts != 'O' AND loc_no in
+        <foreach collection="groupLoc" item="loc" index="index" open="(" close=")" separator=",">
+            #{loc}
+        </foreach>
+    </select>
 
 
 </mapper>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 1adbcf1..53f424b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -80,5 +80,21 @@
     <select id="selectTop100" resultType="com.zy.asrs.entity.result.InOutCountDto">
         SELECT TOP 10 m.io_type as ioType,m.appe_time as appeTime, d.matnr, d.anfme FROM asr_wrk_detl_log d left join asr_wrk_mast_log m on d.wrk_no = m.wrk_no order by m.appe_time desc
     </select>
+    <select id="selectSameMatnrs" resultMap="BaseResultMap">
+        select loc_no from asr_wrk_mast m,asr_wrk_detl d
+        where m.wrk_no=d.wrk_no
+        and io_type=1
+        and wrk_sts &lt; 11
+        <if test="matnr != null and matnr != ''">
+            and d.matnr = #{matnr}
+        </if>
+        <if test="batch != null and batch != ''">
+            and d.batch = #{batch}
+        </if>
+        <if test="grade != null and grade != ''">
+            and d.brand = #{grade}
+        </if>
+        ORDER BY m.wrk_no desc
+    </select>
 
 </mapper>

--
Gitblit v1.9.1