From 372fa7ad569726b3baa10a570128241b9ff19427 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 29 五月 2023 15:47:41 +0800
Subject: [PATCH] 新的出库作业页面，提取库存提取商品。检测提交的出库库位不包含最外侧库位
---
src/main/java/com/zy/asrs/utils/Utils.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 9e7e7dd..658e63e 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -348,6 +348,63 @@
}
}
+ /**
+ * 鑾峰彇鍐呬晶宸烽亾搴撲綅缁�
+ */
+ public static List<String> getGroupInsideRoadwayLoc(String locNo){
+ int row = getRow(locNo);
+ ArrayList<String> list = new ArrayList<>();
+ switch (row) {
+ case 1:
+ case 2:
+ case 3:
+ list.add(zerofill(String.valueOf(1), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(2), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
+ case 4:
+ case 5:
+ case 6:
+ case 7:
+ list.add(zerofill(String.valueOf(5), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(6), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(7), 2) + locNo.substring(2));
+ return list;
+ case 8:
+ case 9:
+ case 10:
+ case 11:
+ list.add(zerofill(String.valueOf(8), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(9), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(10), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
+ case 12:
+ case 13:
+ case 14:
+ list.add(zerofill(String.valueOf(13), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(14), 2) + locNo.substring(2));
+ return list;
+ case 15:
+ case 16:
+ case 17:
+ case 18:
+ list.add(zerofill(String.valueOf(15), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(16), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(17), 2) + locNo.substring(2));
+ Collections.reverse(list);
+ return list;
+ case 19:
+ case 20:
+ case 21:
+ list.add(zerofill(String.valueOf(20), 2) + locNo.substring(2));
+ list.add(zerofill(String.valueOf(21), 2) + locNo.substring(2));
+ return list;
+ default:
+ throw new RuntimeException("搴撲綅瑙ｆ瀽寮傚父");
+ }
+ }
+
// 娉ㄦ剰椤哄簭
public static List<String> getGroupOuterLoc(String locNo){
int row = getRow(locNo);
@@ -542,7 +599,7 @@
if (sign) {
break;
}
- List<String> groupInsideLoc = Utils.getGroupLoc(locNo);
+ List<String> groupInsideLoc = Utils.getGroupInsideRoadwayLoc(locNo);
if (!Cools.isEmpty(groupInsideLoc)) {
for (String insideLoc : groupInsideLoc) {
if (locNos.contains(insideLoc)) {
@@ -564,6 +621,49 @@
}
}
+ /**
+ * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆
+ * 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
+ */
+ public static boolean checkInsideLocIsDFX(String locNo) {
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
+ if (insideLoc.size() > 0) {
+ List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
+ for (LocMast mast : insideLocMast) {
+ if (!mast.getLocSts().equals("D")
+ && !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("X")) {
+ //D銆丗銆乆(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ /**
+ * 妫�娴嬪綋鍓嶅簱浣嶅唴渚у叾浠栧簱浣嶆槸鍚︿负D銆丗銆乆銆丼
+ * 杩斿洖true琛ㄧず鍐呬晶搴撲綅涓嶆槸DFX锛岃繑鍥瀎alse琛ㄧず鍐呬晶搴撲綅鏄疍FX
+ */
+ public static boolean checkInsideLocIsDFXS(String locNo) {
+ LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+ List<String> insideLoc = Utils.getGroupInsideLoc(locNo);
+ if (insideLoc.size() > 0) {
+ List<LocMast> insideLocMast = locMastService.selectByLocNos(insideLoc);
+ for (LocMast mast : insideLocMast) {
+ if (!mast.getLocSts().equals("D")
+ && !mast.getLocSts().equals("F")
+ && !mast.getLocSts().equals("X")
+ && !mast.getLocSts().equals("S")) {
+ //D銆丗銆乆銆丼(涓嶈兘閫夊畾杩欎釜澶栦晶搴撲綅)
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
public static void main(String[] args) {
List<String> groupLoc = Utils.getGroupLoc("1300801");
System.out.println(groupLoc);
--
Gitblit v1.9.1