From 7e4c4560f31b116ed5a274ce0b9c55144999252d Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 17 五月 2025 08:41:31 +0800
Subject: [PATCH] #调试
---
src/main/java/com/zy/third/lk/entity/OutHedTBBak.java | 2 +-
src/main/java/com/zy/asrs/utils/Utils.java | 2 +-
src/main/java/com/zy/third/lk/entity/InDetTB.java | 2 +-
src/main/java/com/zy/common/service/CommonService.java | 20 ++++++++++++++++----
src/main/resources/application.yml | 6 +++---
5 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d941627..0970a17 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -243,7 +243,7 @@
}
public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1 || whsType==3 || whsType==4) {
+ if (whsType == 1 ||whsType==2 || whsType==3 || whsType==4) {
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 285b425..0697a08 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -325,10 +325,22 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
- .eq("row1", nearRow)
- .eq("loc_sts", "O")
- .orderBy("lev1",true).orderBy("bay1",true));
+ List<LocMast> locMasts = null;
+ if(sourceStaNo % 100 > 10){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .orderBy("lev1",true).orderBy("bay1",false));
+ }else{
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .orderBy("lev1",true).orderBy("bay1",true));
+ }
+// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+// .eq("row1", nearRow)
+// .eq("loc_sts", "O")
+// .orderBy("lev1",true).orderBy("bay1",true));
// for (LocMast locMast1 : locMasts) {
// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
// continue;
diff --git a/src/main/java/com/zy/third/lk/entity/InDetTB.java b/src/main/java/com/zy/third/lk/entity/InDetTB.java
index 7b3dc23..bf3484b 100644
--- a/src/main/java/com/zy/third/lk/entity/InDetTB.java
+++ b/src/main/java/com/zy/third/lk/entity/InDetTB.java
@@ -34,7 +34,7 @@
@NoArgsConstructor
@AllArgsConstructor
@Data
-@TableName("LK_InDetTB")
+@TableName("lk_InDetTB")
public class InDetTB implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
index aa916ec..d677a97 100644
--- a/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
+++ b/src/main/java/com/zy/third/lk/entity/OutHedTBBak.java
@@ -15,7 +15,7 @@
import java.io.Serializable;
-@TableName("lk_OutHedTb_bak")
+@TableName("lk_OutHedTB_bak")
public class OutHedTBBak implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 2840412..edd97b0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -109,9 +109,9 @@
refreshtime: 0/5 * * * * ?
db:
driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.1.147:1800;databasename=XDLinkLK
- username: XGMLK
- password: xunda0413
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=TZGLLK
+ username: sa
+ password: sa@123
# url: jdbc:sqlserver://192.168.4.138:1433;databasename=XDLinkLK2
# username: sa
# password: sa@123
--
Gitblit v1.9.1