From b1f84ea56417d58d37efb92a00a0a848bfc9b3d2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 15 一月 2026 11:15:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 11 +++++++----
1 files changed, 7 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 c9ce403..fc29227 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -85,8 +85,8 @@
if (Cools.isEmpty(param.getCargoHeight())) {
return Re.error("楂樹綆搴撶被鍨嬩笉鑳戒负绌�");
}
- if (Cools.isEmpty(param.getFromPort())) {
- return Re.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
+ if (Cools.isEmpty(param.getFromPort()) && !param.getFromPort().equals("1001")) {
+ return Re.error("鍏ュ簱绔欑偣缂栧彿閿欒:"+param.getFromPort());
}
if(Cools.isEmpty(param.getWarehouse())){
return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
@@ -98,7 +98,7 @@
if (param.getFromPort().equals("1001")) {
//鏈夌┖鏉垮嚭搴撴椂绂佹鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 1001).notIn("wrk_sts", 7));
if(wrkCount > 0){
return Re.error("鏈夌┖鏉垮嚭搴撳埌1001绔欐椂鏃剁姝㈠叆搴�");
}
@@ -121,7 +121,7 @@
}
} else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 100).andNew().eq("io_type", 101).or().eq("io_type", 110));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", 1001).andNew().eq("io_type", 101).or().eq("io_type", 110));
if (wrkCount > 0) {
return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
}
@@ -140,6 +140,9 @@
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
+ if(sourceStaNo == null){
+ return Re.error("绔欑偣涓嶅瓨鍦�");
+ }
sourceStaNo.setLocType1(param.getCargoHeight().shortValue()); // 楂樹綆搴撲綅
// if (param.getBarCode().startsWith("7")){
// sourceStaNo.setLocType2((short) 1); // 瀹界獎搴撲綅 1.绐勫簱浣�1200*1000*990
--
Gitblit v1.9.1