From 1bfa44facba36747d1caffab6bff986ccd7f36a9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 25 十一月 2025 15:13:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
index 851a3b5..575ba5d 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvBindCtnrAndBinParam.java
@@ -36,7 +36,7 @@
return;
case 1:
getAgvTaskAssignmentParam0(basAgvMast);
- indBind = "1";
+ indBind = "0";
return;
case 2:
getAgvTaskAssignmentParam1(basAgvMast);
@@ -44,7 +44,7 @@
return;
case 3:
getAgvTaskAssignmentParam1(basAgvMast);
- indBind = "0";
+ indBind = "1";
return;
default:
return;
@@ -55,19 +55,28 @@
public void getAgvTaskAssignmentParam0(BasAgvMast basAgvMast) {
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
this.reqCode = basAgvMast.getTaskNo() + "-" + System.currentTimeMillis();
- BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
- this.positionCode = basAgvLocNoSou.getAgvLocNo();
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo()));
- this.stgBinCode = basAgvLocNoEnd.getAgvLocNo();
+ BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo())
+ );
+ this.positionCode = basAgvLocNoSou != null ? basAgvLocNoSou.getAgvLocNo() : "";
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo())
+ );
+ this.stgBinCode = basAgvLocNoEnd != null ? basAgvLocNoEnd.getAgvLocNo() : "";
}
public void getAgvTaskAssignmentParam1(BasAgvMast basAgvMast) {
BasAgvLocNoService basAgvLocNoService = SpringUtils.getBean(BasAgvLocNoService.class);
this.reqCode = basAgvMast.getTaskNo() + "-" + System.currentTimeMillis();
- BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getSourceLocNo()));
- this.positionCode = basAgvLocNoSou.getAgvLocNo();
- BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getStaNo()));
- this.stgBinCode = basAgvLocNoEnd.getAgvLocNo();
+// BasAgvLocNo basAgvLocNoSou = basAgvLocNoService.selectOne(
+// new EntityWrapper<BasAgvLocNo>().eq("loc_no", basAgvMast.getLocNo())
+// );
+// this.positionCode = basAgvLocNoSou != null ? basAgvLocNoSou.getAgvLocNo() : "";
+ BasAgvLocNo basAgvLocNoEnd = basAgvLocNoService.selectOne(
+ new EntityWrapper<BasAgvLocNo>().eq("sta_no", basAgvMast.getSourceStaNo())
+ );
+ this.stgBinCode = basAgvLocNoEnd != null ? basAgvLocNoEnd.getAgvLocNo() : "";
+
}
}
--
Gitblit v1.9.1