From d6fa6d71bcb2ade276fe918ea07acc5a61999023 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 05 六月 2025 13:16:40 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 ++
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 3 ++-
src/main/java/com/zy/common/model/DetlDto.java | 5 ++++-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 6cffdde..31e1b42 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -55,6 +55,8 @@
// 瑙勬牸
private String specs;
+ private String outOrderNo;
+
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d253f7a..febbe53 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -110,7 +110,7 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getProType(),elem.getTemp2());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme(),elem.getProType(),elem.getTemp2(),elem.getOutOrderNo());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
assert one != null;
@@ -130,6 +130,7 @@
waitPakin.sync(mat);
waitPakin.setProType(detlDto.getProType());
waitPakin.setTemp2(detlDto.getTemp2());
+ waitPakin.setOutOrderNo(detlDto.getOutOrderNo());
waitPakin.setBatch(detlDto.getBatch());
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 2e3565c..7389760 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -24,6 +24,8 @@
private String temp2;
private String proType;
+ private String outOrderNo;
+
public DetlDto() {
}
@@ -43,12 +45,13 @@
this.anfme = anfme;
}
- public DetlDto(String matnr, String batch, Double anfme, String proType, String temp2) {
+ public DetlDto(String matnr, String batch, Double anfme, String proType, String temp2, String outOrderNo) {
this.matnr = matnr;
this.batch = batch;
this.anfme = anfme;
this.proType = proType;
this.temp2 = temp2;
+ this.outOrderNo = outOrderNo;
}
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
--
Gitblit v1.9.1