From 504ee622ba68ca942d84de91c8094779617e981f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 01 十二月 2022 14:12:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 13 +++++++++++++
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++
src/main/java/com/zy/asrs/service/LocMastService.java | 2 ++
3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index ca01593..a859980 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -61,4 +61,6 @@
List<String> getDemoNextLoc(Integer crnNo);
Boolean isShuttle(String locNo);
+
+ Integer getOutCrnNo(LocMast locMast);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index 1c4a6cd..e1ba5cd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -77,4 +77,17 @@
return Boolean.FALSE;
}
+ @Override
+ public Integer getOutCrnNo(LocMast locMast) {
+ int row = Utils.getRow(locMast.getLocNo());
+ if (Utils.FIRST_GROUP_ROW_LIST.contains(row)) {
+ return 1;
+ }
+ if (Utils.SECOND_GROUP_ROW_LIST.contains(row)) {
+ return 3;
+ } else {
+ return locMast.getCrnNo();
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 14f49b1..5eb3186 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1854,6 +1854,9 @@
Date now = new Date();
wrkMast.setCrnEndTime(now);
wrkMast.setModiTime(now);
+ LocMast locMast = locMastService.selectById(wrkMast.getSourceLocNo());
+ Integer outCrnNo = locMastService.getOutCrnNo(locMast);
+ wrkMast.setCrnNo(outCrnNo);
// 淇敼鎴愬姛鍚庡浣嶅爢鍨涙満
if (wrkMastMapper.updateById(wrkMast) > 0) {
// 鍫嗗灈鏈哄浣�
--
Gitblit v1.9.1