From 2f8dcd296b25a93b6dd2e5f98d1455883db1f57c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 16 十月 2025 09:27:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 55 ++++++++++++++++++---------
src/main/java/com/zy/common/properties/SlaveProperties.java | 4 +-
src/main/java/com/zy/common/model/LocGroupOrder.java | 16 ++++++++
src/main/java/com/zy/asrs/controller/OutController.java | 2
src/main/java/com/zy/common/service/CommonService.java | 8 ++--
src/main/resources/application.yml | 14 ++++++
6 files changed, 73 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index eea546a..42ecb55 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -80,7 +80,7 @@
}
//鑾峰彇閫氶亾缁�
- List<Integer> locRowGroupAsc = Utils.getLocRowGroupAsc(slaveProperties, Utils.getRow(locNo));
+ List<Integer> locRowGroupAsc = Utils.getLocGroupAsc(slaveProperties, locNo);
for (Integer row : locRowGroupAsc) {
String shallow = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast shallowLoc = locMastService.selectById(shallow);
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 783ec32..9a8ff4b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -2,12 +2,15 @@
import com.core.common.Arith;
import com.core.common.Cools;
+import com.zy.common.model.LocGroupOrder;
import com.zy.common.properties.SlaveProperties;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+
+import static cn.hutool.poi.excel.sax.ElementName.row;
/**
* Created by vincent on 2020/8/27
@@ -71,28 +74,44 @@
return zerofill(String.valueOf(row), 2) + zerofill(String.valueOf(bay), 3) + zerofill(String.valueOf(lev), 2);
}
- public static List<Integer> getLocRowGroupAsc(SlaveProperties slaveProperties, Integer row) {
- List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
- for (List<Integer> group : locGroupAsc) {
- if (group.contains(row)) {
- List<Integer> copy = new ArrayList<>(group);
- return copy;
- }
- }
-
- throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
+ public static List<Integer> getLocGroupAsc(SlaveProperties slaveProperties, String locNo) {
+ LocGroupOrder checkOrder = findGroupOrder(slaveProperties, locNo);
+ List<Integer> rowList = checkOrder.getRowList();
+ return new ArrayList<>(rowList);
}
- public static List<Integer> getLocRowGroupDesc(SlaveProperties slaveProperties, Integer row) {
- List<List<Integer>> locGroupAsc = slaveProperties.getLocGroupAsc();
- for (List<Integer> group : locGroupAsc) {
- if (group.contains(row)) {
- List<Integer> copy = new ArrayList<>(group);
- Collections.reverse(copy);
- return copy;
+ public static List<Integer> getLocGroupDesc(SlaveProperties slaveProperties, String locNo) {
+ List<Integer> copy = getLocGroupAsc(slaveProperties, locNo);
+ Collections.reverse(copy);
+ return copy;
+ }
+
+ public static LocGroupOrder findGroupOrder(SlaveProperties slaveProperties, String locNo) {
+ int row1 = Utils.getRow(locNo);
+ int bay1 = Utils.getBay(locNo);
+ List<LocGroupOrder> locGroupAscOrder = slaveProperties.getLocGroupAscOrder();
+
+ LocGroupOrder checkOrder = null;
+ for (LocGroupOrder order : locGroupAscOrder) {
+ if (!order.getRowList().contains(row1)) {
+ continue;
}
+
+ if (bay1 < order.getMinBay()) {
+ continue;
+ }
+
+ if(bay1 > order.getMaxBay()){
+ continue;
+ }
+
+ checkOrder = order;
}
- throw new RuntimeException(row + "鎺�,鏈畾涔夊簱浣嶇粍");
+ if (checkOrder == null) {
+ throw new RuntimeException(locNo + "搴撲綅鍙�,鏈畾涔夊簱浣嶇粍瑙勫垯");
+ }
+
+ return checkOrder;
}
}
diff --git a/src/main/java/com/zy/common/model/LocGroupOrder.java b/src/main/java/com/zy/common/model/LocGroupOrder.java
new file mode 100644
index 0000000..e865c6d
--- /dev/null
+++ b/src/main/java/com/zy/common/model/LocGroupOrder.java
@@ -0,0 +1,16 @@
+package com.zy.common.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class LocGroupOrder {
+
+ private List<Integer> rowList;
+
+ private Integer minBay;
+
+ private Integer maxBay;
+
+}
diff --git a/src/main/java/com/zy/common/properties/SlaveProperties.java b/src/main/java/com/zy/common/properties/SlaveProperties.java
index 17dda16..f953f3e 100644
--- a/src/main/java/com/zy/common/properties/SlaveProperties.java
+++ b/src/main/java/com/zy/common/properties/SlaveProperties.java
@@ -1,10 +1,10 @@
package com.zy.common.properties;
+import com.zy.common.model.LocGroupOrder;
import lombok.Data;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -15,6 +15,6 @@
@ConfigurationProperties(prefix = "wcs-slave")
public class SlaveProperties {
- private List<List<Integer>> locGroupAsc = new ArrayList<>();
+ private List<LocGroupOrder> locGroupAscOrder;
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index faefd3f..27f3b06 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -171,7 +171,7 @@
List<String> locNos = locDetlService.getSameDetlList(findLocNoAttributeVo.getMatnr());
for (String locNo : locNos) {
//鑾峰彇閫氶亾缁�
- List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
@@ -209,7 +209,7 @@
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
- List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
boolean flag = true;
for (Integer row : locRowGroupDesc) {
@@ -258,7 +258,7 @@
for (LocMast locMast : locMastsD) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
- List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
for (Integer row : locRowGroupDesc) {
String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
LocMast deepLoc = locMastService.selectById(deepLocNo);
@@ -296,7 +296,7 @@
for (LocMast locMast : locMasts) {
String locNo = locMast.getLocNo();
//鑾峰彇閫氶亾缁�
- List<Integer> locRowGroupDesc = Utils.getLocRowGroupDesc(slaveProperties, Utils.getRow(locNo));
+ List<Integer> locRowGroupDesc = Utils.getLocGroupDesc(slaveProperties, locNo);
boolean flag = true;
for (Integer row : locRowGroupDesc) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fd14592..1cd9073 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -51,7 +51,19 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- locGroupAsc: [[1],[3,4,5,6],[10,9,8,7],[12,13],[15,14],[17,18,19,20,21,22,23],[2],[11],[16]]
+ # 鐢辨祬鍏ユ繁
+ locGroupAscOrder: [
+ {rowList: [1],minBay: 1,maxBay: 16},
+ {rowList: [3,4,5,6],minBay: 1,maxBay: 16},
+ {rowList: [10,9,8,7],minBay: 1,maxBay: 16},
+ {rowList: [10,9,8,7,6,5,4,3],minBay: 17,maxBay: 22},
+ {rowList: [12,13],minBay: 1,maxBay: 22},
+ {rowList: [15,14],minBay: 1,maxBay: 22},
+ {rowList: [17,18,19,20,21,22,23],minBay: 1,maxBay: 22},
+ {rowList: [2],minBay: 1,maxBay: 22},
+ {rowList: [11],minBay: 1,maxBay: 22},
+ {rowList: [16],minBay: 1,maxBay: 22},
+ ]
#wcs瀵规帴
wcs:
--
Gitblit v1.9.1