From be9f5efd7badcaab6f1746e76ec41ee7f91d37c7 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 12:53:43 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/common/web/WcsController.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3798a5f..0bf1d61 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -56,6 +56,9 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -359,8 +362,19 @@
wrkDetl.setModiTime(now);
if (!Cools.isEmpty(waitPakin.getOrderNo())) {
Order order = orderService.selectByNo(waitPakin.getOrderNo());
- wrkDetl.setSPgNO(order.getTemp2());
-
+ if (order != null) {
+ OrderDetl orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), waitPakin.getBatch(), waitPakin.getAnfme());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null,waitPakin.getAnfme());
+ }
+ wrkDetl.setSPgNO(orderDetl.getSPgNO());
+ wrkDetl.setOutOrderNo(orderDetl.getOutOrderNo());
+ wrkDetl.setLuHao(orderDetl.getLuHao());
+ wrkDetl.setPacking(orderDetl.getPacking());
+ wrkDetl.setColor(orderDetl.getColor());
+ wrkDetl.setWareId(orderDetl.getWareId());
+ wrkDetl.setWareName(orderDetl.getWareName());
+ }
}
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
--
Gitblit v1.9.1