From 40ada0315f79eaaa30dce2f246878b3ea0d7493b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 20 十二月 2025 12:49:48 +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 1a57be5..0805562 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1015,7 +1015,7 @@
StaDesc staDesc = null;
BasDevp staNo = null;
- if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
+// if (Utils.BooleanWhsTypeSta(rowLastno, staDescId)) {
// 鑾峰彇鐩爣绔�
// wrapper = new EntityWrapper<StaDesc>()
// .eq("type_no", staDescId)
@@ -1036,7 +1036,7 @@
// }
// startupDto.setStaNo(staNo.getDevNo());
// }
- }
+// }
// 鏇存柊搴撲綅鎺掑彿
if (Utils.BooleanWhsTypeSta(rowLastno, staDescId) && Cools.isEmpty(locMast)) {
@@ -1047,7 +1047,7 @@
// 寮�濮嬫煡鎵惧簱浣� ==============================>>
// 1.鎸夎鍒欐煡鎵惧簱浣�
- if (Cools.isEmpty(locMast)) {
+ if (Cools.isEmpty(locMast) && sourceStaNo != 4006) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
.eq("row1", nearRow)
.eq("loc_sts", "O").eq("whs_type", rowLastnoType.getType().longValue())
@@ -1066,6 +1066,11 @@
}
}
}
+// else{
+// if(findLocNoAttributeVo.getOutArea() == 1){
+//
+// }
+// }
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
--
Gitblit v1.9.1