From ed62b1bb0e4bbb8b7d4b6f4d980c941cfd11233e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 17 十二月 2025 17:36:20 +0800
Subject: [PATCH] 1.商品信息增加删除权限2.并板出库不带工作明细
---
src/main/java/com/zy/common/service/CommonService.java | 143 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 115 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6711f06..93d830a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -514,37 +514,121 @@
List<LocMast> locMasts = new ArrayList<>();
List<LocMast> locMastsLow2 = new ArrayList<>();
List<LocMast> locMastsLow3 = new ArrayList<>();
- locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
- .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
- locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
- .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
- if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
- .eq("loc_sts", "O").ge("lev1",8));
- if (Cools.isEmpty(locMasts)){
- if (nearRow == 2){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
- .eq("loc_sts", "O").ge("lev1",8));
- }else if (nearRow == 3){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
- .eq("loc_sts", "O").ge("lev1",8));
- }
- }
+ LocMast locMastLow = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100101"));
+ LocMast locMastMid = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100108"));
+ LocMast locMastHigh = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100111"));
+ LocMast locMastHighest = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", "0100113"));
+ if (locMastService.checkEmptyCount(locMastLow)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",1));
}else {
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
- .eq("loc_sts", "O"));
- if (Cools.isEmpty(locMasts)){
- if (nearRow == 2){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
- .eq("loc_sts", "O"));
- }else if (nearRow == 3){
- locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
- .eq("loc_sts", "O"));
+ if (locMastService.checkEmptyCount(locMastMid)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",2));
+ }else {
+ if (locMastService.checkEmptyCount(locMastHigh)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",5));
+ }else {
+ if (locMastService.checkEmptyCount(locMastHighest)){
+ locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",6));
+ }else {
+ throw new CoolException("鏃犵┖搴撲綅鍙敤");
+ }
}
}
}
+
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",locTypeDto.getLocType1()));
+// if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// //浣庡簱浣嶈揪鍒伴檺鍒跺�� 鎵句腑搴撲綅鐨勭┖搴撲綅
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",2));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",2));
+// if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",2));
+// }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// //浣庡簱浣� 涓簱浣嶈揪鍒伴檺鍒跺�� 鎵鹃珮搴撲綅鐨勭┖搴撲綅
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",5));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",5));
+// if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",5));
+// }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// // 浣庝腑楂樺簱浣嶈揪鍒伴檺鍒跺�� 鎵捐秴楂樺簱浣嶇殑绌哄簱浣�
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",2).eq("loc_sts","O").eq("loc_type1",6));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1",3).eq("loc_sts","O").eq("loc_type1",6));
+// if (locMastsLow2.size() > 5 && locMastsLow3.size() > 5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("loc_type1",6));
+// }else if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// throw new CoolException("鏃犵┖搴撲綅鍙敤");
+// }
+// }
+// }
+// }else {
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O").eq("loc_type1",1));
+// if (Cools.isEmpty(locMasts)){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O").eq("loc_type1",1));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O").eq("loc_type1",1));
+//
+// }
+// }
+// }
+
+
+
+
+
+
+
+
+// locMastsLow2 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 2)
+// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+// locMastsLow3 = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", 3)
+// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
+// if (locMastsLow2.size() <= 5 && locMastsLow3.size() <= 5){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O").ge("lev1",8));
+// if (Cools.isEmpty(locMasts)){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O").ge("lev1",8));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O").ge("lev1",8));
+//
+// }
+// }
+// }else {
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
+// .eq("loc_sts", "O"));
+// if (Cools.isEmpty(locMasts)){
+// if (nearRow == 2){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
+// .eq("loc_sts", "O"));
+// }else if (nearRow == 3){
+// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
+// .eq("loc_sts", "O"));
+//
+// }
+// }
+// }
+
+
+
+
+
+
+
+
+
+
+
+
+
// locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
// .eq("loc_sts", "O").eq("loc_type1",locTypeDto.getLocType1()));
// if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){
@@ -557,9 +641,9 @@
//
// }
// }
- if (locMasts.size() <= 5){
- throw new CoolException("鏃犵┖搴撲綅鍙敤");
- }
+// if (locMasts.size() <= 5){
+// throw new CoolException("鏃犵┖搴撲綅鍙敤");
+// }
List<LocMast> locMastList = new ArrayList<>();
locMasts.sort(new Comparator<LocMast>() {
@Override
@@ -580,6 +664,9 @@
// if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
// continue;
// }
+ if (Utils.isDeepLoc(slaveProperties,locMast1.getLocNo())){
+ continue;
+ }
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc));
if (Cools.isEmpty(locMast2)){
--
Gitblit v1.9.1