From 26dd2deb404109df6621e0b61b0ff9f06c83d9c3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 08 六月 2025 17:06:07 +0800
Subject: [PATCH] #

---
 license.lic                                            |    0 
 src/main/java/com/zy/common/service/CommonService.java |    7 ++++---
 src/main/resources/license.lic                         |    0 
 src/main/resources/application.yml                     |   12 ++++++------
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/license.lic b/license.lic
index 9b8be17..d98be0a 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 19709aa..5298646 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -254,9 +254,10 @@
                 List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                         .eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
                 for (LocMast locMast1 : locMasts) {
-                    //鑾峰彇宸烽亾
-//                    List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
-//                    LocMast locMastGro = locMastService.selectById(wrkMast.getLocNo());
+                    if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+                        continue;
+                    }
+
                     //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
                     LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow, nearRow, locMast1, rowLastnoType.getType().longValue());
                     if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fc8bb90..1da2931 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -28,9 +28,9 @@
       maxRequestSize: 100MB
 other:
   datasource:
-    jdbc-url: jdbc:mysql://192.168.5.61:3306/wmsdata
-    username: liku
-    password: 123456
+    jdbc-url: jdbc:mysql://127.0.0.1:3306/wmsdata
+    username: root
+    password: root
     driver-class-name: com.mysql.cj.jdbc.Driver
 
 
@@ -57,13 +57,13 @@
   # 鍙屾繁
   doubleDeep: true
   # 鍙屾繁搴撲綅鎺掑彿
-  doubleLocs: 1,4,5,8,9,12,13,16
+  doubleLocs: 3,4,7,10,11,14,15,18,19,22,23,26
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
   groupCount: 4
   # 宸︽繁搴撲綅鎺掑彿
-  doubleLocsLeft: 1,5,9,13
+  doubleLocsLeft: 4,7,11,15,19,23
   # 鍙虫繁搴撲綅鎺掑彿
-  doubleLocsRight: 4,8,12,16
+  doubleLocsRight: 3,7,10,14,18,22,26
 # wms鍙傛暟閰嶇疆
 wms-parameter:
   # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 9b8be17..d98be0a 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ

--
Gitblit v1.9.1