From b7380ff70bcc962494cd6640fcc3eac21aaab0a1 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 15 一月 2026 08:09:29 +0800
Subject: [PATCH] 1.自动下发出库任务给wcs 2.wcs申请入库
---
src/main/java/com/zy/common/web/WcsController.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 61250b6..c9d23a5 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -56,14 +56,11 @@
@ResponseBody
public synchronized R getLocNo(@RequestBody SearchLocParam param) {
log.info("鏀跺埌WCS鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("鍏ュ嚭搴撶被鍨嬩笉鑳戒负绌�");
- }
if (Cools.isEmpty(param.getSourceStaNo())) {
return R.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
List<WaitPakin> waitPakins = null;
- if (param.getIoType() == 1) {
+
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
@@ -80,7 +77,6 @@
if (countLoc > 0 || countWrk > 0) {
return R.error(CodeRes.EXIST_500);
}
- }
if (Cools.isEmpty(param.getLocType1())){
return R.error("楂樹綆妫�娴嬩俊鍙蜂笉鑳戒负绌�");
}
@@ -271,6 +267,10 @@
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9997));
+ if(wrkMast2 != null){
+ throw new CoolException("瀛樺湪9997鐩樼偣绉绘牻浠诲姟");
+ }
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
Date now = new Date();
// 鐢熸垚宸ヤ綔妗�
@@ -320,6 +320,10 @@
if(wrkMast1== null){
return R.error("鏃犺鐩樼偣绉绘牻浠诲姟");
}
+ WrkMast wrkMast2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no",9996));
+ if(wrkMast2 != null){
+ throw new CoolException("瀛樺湪9996鐩樼偣绉绘牻浠诲姟");
+ }
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(transplantWork.getWorkNo());
Date now = new Date();
--
Gitblit v1.9.1