From f8ea2fd7aa67325d9532a81c5ec22e768539077e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 15 一月 2026 10:37:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index a4a65d0..2a3a4b3 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("浠撳簱缂栧彿涓嶈兘涓虹┖");
@@ -95,12 +95,12 @@
return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
}
List<WaitPakin> waitPakins = null;
- if (param.getFromPort().equals("101")) {
+ if (param.getFromPort().equals("1001")) {
//鏈夌┖鏉垮嚭搴撴椂绂佹鍏ュ簱
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).eq("sta_no", 100).notIn("wrk_sts", 7));
if(wrkCount > 0){
- return Re.error("鏈夌┖鏉垮嚭搴撳埌100绔欐椂鏃剁姝㈠叆搴�");
+ return Re.error("鏈夌┖鏉垮嚭搴撳埌1001绔欐椂鏃剁姝㈠叆搴�");
}
if (Cools.isEmpty(param.getBarCode())) {
@@ -179,9 +179,10 @@
return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
}
- // 婧愮珯鐐圭姸鎬佹娴�
- BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
- LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+// // 婧愮珯鐐圭姸鎬佹娴�
+// BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
+ LocTypeDto locTypeDto = new LocTypeDto();
+ locTypeDto.setLocType1((short) 2);
StartupDto dto = null;
--
Gitblit v1.9.1