From 3ad547eeda731d9522061c60332b591dd2253b03 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 19 十一月 2025 14:57:34 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4 ++--
src/main/java/com/zy/asrs/entity/InOut.java | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/InOut.java b/src/main/java/com/zy/asrs/entity/InOut.java
index 5543513..e70095c 100644
--- a/src/main/java/com/zy/asrs/entity/InOut.java
+++ b/src/main/java/com/zy/asrs/entity/InOut.java
@@ -112,5 +112,6 @@
this.manuDate = manuDate;
this.supp = supp;
this.suppCode = suppCode;
+ this.brand = brand;
}
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 17c7f67..0705f50 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -128,7 +128,7 @@
Mat mat = matService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
- inOut.setBrand(wrkDetl.getBarcode());//鎵樼洏鏉＄爜
+ inOut.setBrand(wrkDetl.getZpallet());//鎵樼洏鏉＄爜
inOut.setTemp2(mat.getName());//濂楀彿
inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
// inOut.setModiTime(now.toString());
@@ -261,7 +261,7 @@
InOut inOut=inOutService.selectByMatnr(wrkDetl.getMatnr());
if (inOut != null){
inOut.setTemp1("鍦ㄥ簱");//灞炴�� 鏄惁鍦ㄥ簱
- inOut.setBrand(wrkDetl.getBarcode());//鎵樼洏鏉＄爜
+ inOut.setBrand(wrkDetl.getZpallet());//鎵樼洏鏉＄爜
inOut.setTemp3(wrkMast.getLocNo());//搴撲綅鍙�
// inOut.setModiTime(now.toString());
}
--
Gitblit v1.9.1