From 2718a5f2b9a4b65d257adaa61f436d7ecaed9656 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 18 九月 2024 09:57:19 +0800
Subject: [PATCH] bug调整
---
src/main/java/com/zy/common/web/WcsController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 fd6bd8a..2ffb341 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -53,6 +53,12 @@
@Autowired
private StaDescService staDescService;
+ @Autowired
+ private OrderService orderService;
+
+ @Autowired
+ private OrderDetlService orderDetlService;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -78,9 +84,12 @@
return R.parse(CodeRes.NO_COMB_700);
}
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()));
+ if (countLoc > 0) {
+ return R.error("搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ }
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error(CodeRes.EXIST_500);
+ if (countWrk > 0) {
+ return R.error("宸ヤ綔妗ｅ凡瀛樺湪");
}
}
if (Cools.isEmpty(param.getLocType1())) {
@@ -112,6 +121,7 @@
@ResponseBody
@Transactional
public synchronized R getLocNo2(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰2====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -353,6 +363,22 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ if (!Cools.isEmpty(waitPakin.getOrderNo())) {
+ Order order = orderService.selectByNo(waitPakin.getOrderNo());
+ 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