From 20cec70cdcca8c2419a17e0304d12d5360af6065 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 25 九月 2024 14:48:27 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
index edd379f..06e2ca1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/WaitPakinController.java
@@ -153,15 +153,15 @@
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
- Long detlId = null;
- for (OrderDetl orderDetl : orderDetls) {
- Mat mat = orderDetl.getMat$();
+ OrderDetl orderDetl = null;
+ for (OrderDetl detl : orderDetls) {
+ Mat mat = detl.getMat$();
if (mat.getMatnr().equals(waitPakinTemplate.getMatnr())) {
- detlId = orderDetl.getId();
+ orderDetl = detl;
}
}
- if (detlId == null) {
+ if (orderDetl == null) {
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦�");
}
@@ -170,7 +170,9 @@
waitPakin.setOrderNo(order.getOrderNo());
waitPakin.setAnfme(waitPakinTemplate.getAnfme());
waitPakin.setBarcode(waitPakinTemplate.getBarcode());
- waitPakin.setDetlId(detlId);
+ waitPakin.setDetlId(orderDetl.getId());
+ waitPakin.setMatnr(orderDetl.getMat$().getMatnr());
+ waitPakin.setBatch(orderDetl.getBatch());
waitPakinService.comb(waitPakin);
}
return R.ok();
--
Gitblit v1.9.1