From 58dc66a9d999c7d350e1ee4bf32b8d85b6e20e00 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 21 九月 2024 10:32:42 +0800
Subject: [PATCH] 逻辑调整
---
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2 ++
src/main/java/com/zy/asrs/utils/MatCompareUtils.java | 2 +-
src/main/java/com/zy/common/model/LocDto.java | 3 ++-
src/main/java/com/zy/common/web/WcsController.java | 1 +
src/main/java/com/zy/asrs/controller/OutController.java | 2 ++
5 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index d4b5e93..f5f52b8 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -103,6 +103,7 @@
locDto.setPacking(locDetl.getPacking());
locDto.setProType(locDetl.getProType());
locDto.setSPgNO(locDetl.getSPgNO());
+ locDto.setColor(locDetl.getColor());
locDtos.add(locDto);
//exist.add(locDetl.getLocNo());
// 鍓╀綑寰呭嚭鏁伴噺閫掑噺
@@ -121,6 +122,7 @@
locDto.setPacking(orderDetl.getPacking());
locDto.setProType(orderDetl.getProType());
locDto.setSPgNO(orderDetl.getSPgNO());
+ locDto.setColor(orderDetl.getColor());
locDtos.add(locDto);
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 017b93b..7594347 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -41,6 +41,8 @@
private String proType;
+
+ private String color;
}
}
diff --git a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
index 2dd3c86..947f84f 100644
--- a/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
+++ b/src/main/java/com/zy/asrs/utils/MatCompareUtils.java
@@ -15,7 +15,7 @@
private static final Logger log = LoggerFactory.getLogger(MatCompareUtils.class);
- private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"};
+ private static final String[] sameFields = {"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType","color"};
public static boolean compare(Object object1, Object object2) {
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 7499953..c059370 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -35,7 +35,7 @@
private String zpallet;
- //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType"
+ //"matnr", "batch", "outOrderNo", "luHao", "packing", "sPgNO", "proType" color
private String outOrderNo;
private String luHao;
@@ -44,6 +44,7 @@
private String proType;
+ private String color;
public LocDto() {
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index babf6f3..059ecb0 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -367,6 +367,7 @@
Order order = orderService.selectByNo(waitPakin.getOrderNo());
if (order != null) {
OrderDetl orderDetl = orderDetlService.selectItem(waitPakin);
+ wrkDetl.setBatch(orderDetl.getBatch());
wrkDetl.setProType(orderDetl.getProType());
wrkDetl.setSPgNO(orderDetl.getSPgNO());
wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
--
Gitblit v1.9.1