From c3e47e5e70a9055b7d25c118eb1f7ec3c869e953 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期四, 05 六月 2025 13:53:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wz-JiAo-wms' into wz-JiAo-wms
---
src/main/java/com/zy/common/web/WcsController.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5a4001e..ee11139 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -76,7 +76,7 @@
if (param.getFromPort().equals("100")) {
//鏈夌┖鏉垮嚭搴撴椂绂佹鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",110).eq("sta_no",100));
+ 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绔欐椂鏃剁姝㈠叆搴�");
}
@@ -99,7 +99,7 @@
}
}else {
//鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type",101).or().eq("io_type",110));
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no",200).andNew().eq("io_type",101).or().eq("io_type",110));
if(wrkCount > 0){
return Re.error("鏈夋弧鏉垮嚭搴撴椂绂佹绌烘澘鍏ュ簱");
}
@@ -216,6 +216,7 @@
wrkMast.setLinkMis("Y");
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
wrkMast.setMk("N");//鏄惁瀹屾垚涓婃姤wcs
+ wrkMast.setFullPlt("N");//鍑哄簱绌烘澘娑堥櫎鏍囪
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
@@ -320,9 +321,14 @@
@PostMapping("/fromwcs/task")
@ResponseBody
public Re status(@RequestBody StatusParam statusParam) {
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", statusParam.getTaskId()));
- if(Cools.isEmpty(wrkMast)){
+ String[] wrkNo=statusParam.getTaskId().split("-",2);
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", Integer.parseInt(wrkNo[0])));
+ if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()!=8){
return Re.error("娌℃湁鎵惧埌:"+statusParam.getTaskId()+"杩欐潯浠诲姟");
+ }else if(Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8){
+ return Re.ok();
+ }else if(!Cools.isEmpty(wrkMast)&&statusParam.getTaskStatus()==8&&wrkMast.getIoType()==110){
+ return Re.ok();
}
/**
* 浠诲姟鐘舵��
@@ -341,12 +347,11 @@
wrkMast.setWrkSts(3L);//3.鍙栬揣瀹屾垚
}else if (statusParam.getTaskStatus()==3){
wrkMast.setWrkSts(6L);//6.浠诲姟涓柇
- } else if (statusParam.getTaskStatus()==4){
- wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
- }if (statusParam.getTaskStatus()==8){
- if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10){
+ } else if (statusParam.getTaskStatus()==4 || statusParam.getTaskStatus()==8){
+// wrkMast.setWrkSts(7L);//6.鏀捐揣瀹屾垚
+ if(wrkMast.getIoType()==1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 11){
wrkMast.setWrkSts(4L);//4.鍏ュ簱瀹屾垚
- }else if (wrkMast.getIoType()==101 || wrkMast.getIoType() == 110){
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110){
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
}
}
--
Gitblit v1.9.1