From 202ad2684cbaeaafd22df631caf92a22db3d7179 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 13 二月 2023 18:20:19 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/LocMastMapper.xml | 2 +-
src/main/java/com/zy/common/web/WcsController.java | 4 +++-
src/main/java/com/zy/common/service/CommonService.java | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 45880cc..1534f8d 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -127,12 +127,14 @@
// 鐩爣搴撲綅
LocMast locMast = null;
+ crnNo=2;
if (curRow == 3) {
curRow = 4;
} else if (curRow == 4) {
curRow = 3;
} else {
rowCount = 0;
+ crnNo=1;
}
if (crnNo == 0) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 2549d83..8fb2c05 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -72,7 +72,9 @@
int countLoc = locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet",param.getBarcode()));
int countWrk = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet",param.getBarcode()));
if (countLoc > 0 || countWrk > 0 || countWait > 0) {
- return R.error(CodeRes.EXIST_500);
+ if (!Cools.isEmpty(waitPakins.get(0).getDeadWarn()) && waitPakins.get(0).getDeadWarn()!=0){
+ return R.error(CodeRes.EXIST_500);
+ }
}
}
if (Cools.isEmpty(param.getLocType1())){
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 1750d38..80d26a6 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -47,7 +47,7 @@
where row1=#{row}
and loc_sts='O'
<if test="locType1 != null">
- and loc_type1 = #{locType1}
+ and loc_type1 != 1
</if>
order by lev1 asc,bay1 asc
</select>
--
Gitblit v1.9.1