From 0e6be9f75b84ebdf6ed3943853d514966134da34 Mon Sep 17 00:00:00 2001
From: 18516761980 <tqsxp@163.com>
Date: 星期五, 23 九月 2022 14:05:13 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3f23f29..bf59f84 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -47,6 +47,7 @@
@PostMapping("/pakin/loc/v1")
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
+ log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
if (Cools.isEmpty(param.getIoType())) {
return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
}
@@ -66,10 +67,12 @@
}
return R.parse(CodeRes.NO_COMB_700);
}
+ int countWait = waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet",param.getBarcode())
+ .eq("io_status", "Y"));
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
- if (countLoc > 0 || countWrk > 0) {
- return R.error("宸ヤ綔妗�/搴撳瓨鏉＄爜鏁版嵁宸插瓨鍦�");
+ if (countLoc > 0 || countWrk > 0 || countWait > 0) {
+ return R.error(CodeRes.EXIST_500);
}
}
if (Cools.isEmpty(param.getLocType1())){
@@ -78,6 +81,8 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
+// sourceStaNo.setLocType1(param.getLocType1());
+ sourceStaNo.setLocType1((short)1);
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
@@ -92,10 +97,9 @@
default:
break;
}
-
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
return R.ok().add(dto);
}
-
/**
* 鍏ㄦ澘鍏ュ簱
@@ -142,6 +146,7 @@
wrkDetl.setIoTime(wrkMast.getIoTime());
wrkDetl.setAppeTime(now);
wrkDetl.setModiTime(now);
+ wrkDetl.setDeadWarn(waitPakin.getDeadWarn());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
}
@@ -150,6 +155,7 @@
Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
.eq("zpallet", barcode);
WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
setParam.setIoStatus("Y");
setParam.setModiTime(now);
if (!waitPakinService.update(setParam, wrapper)) {
--
Gitblit v1.9.1