From cb985961bcfbd5d0c9191c914c2e268504659bfe Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期六, 30 八月 2025 12:44:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 3 +++
src/main/java/com/zy/common/service/CommonService.java | 8 ++++----
src/main/resources/application.yml | 4 ++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 5e4d4ea..ac837db 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -116,6 +116,9 @@
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
+ if (row ==1 || row == 6){
+ return deepLoc;
+ }
boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
int shallowRow = deepLocLeft ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e429c41..8ff15f2 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -149,7 +149,7 @@
}
} catch (Exception e) {
- log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒�", sourceStaNo);
+ log.error("绔欑偣={} 鏈煡璇㈠埌瀵瑰簲鐨勮鍒欙紝{}", sourceStaNo,e.getMessage());
}
return null;
}
@@ -240,7 +240,7 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow).eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue()));
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
- if (locMasts.size() - crnCountO <= 2) {
+ if (locMasts.size() - crnCountO <= 15) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
nearRow = 0;
times++;
@@ -293,7 +293,7 @@
.eq("loc_type2", locTypeDto.getLocType2())
);
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
- if (locMasts.size() - crnCountO <= 2) {
+ if (locMasts.size() - crnCountO <= 15) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
} else {
nearRow = near;
@@ -345,7 +345,7 @@
.eq("loc_type2", locTypeDto.getLocType2())
);
int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).eq("io_type", 1));
- if (locMasts.size() - crnCountO <= 2) {
+ if (locMasts.size() - crnCountO <= 15) {
log.error(crnNo + "鍙峰爢鍨涙満娌℃湁绌哄簱浣嶏紒锛侊紒 灏哄瑙勬牸锛� {}锛� 杞娆℃暟锛歿}", JSON.toJSONString(locTypeDto), times);
} else {
nearRow = near;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e4ee716..8081d7a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -16,7 +16,7 @@
task:
scheduling:
pool:
- size: 3
+ size: 5
mvc:
@@ -89,7 +89,7 @@
NYNC:
ip: http://192.168.5.160
port: 8088
- pageSize: 1000
+ pageSize: 100
#1.閿�鍞嚭搴撳崟鍙傜収鍙戣揣鍗曟柊澧�
saveRefDelivery: /nccloud/api/ic/saleout/saveRefDelivery
#2.鍏朵粬鍏ュ簱鍗曞弬鐓ц浆搴撴柊澧�
--
Gitblit v1.9.1