From 739d8893d05883aa8975a18a4de03de20b0e2914 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 11 七月 2022 09:46:00 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 6 +++
src/main/java/com/zy/asrs/utils/Utils.java | 99 +++++++++++++++++++++++++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +++
src/main/java/com/zy/common/web/WcsController.java | 2 +
src/main/java/com/zy/asrs/service/LocMastService.java | 7 +++
5 files changed, 120 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 c05a800..1620090 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -32,4 +32,11 @@
*/
Boolean checkWhole(List<LocDetl> locDetls);
+ /**
+ * 鍒ゆ柇鏄惁鏄渶澶栧眰鐨勫簱浣�
+ * @param locNo
+ * @return
+ */
+ Boolean isOutMost(String locNo);
+
}
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 fe3c612..2b422df 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,6 +7,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -48,4 +49,9 @@
return null;
}
+ @Override
+ public Boolean isOutMost(String locNo) {
+ return Integer.parseInt(locNo.substring(0, 2)) == Utils.getGroupRow(locNo);
+ }
+
}
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 f4a67da..a874c50 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -99,6 +99,7 @@
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo())?1:0);;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -225,6 +226,7 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo())?1:0);;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -299,6 +301,7 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ wrkMast.setOutMost(locMastService.isOutMost(taskDto.getLocNo())?1:0);;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
@@ -374,6 +377,7 @@
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(10D); // 浼樺厛绾э細10
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo())?1:0);;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
@@ -455,6 +459,7 @@
wrkMast.setIoPri(10D);
wrkMast.setSourceStaNo(sourceStaNo); // 婧愮珯
wrkMast.setStaNo(param.getOutSite()); // 鐩爣绔�
+ wrkMast.setOutMost(locMastService.isOutMost(locNo)?1:0);;
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceLocNo(locNo); // 婧愬簱浣�
wrkMast.setFullPlt("N"); // 婊℃澘锛歒
@@ -527,6 +532,7 @@
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
wrkMast.setIoType(11); // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
wrkMast.setIoPri(10D);
+ wrkMast.setOutMost(locMastService.isOutMost(locNo)?1:0);;
wrkMast.setCrnNo(sourceLoc.getCrnNo());
wrkMast.setSourceLocNo(sourceLocNo); // 婧愬簱浣�
wrkMast.setLocNo(locNo); // 鐩爣搴撲綅
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index e80f7e5..d45378d 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -161,6 +161,105 @@
}
+ public static Integer getGroupRow(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ return 3;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return 4;
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return 11;
+ case 12:
+ case 13:
+ case 14:
+ return 12;
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return 18;
+ case 19:
+ case 20:
+ case 21:
+ return 19;
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
+
+ public static List<String> getGroupLoc(String locNo){
+ int row = getRow(locNo);
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(1), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(3), 2) + locNo.substring(2));
+ }};
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(4), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
+ }};
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(11), 2) + locNo.substring(2));
+ }};
+ case 12:
+ case 13:
+ case 14:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(12), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
+ }};
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(18), 2) + locNo.substring(2));
+ }};
+ case 19:
+ case 20:
+ case 21:
+ return new ArrayList<String>() {{
+ add(zerofill(String.valueOf(19), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
+ }};
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+
+ }
+
public static void main(String[] args) {
SlaveProperties slaveProperties = new SlaveProperties();
slaveProperties.setDoubleDeep(true);
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a9331ff..be4d849 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -118,6 +118,7 @@
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo())?1:0);;
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
@@ -190,6 +191,7 @@
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setOutMost(locMastService.isOutMost(dto.getLocNo())?1:0);;
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
--
Gitblit v1.9.1