From cd280ead41b98ee60154038e36d9b83cc25e7d16 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 20 十二月 2023 12:55:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 1528742..b187200 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -105,7 +105,7 @@
if (sourceStaNo.equals(202)) {
whsType = 1;
locTypeDto.setLocType1((short) 1);
- } else if (sourceStaNo.equals(209)) {
+ } else if (sourceStaNo.equals(206)) {
whsType = 2;
locTypeDto.setLocType1((short) 2);
}
@@ -160,8 +160,13 @@
rowLastnoService.updateById(rowLastno);
if (crnNo==1){
- LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts", "F").eq("loc_type2", (short) 3));
- if (!Cools.isEmpty(locMast1)){
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "F")
+ .eq("loc_type1", (short) 3));
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts", "O")
+ .eq("loc_type1", (short) 1));
+ if (!Cools.isEmpty(locMast1)||Cools.isEmpty(locMast2)){
locMast = locMastService.queryFreeLocMast(2,(short)3);
if (Cools.isEmpty(locMast)){
locMast = locMastService.queryFreeLocMast(1,(short)3);
--
Gitblit v1.9.1