From 0031e41fb8dd0367c9d6237deda6ca7091523f68 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期日, 30 三月 2025 09:08:01 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/utils/Utils.java | 10 +++++++--- src/main/java/com/zy/common/service/CommonService.java | 11 +++-------- src/main/resources/application.yml | 6 +++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java index dd84c73..f4306d5 100644 --- a/src/main/java/com/zy/asrs/utils/Utils.java +++ b/src/main/java/com/zy/asrs/utils/Utils.java @@ -165,10 +165,10 @@ int row = getRow(shallowLoc); int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount()); int targetRow; - if (remainder == 2) { - targetRow = row - 1; - } else if (remainder == 3) { + if (remainder == 0 ) { targetRow = row + 1; + } else if (remainder == 3) { + targetRow = row - 1; } else { throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖"); } @@ -355,6 +355,10 @@ } } } + + //鍫嗗灈鏈哄簱浣嶄粠14鎺掑紑濮� + necessaryParameters[1] = necessaryParameters[1]+13; //curRow 鏈�娣卞簱浣嶆帓 + necessaryParameters[3] = necessaryParameters[3]+13; //nearRow 鏈�娴呭簱浣嶆帓 return necessaryParameters; } diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java index 75f735c..c848525 100644 --- a/src/main/java/com/zy/common/service/CommonService.java +++ b/src/main/java/com/zy/common/service/CommonService.java @@ -362,7 +362,7 @@ } // 鏇存柊搴撲綅鎺掑彿 if (Cools.isEmpty(locMast)){ - rowLastno.setCurrentRow(curRow); + rowLastno.setCurrentRow((curRow-13)); rowLastnoService.updateById(rowLastno); } } @@ -372,17 +372,12 @@ // 1.鎸夎鍒欐煡鎵惧簱浣� if (Cools.isEmpty(locMast) && crnNo != 0) { List<LocMast> locMasts = null; - if (Utils.isNorth(sourceStaNo)){ - locMasts = locMastService.selectList(new EntityWrapper<LocMast>() - .eq("row1", nearRow) - .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) - .orderBy("lev1",true).orderBy("bay1",false)); - }else { + locMasts = locMastService.selectList(new EntityWrapper<LocMast>() .eq("row1", nearRow) .eq("loc_sts", "O").eq("whs_type",rowLastnoType.getType().longValue()) .orderBy("lev1",true).orderBy("bay1",true)); - } + for (LocMast locMast1 : locMasts) { if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ed42bb7..1a5ea58 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -50,13 +50,13 @@ # 鍙屾繁 doubleDeep: true # 鍙屾繁搴撲綅鎺掑彿 - doubleLocs: 1,4,5,8 + doubleLocs: 14,17 # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁� groupCount: 4 # 宸︽繁搴撲綅鎺掑彿 - doubleLocsLeft: 1,5,9,13 + doubleLocsLeft: 14 # 鍙虫繁搴撲綅鎺掑彿 - doubleLocsRight: 4,8,12,16 + doubleLocsRight: 17 # wms鍙傛暟閰嶇疆 wms-parameter: # 鑷姩琛ョ┖鏉垮姛鑳藉紑鍏� -- Gitblit v1.9.1