From c6fae49294b74658ce258d7dbb8442124e54fef5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 11 五月 2025 12:11:36 +0800
Subject: [PATCH] #调试
---
src/main/java/com/zy/common/web/WcsController.java | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 04b91f3..00a4bf2 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())) {
@@ -318,7 +327,7 @@
// 妫�绱㈠簱浣�
List<String> matnrs = waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList());
List<String> batchs = waitPakins.stream().map(WaitPakin::getBatch).distinct().collect(Collectors.toList());
- StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
+ StartupDto dto = commonService.getLocNo(2, 1, devpNo, matnrs.get(0), batchs.get(0), null, locTypeDto);
int workNo = dto.getWorkNo();
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -354,6 +363,21 @@
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(waitPakin);
+ wrkDetl.setBatch(orderDetl.getBatch());
+ wrkDetl.setProType(orderDetl.getProType());
+ 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