From d7e71e9eaf18c27fc328b06204ba4bec152608b6 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期二, 13 六月 2023 09:11:30 +0800
Subject: [PATCH] 孚能
---
src/main/java/com/zy/common/service/CommonService.java | 9 +++++++--
1 files changed, 7 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 c47a215..b187200 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -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