From 4c1aba49902ca939f17b11a3c43fde5fb4c41597 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 08 二月 2023 10:35:00 +0800
Subject: [PATCH] Merge branch 'bfasrs' of http://47.97.1.152:5880/r/zy-asrs into bfasrs

---
 src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java |    5 ++
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java    |    2 
 src/main/resources/mapper/LocMastMapper.xml                    |   19 +++++++++
 src/main/java/com/zy/asrs/controller/DocTypeController.java    |    2 
 src/main/java/com/zy/asrs/mapper/LocMastMapper.java            |    2 +
 src/main/java/com/zy/asrs/service/LocMastService.java          |    1 
 src/main/java/com/zy/common/service/CommonService.java         |   44 ++++++++++++++++++++++
 src/main/resources/application.yml                             |    4 +-
 8 files changed, 75 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/DocTypeController.java b/src/main/java/com/zy/asrs/controller/DocTypeController.java
index ee3ff8f..1edaeec 100644
--- a/src/main/java/com/zy/asrs/controller/DocTypeController.java
+++ b/src/main/java/com/zy/asrs/controller/DocTypeController.java
@@ -105,7 +105,7 @@
     public R query(String condition) {
         EntityWrapper<DocType> wrapper = new EntityWrapper<>();
         wrapper.like("doc_name", condition);
-        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 10), wrapper);
+        Page<DocType> page = docTypeService.selectPage(new Page<>(0, 100), wrapper);
         List<Map<String, Object>> result = new ArrayList<>();
         for (DocType docType : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 367f59a..a01a798 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -26,6 +26,8 @@
     List<LocMast> queryFreeLocMastEnd(@Param("row") Integer row, @Param("locType1") Short locType1);
     List<LocMast> queryFreeLocMastEnd0(@Param("bay") Integer bay,@Param("lev") Integer lev,@Param("row1") Integer row, @Param("locType1") Short locType1);
 
+    List<LocMast> queryFreeLocMastEnd1(@Param("row") Integer row, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday);
+
     @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 a7952e5..1356a23 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -17,6 +17,7 @@
                                     , Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
     List<LocMast> queryFreeLocMastEnd(Integer row, Short locType1);
     List<LocMast> queryFreeLocMastEnd0(Integer bay,Integer lev,Integer row, Short locType1);
+    List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday);
 
     List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd);
 
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 0591fa4..9ad0930 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -52,6 +52,11 @@
     }
 
     @Override
+    public List<LocMast> queryFreeLocMastEnd1(Integer row, Short locType1,Boolean inoutEveryday){
+        return this.baseMapper.queryFreeLocMastEnd1(row, locType1,inoutEveryday);
+    }
+
+    @Override
     public List<LocMast> queryFreeLocMast2(Short locType1, Integer rowBeg, Integer rowEnd, Integer bayBeg, Integer bayEnd, Integer levBeg, Integer levEnd) {
         return this.baseMapper.queryFreeLocMast2(locType1, rowBeg, rowEnd, bayBeg, bayEnd, levBeg, levEnd);
     }
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 8be5a04..41a8832 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -235,7 +235,7 @@
             wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
             wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
             Double ioPri = wrkMastService.getIoPri(ioType, dto.getLocNo());
-            wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+            wrkMast.setIoPri(15D); // 浼樺厛绾э細13
             wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo(), false) ? 1 : 0);
             wrkMast.setCrnNo(locMast.getCrnNo());
             wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index da2d0cf..3d48739 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -343,6 +343,7 @@
         // 寮�濮嬫煡鎵惧簱浣� ==============================>>
 
         // 1.褰撴绱㈠簱鎺掍负娴呭簱浣嶆帓鏃讹紝浼樺厛瀵绘壘褰撳墠搴撴帓鐨勬繁搴撲綅鎺�
+        // 楂樹綆棰戠鎺с�佸簱浣嶇粍鍏ㄩ儴涓篛
         if (locMast == null) {
             List<Integer> rows = Utils.getGroupLoc(curRow);
             List<LocMast> locMasts = locMastService.queryFreeLocMast0(rows, rows.size(), locTypeDto.getLocType1(), inoutEveryday);
@@ -360,6 +361,49 @@
             if (!locMastService.checkEmptyCount(locMast, 10)) { locMast = null; }
         }
 
+        // 2.1 楂樹綆棰戠鎺с�佸簱浣嶇粍鏃犻渶鍏ㄩ儴涓篛锛屾壘鍒板簱浣嶅搴旀繁搴撲綅涓嶈兘涓篜 R
+        if (Cools.isEmpty(locMast)) {
+            int sign = curRow;
+            while (sign != 0 && Cools.isEmpty(locMast)) {
+                List<LocMast> locMasts = locMastService.queryFreeLocMastEnd1(sign, locTypeDto.getLocType1(), inoutEveryday);
+                for (LocMast loc : locMasts) {
+                    // 鍚屽簱浣嶇粍瀵瑰簲鍏堕挶搴撲綅鏄惁涓� O.绌哄簱浣�
+                    boolean success = true;
+                    // 娴呭簱浣�
+                    List<String> outerLocList = Utils.getGroupOuterLoc(loc.getLocNo());
+                    for (String outerLocNo : outerLocList) {
+                        LocMast outerLoc = locMastService.selectById(outerLocNo);
+                        if (Cools.isEmpty(outerLoc)) {
+                            continue;
+                        }
+                        if (!outerLoc.getLocSts().equals("O")) {
+                            success = false; break;
+                        }
+                    }
+                    // 娣卞簱浣�
+                    List<String> insideLocList = Utils.getGroupInsideLoc(loc.getLocNo());
+                    for (String insideLocNo : insideLocList) {
+                        LocMast insideLoc = locMastService.selectById(insideLocNo);
+                        if (Cools.isEmpty(insideLoc)) {
+                            continue;
+                        }
+                        if (insideLoc.getLocSts().equals("R") || insideLoc.getLocSts().equals("P")) {
+                            success = false; break;
+                        }
+                    }
+                    // 鍥犲簱浣嶇Щ杞�侀渶棰勭暀绌哄簱浣�
+                    if (!locMastService.checkEmptyCount(loc, 10)) {
+                        success = false;
+                    }
+                    if (success) {
+                        locMast = loc;
+                        break;
+                    }
+                }
+                sign = getCurRow(sign);
+            }
+        }
+
         // 2.鏃犲簱浣嶆椂锛屾棤瑙嗗尯鍩熼攣瀹氾紝閲嶆柊鏌ユ壘搴撲綅
         if (Cools.isEmpty(locMast)) {
             int sign = curRow;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8b324a5..85997c1 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8080
   servlet:
     context-path: /@pom.build.finalName@
 
@@ -11,7 +11,7 @@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
     url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
-#    url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
     username: sa
 #    password: Zoneyung@zy56$
     password: sa@123
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2146663..192e341 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -198,6 +198,25 @@
         order by loc_sts desc ,lev1 asc,bay1 asc
     </select>
 
+    <select id="queryFreeLocMastEnd1" resultMap="BaseResultMap">
+        select *
+        from asr_loc_mast
+        where row1=#{row}
+        and loc_sts='O'
+        <if test="locType1 != null">
+            and loc_type1 = #{locType1}
+        </if>
+        <choose>
+            <when test="inoutEveryday != null and inoutEveryday">
+                AND bay1 &lt; 11             </when>
+            <otherwise>
+                AND bay1 >= 11
+            </otherwise>
+        </choose>
+        and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+        order by loc_sts desc ,lev1 asc,bay1 asc
+    </select>
+
     <select id="queryFreeLocMastEnd0" resultMap="BaseResultMap">
         select *
         from asr_loc_mast

--
Gitblit v1.9.1