From 41dfe966bbc15027ab121385a04d825833cdd56d Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期三, 31 七月 2024 11:46:45 +0800
Subject: [PATCH] 按客户需求，页面添加显示字段，将15分钟改成5分钟
---
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..9cd40d6 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());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(order.getOrderNo(), waitPakin.getMatnr(), null);
+ }
+ wrkDetl.setSPgNO(order.getTemp2());
+ 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