From e8e108b1f18fb0b73f9752ac6cedaf47f1ce26f1 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 16 一月 2026 13:13:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/web/WcsController.java | 9 ++++++---
1 files changed, 6 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 2a3a4b3..700d502 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -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
@@ -524,7 +527,7 @@
} else if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && statusParam.getTaskStatus() != 8) {
wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
} else if (wrkMast.getWrkSts() == 7 && statusParam.getTaskStatus() == 8){
- wrkMast.setWrkSts(15L);//15.鍑哄簱鏇存柊瀹屾垚锛屼换鍔＄粨鏉�
+ wrkMast.setWrkSts(14L);//15.鍑哄簱鏇存柊瀹屾垚锛屼换鍔＄粨鏉�
}
}
wrkMastService.updateById(wrkMast);
--
Gitblit v1.9.1