From dd76858f35bb4fdd76d5976465e9bd96267b0f0b Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 06 五月 2026 09:50:53 +0800
Subject: [PATCH] 初始化
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 0556712..e1b19df 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -160,7 +160,9 @@
waitPakin.setModiTime(now);
// 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
+ Integer inStaNo = combMat.getInStaNo(); // 鍏ュ簱绔欑偣
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(inStaNo, true);
// 闀垮害>3500鏀惧搴撲綅
sourceStaNo.setLocType2((short) (waitPakin.getLength() > 4600 ? 2 : 1));
@@ -233,7 +235,9 @@
@Override
public R agvAskOpen(AgvAskOpenParam param) {
if (param.getFlag() == 0) { // 鍑哄簱璇锋眰wms寮�闂�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ Integer staNo = param.getStaNo(); // 闇�瑕佸紑銆佸叧闂ㄧ殑绔欑偣
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staNo));
if (basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")
&& basDevp.getOutEnable().equals("Y")) { // 鍑哄簱宸ヤ綔妗�
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
@@ -259,7 +263,8 @@
return R.error("涓嶆弧瓒冲嚭搴撴潯浠�");
}
} else if(param.getFlag() == 1) { // 鍏ュ簱璇锋眰wms寮�闂�
- BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+// BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
+ BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getStaNo()));
if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y")
&& basDevp.getInEnable().equals("Y") && basDevp.getWrkNo() <= 3000) { // 鍏ュ簱搴曞骇
WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
--
Gitblit v1.9.1