From 3863e5a60b1b650d5a2025779edd6a8b557939d8 Mon Sep 17 00:00:00 2001
From: dubin <dubin>
Date: 星期二, 26 八月 2025 17:14:54 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 8 +++++---
src/main/resources/application.yml | 6 +++---
2 files changed, 8 insertions(+), 6 deletions(-)
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 395bd6a..fb18b89 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -605,9 +605,10 @@
throw new CoolException(locNo + "搴撲綅涓嶅瓨鍦�");
}
// 鑾峰彇婧愮珯
- Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
+ Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", 110)
- .eq("stn_no", param.getOutSite())
+ //.eq("stn_no", param.getOutSite())
+ .eq("crn_stn", param.getOutSite())
.eq("crn_no", locMast.getCrnNo());
StaDesc staDesc = staDescService.selectOne(wrapper);
Integer sourceStaNo = staDesc.getCrnStn();
@@ -623,7 +624,8 @@
wrkMast.setIoType(110); // 鍏ュ嚭搴撶姸鎬侊細 110.绌烘澘鍑哄簱
wrkMast.setIoPri(10D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
- wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+ //wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+ wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
wrkMast.setFullPlt("N"); // 婊℃澘锛歒
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4a0964f..0cf9f7b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -55,15 +55,15 @@
# 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
groupCount: 4
# 宸︽繁搴撲綅鎺掑彿
- doubleLocsLeft: 1
+ doubleLocsLeft: 4
# 鍙虫繁搴撲綅鎺掑彿
- doubleLocsRight: 4
+ doubleLocsRight: 1
# wms鍙傛暟閰嶇疆
wms-parameter:
# 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏�
automaticFillingBoardStaNosBoolean: false
# 鑷姩琛ョ┖鏉跨珯鐐�
- automaticFillingBoardStaNos: 112,101
+ automaticFillingBoardStaNos: 103
# 鑷姩绉诲簱鍔熻兘寮�鍏�
autoLocMoveBoolean: false
# 鑷姩绉诲簱鍔熻兘寮�鍏� 绌挎
--
Gitblit v1.9.1