From 894a07f2b00cda82dc6dd7db2e9348c48a7927bc Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 31 八月 2024 00:40:41 +0800
Subject: [PATCH] 对照协议调整

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    4 ++--
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java    |   20 +++++++++++++++++---
 src/main/resources/mapper/LocMastMapper.xml                    |    3 +++
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java            |    2 +-
 src/main/java/com/zy/asrs/service/LocMastService.java          |    2 +-
 src/main/java/com/zy/common/service/CommonService.java         |    4 ++--
 6 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 603b935..c2bc5dc 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -20,7 +20,7 @@
         "when 11 then 0 when 12 then 1 when 13 then 1 when 14 then 0 when 15 then 0 when 16 then 1 end desc,newid()")
     List<Integer> queryDistinctRow(@Param("crnNo")Integer crnNo);
 
-    LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1);
+    LocMast queryFreeLocMast(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("locType2") Short locType2);
 
     @Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
     List<String> queryGroupEmptyStock(Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 1066cfb..2f8d1bc 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -15,7 +15,7 @@
     /**
      * 妫�绱㈠彲鐢ㄥ簱浣�
      */
-    LocMast queryFreeLocMast(Integer row, Short locType1);
+    LocMast queryFreeLocMast(Integer row, Short locType1,Short locType2);
 
     /**
      * 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
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 e544373..c60047f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -18,8 +18,8 @@
     }
 
     @Override
-    public LocMast queryFreeLocMast(Integer row, Short locType1) {
-        return this.baseMapper.queryFreeLocMast(row, locType1);
+    public LocMast queryFreeLocMast(Integer row, Short locType1, Short locType2) {
+        return this.baseMapper.queryFreeLocMast(row, locType1, locType2);
     }
 
     @Override
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 077e95a..6e9d385 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -91,6 +91,20 @@
     @Value("${wms.url}")
     private String wmsUrl;
 
+    private Short getWorkMode(Integer bay) {
+        if (bay == 2 || bay == 7) {
+            return (short) 3;
+        } else if (bay == 3) {
+            return (short) 1;
+        } else if (bay == 4) {
+            return (short) 2;
+        } else if (bay == 5) {
+            return (short) 1;
+        }else {
+            return (short) 0;
+        }
+    }
+
     /**
      * 缁勬墭
      * 鍏ュ簱绔欙紝鏍规嵁鏉$爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗o紝宸ヤ綔鐘舵�� 2
@@ -717,7 +731,7 @@
                         + "鑳藉叆淇″彿锛坵ms璁剧疆锛�.equals(\"Y\")" + staDetl.getCanining());
                 continue;
             }
-            System.out.println("wrkMast:" + slave.getId() + "-" + staProtocol.getWorkNo().intValue() + "-" + crnStn.getStaNo() );
+            System.out.println("wrkMast:" + slave.getId() + "-" + staProtocol.getWorkNo().intValue() + "-" + crnStn.getStaNo());
             // 鑾峰彇宸ヤ綔鐘舵�佷负2锛堣澶囦笂璧帮級鐨勫叆搴撳伐浣滄。
             WrkMast wrkMast = wrkMastMapper.selectPakInStep2(slave.getId(), staProtocol.getWorkNo().intValue(), crnStn.getStaNo());
             System.out.println("wrkMast:" + wrkMast);
@@ -1725,7 +1739,7 @@
             LocMast loc = null;
             for (Integer row : rows) {
                 if (Utils.isDeepLoc(slaveProperties, row)) {
-                    loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+                    loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(), shallowLoc.getLocType2());
 
                     if (loc != null) {
                         if (Utils.isDeepLoc(slaveProperties, loc.getLocNo())) {
@@ -1744,7 +1758,7 @@
             if (null == loc) {
                 for (Integer row : rows) {
                     if (Utils.isShallowLoc(slaveProperties, row)) {
-                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1());
+                        loc = locMastService.queryFreeLocMast(row, shallowLoc.getLocType1(), shallowLoc.getLocType2());
 
                         if (null != loc) {//瀵瑰簲娣卞簱浣嶉潪鍦ㄥ簱鐘舵��,涓嶈兘绉诲簱
                             String deepLoc = Utils.getDeepLoc(slaveProperties, loc.getLocNo());
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 4f8c73e..1750322 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -258,14 +258,14 @@
         if (locMast == null) {
             if (Utils.isShallowLoc(slaveProperties, curRow)) {
                 Integer deepRow = Utils.getDeepRow(slaveProperties, curRow);
-                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1());
+                locMast = locMastService.queryFreeLocMast(deepRow, locTypeDto.getLocType1(), locTypeDto.getLocType2());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
                 if (!locMastService.checkEmptyCount(locMast)) {
                     locMast = null;
                 }
             }
             if (Cools.isEmpty(locMast)) {
-                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1());
+                locMast = locMastService.queryFreeLocMast(curRow, locTypeDto.getLocType1(), locTypeDto.getLocType2());
                 // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
                 if (!locMastService.checkEmptyCount(locMast)) {
                     locMast = null;
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 7821af2..bbca6f5 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -45,6 +45,9 @@
         <if test="locType1 != null">
             and loc_type1 = #{locType1}
         </if>
+        <if test="locType2 != null">
+            and loc_type2 = #{locType2}
+        </if>
         order by NEWID(),lev1 asc,bay1 asc
     </select>
 

--
Gitblit v1.9.1