From d372d7d03bd553d369e0fcb0fb9c20f1e4155f8a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 29 二月 2024 17:23:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 23 +++++
src/main/java/com/zy/asrs/utils/Utils.java | 92 ++++++++++++++--------
src/main/resources/mapper/LocMastMapper.xml | 33 ++++++++
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 21 +++++
src/main/java/com/zy/asrs/service/LocMastService.java | 11 ++
src/main/java/com/zy/common/service/CommonService.java | 28 +++---
6 files changed, 162 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index 208fff4..d348646 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -22,4 +22,25 @@
Integer selectEmptyLocCount(@Param("locType1") Short locType1, @Param("crnNo") Integer crnNo);
List<LocMast> queryShallowLocFMast(@Param("crnNo") Integer crnNo);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�>娴�
+ * */
+ LocMast selectLocByLocStsPakInF1(@Param("locNos") List<String> locNos);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣� 娣�<娴�
+ * */
+ LocMast selectLocByLocStsPakInF2(@Param("locNos") List<String> locNos);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�>娴�
+ * */
+ LocMast selectLocByLocStsPakInO1(@Param("locNos") List<String> locNos);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅 娣�<娴�
+ * */
+ LocMast selectLocByLocStsPakInO2(@Param("locNos") List<String> locNos);
+
}
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index 00b330b..b8d24c5 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -37,4 +37,15 @@
* @return
*/
List<LocMast> queryShallowLocFMast(Integer crnNo);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+ LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos);
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+ LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index e6ce450..11c5c07 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -7,6 +7,7 @@
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.RowLastnoService;
+import com.zy.asrs.utils.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,6 +44,28 @@
return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo()) > 1;
}
+ /*
+ *鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ * */
+ @Override
+ public LocMast selectLocByLocStsPakInF(Integer curRow,Integer nearRow,List<String> locNos) {
+ if (curRow<nearRow){
+ return this.baseMapper.selectLocByLocStsPakInF1(locNos);
+ }
+ return this.baseMapper.selectLocByLocStsPakInF2(locNos);
+ }
+
+ /*
+ * 鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娣辩┖搴撲綅
+ * */
+ @Override
+ public LocMast selectLocByLocStsPakInO(Integer curRow,Integer nearRow,List<String> locNos) {
+ if (curRow<nearRow){
+ return this.baseMapper.selectLocByLocStsPakInO1(locNos);
+ }
+ return this.baseMapper.selectLocByLocStsPakInO2(locNos);
+ }
+
@Override
public Boolean checkWhole(List<LocDetl> locDetls) {
return null;
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index d06f20b..a45713b 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -9,10 +9,13 @@
import com.zy.asrs.service.RowLastnoService;
import com.zy.common.model.LocDetlDto;
import com.zy.common.properties.SlaveProperties;
+import com.zy.common.service.CommonService;
import com.zy.system.service.UserService;
import java.text.DecimalFormat;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
/**
@@ -244,21 +247,21 @@
}
public static boolean BooleanWhsTypeStaIoType(Integer whsType) { //鏌ヨ鐩镐技鐗╂枡寮�鍏�
- if (whsType == 1) {
+ if (whsType == 1 || whsType==3 || whsType==4) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType) {
- if (whsType == 1 || whsType == 2 || whsType == 5) {
+ if (whsType == 1 || whsType == 2 || whsType == 5 || whsType==3 || whsType==4) {
return true;
}
return false;
}
public static boolean BooleanWhsTypeSta(Integer whsType, Integer staDescId) {
- if ((whsType == 1 || whsType == 5 || whsType == 2) && staDescId != 11 && staDescId != 111) {
+ if ((whsType == 1 || whsType == 5 || whsType == 2 || whsType==3 || whsType==4) && staDescId != 11 && staDescId != 111) {
return true;
}
return false;
@@ -285,14 +288,14 @@
switch (whsType){
case 1://缁忓吀鍙屼几搴撲綅
return LocNecessaryParametersDoubleExtension(whsType, curRow, crnNumber); //宸插畬鍠�
- case 2://缁忓吀鍗曚几搴撲綅
+ case 2://缁忓吀鍗曚几搴撲綅锛�2鎺掕揣鏋讹級
return LocNecessaryParametersDoubleExtension2(whsType, curRow, crnNumber); //宸插畬鍠�
case 3://缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
return LocNecessaryParametersDoubleExtension3(whsType, curRow, crnNumber); //鏈畬鍠�
case 4://缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
return LocNecessaryParametersDoubleExtension4(whsType, curRow, crnNumber); //鏈畬鍠�
- case 5://鍙屽伐浣嶅崟浼稿簱浣�
- return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //鏈畬鍠�
+ case 5://鍙屽伐浣嶅崟浼稿簱浣�(4鎺掕揣鏋�)
+ return LocNecessaryParametersDoubleExtension5(whsType, curRow, crnNumber); //宸插畬鍠�
default:
return LocNecessaryParametersMove(whsType, curRow, crnNumber);//moveCrnNo
}
@@ -312,7 +315,7 @@
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) {
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
@@ -367,7 +370,7 @@
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
+ } else if (curRow.equals((crnNumber - 1) * 2 + sRow)) {
necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
@@ -392,7 +395,7 @@
return necessaryParameters;
}
- //缁忓吀鍗曚几搴撲綅
+ //缁忓吀鍗曞弻浼稿簱浣� 宸﹀崟鍙冲弻(灏忓崟澶у弻)
public static int[] LocNecessaryParametersDoubleExtension3(Integer whsType, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
@@ -402,27 +405,27 @@
if (BooleanWhsTypeSta(whsType)) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 2 + sRow - 1)) {
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
- necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 2;
- if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - sRow) % 2 == 0) {
+ if ((curRow - sRow) % 3 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 2 == 0) {
+ } else if ((curRow - sRow + 1) % 3 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow-1 ; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
@@ -431,7 +434,7 @@
return necessaryParameters;
}
- //缁忓吀鍗曚几搴撲綅
+ //缁忓吀鍗曞弻浼稿簱浣� 宸﹀弻鍙冲崟(灏忓弻澶у崟)
public static int[] LocNecessaryParametersDoubleExtension4(Integer whsType, Integer curRow, Integer crnNumber) {
int[] necessaryParameters = new int[]{0, 0, 0, 0};
RowLastnoService rowLastnoService = SpringUtils.getBean(RowLastnoService.class);
@@ -441,26 +444,26 @@
if (BooleanWhsTypeSta(whsType)) {
necessaryParameters[0] = crnNumber; // 杞娆℃暟
//婊℃澘姝ｅ父鍏ュ簱
- if (curRow.equals(crnNumber * 2 + sRow - 1)) {
+ if (curRow.equals(crnNumber * 3 + sRow - 1)) {
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = sRow; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 2 - 1 + sRow - 1)) {
- necessaryParameters[1] = sRow+1; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if (curRow.equals((crnNumber - 1) * 3 + sRow)) {
+ necessaryParameters[1] = sRow+2; //curRow 鏈�娣卞簱浣嶆帓
+ necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
} else {
- curRow = curRow + 2;
- if (curRow < sRow || curRow > (crnNumber * 2 + sRow - 1)) {
+ curRow = curRow + 3;
+ if (curRow < sRow || curRow > (crnNumber * 3 + sRow - 1)) {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
}
- if ((curRow - sRow) % 2 == 0) {
+ if ((curRow - sRow) % 3 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow) / 2 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
- necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
- } else if ((curRow - sRow + 1) % 2 == 0) {
+ necessaryParameters[2] = (curRow - sRow) / 3 + sCrnNo ; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[3] = curRow + 1 ; //nearRow 鏈�娴呭簱浣嶆帓
+ } else if ((curRow - sRow + 1) % 3 == 0) {
necessaryParameters[1] = curRow; //curRow 鏈�娣卞簱浣嶆帓
- necessaryParameters[2] = (curRow - sRow - 1) / 2 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
+ necessaryParameters[2] = (curRow - sRow - 2) / 3 + sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = curRow ; //nearRow 鏈�娴呭簱浣嶆帓
} else {
throw new CoolException("搴撲綅鎺掑彿寮傚父锛氭帓鍙凤細" + curRow);
@@ -484,7 +487,7 @@
necessaryParameters[1] = sRow; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+1; //nearRow 鏈�娴呭簱浣嶆帓
- } else if (curRow.equals(crnNumber * 4 - 3 + sRow - 1)) {
+ } else if (curRow.equals((crnNumber - 1) * 4 + sRow)) {
necessaryParameters[1] = sRow+3; //curRow 鏈�娣卞簱浣嶆帓
necessaryParameters[2] = sCrnNo; //crnNo 鍫嗗灈鏈哄彿
necessaryParameters[3] = sRow+2; //nearRow 鏈�娴呭簱浣嶆帓
@@ -560,4 +563,27 @@
return null;
}
+
+ /*
+ * 鏈�娣卞簱浣嶆帓鍙� 锛� curRow
+ * 鏈�娴呭簱浣嶆帓鍙� 锛� nearRow
+ * 鏈�娴呭簱浣嶅彿锛岀敤浜庨攣瀹氬垪銆佸眰 锛� nearRow
+ * 鍏ュ簱 true:pakin
+ * 鍑哄簱 false:pakin
+ * */
+ // 澶栦晶鏂瑰悜鐨勮揣浣� 浼樺厛鍏ュ簱鏂瑰悜 ===>> 鍙嶄箣
+ public static List<String> getGroupOutLocCrn(Integer curRow,Integer nearRow,String locNo,boolean pakin){
+ List<String> result = new ArrayList<>();
+ if (pakin){
+ for (int row = curRow;row<=nearRow;row++){
+ result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
+ }
+ }else {
+ for (int row = curRow;row>=curRow;row--){
+ result.add(zerofill(String.valueOf(row), 2) + locNo.substring(2));
+ }
+ }
+ return result;
+ }
+
}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 88304d1..090f438 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -201,7 +201,7 @@
if (Utils.BooleanWhsTypeStaIoType(whsType)){
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
- if (!Cools.isEmpty(matnr) && (staDescId == 1)){
+ if (!Cools.isEmpty(matnr) && staDescId == 1){
signRule1 = true;
}
// 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
@@ -215,18 +215,20 @@
}
if (signRule1){
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
- for (LocMast locMast1:locMasts){
- if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
- continue;
- }
- String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectById(shallowLoc);
- if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
- if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
- locMast = locMast1;
- break;
+ if (nearRow!=curRow){
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ for (LocMast locMast1:locMasts){
+ //鑾峰彇宸烽亾
+ List<String> groupOutsideLocCrn = Utils.getGroupOutLocCrn(curRow,nearRow,locMast1.getLocNo(), curRow>nearRow);
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ LocMast locMastF = locMastService.selectLocByLocStsPakInF(curRow,nearRow,groupOutsideLocCrn);
+ if (!Cools.isEmpty(locMastF) && locMastF.getLocSts().equals("F")){
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMastF.getLocNo()));
+ if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr()) && batch.equals(Cools.isEmpty(locDetl.getBatch()) ? "" : locDetl.getBatch()) && grade.equals(Cools.isEmpty(locDetl.getBrand()) ? "" : locDetl.getBrand())) {
+ //鑾峰彇鐩爣搴撲綅鎵�鍦ㄥ贩閬撴渶娴呴潪绌哄簱浣�
+ locMast = locMastService.selectLocByLocStsPakInO(curRow,nearRow,groupOutsideLocCrn);
+ break;
+ }
}
}
}
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 2244412..82aa34b 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -75,4 +75,37 @@
)
and (loc_sts = 'F' or loc_sts = 'D') and crn_no = #{crnNo}
</select>
+
+ <select id="selectLocByLocStsPakInF1" resultMap="BaseResultMap">
+ SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+ <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+ #{locNo}
+ </foreach>
+ AND loc_sts not in ('O') order by row1
+ </select>
+
+ <select id="selectLocByLocStsPakInF2" resultMap="BaseResultMap">
+ SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+ <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+ #{locNo}
+ </foreach>
+ AND loc_sts not in ('O') order by row1 desc
+ </select>
+
+ <select id="selectLocByLocStsPakInO1" resultMap="BaseResultMap">
+ SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+ <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+ #{locNo}
+ </foreach>
+ AND loc_sts in ('O') order by row1 desc
+ </select>
+
+ <select id="selectLocByLocStsPakInO2" resultMap="BaseResultMap">
+ SELECT top 1 * FROM [dbo].[asr_loc_mast] WHERE loc_no in
+ <foreach collection="locNos" item="locNo" index="index" open="(" close=")" separator=",">
+ #{locNo}
+ </foreach>
+ AND loc_sts in ('O') order by row1
+ </select>
+
</mapper>
--
Gitblit v1.9.1