From 6f12cafdd1e9ced5ef41f7adb0660618be1b54df Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 10 九月 2025 20:37:46 +0800
Subject: [PATCH] 1.新增入库站绑定 2.调agv入库前先自动绑定该站点
---
src/main/java/com/zy/common/service/CommonService.java | 126 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 46 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 854ca6f..0cc3e29 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -109,14 +109,20 @@
// } else if (sourceStaNo > 399){
// whsType = 4;
// }
-
- if (sourceStaNo ==101||sourceStaNo==103){
- whsType = 1;
- } else if (sourceStaNo ==105||sourceStaNo==107){
+ // 鐩爣鍫嗗灈鏈哄彿
+ int crnNo = 0;
+ if (sourceStaNo ==102) {
+ whsType = 3;
+ crnNo = 3;
+ }else if (sourceStaNo ==104) {
whsType = 2;
- } else{
+ crnNo = 2;
+ }else if(sourceStaNo ==106) {
+ whsType = 1;
+ crnNo = 1;
+ }else
throw new CoolException("绔欑偣鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
+
RowLastno rowLastno = rowLastnoService.selectById(whsType);
if (Cools.isEmpty(rowLastno)) {
@@ -129,8 +135,7 @@
int eRow = rowLastno.geteRow();
int crn_qty = rowLastno.getCrnQty();
int rowCount = eRow - sRow + 1;
- // 鐩爣鍫嗗灈鏈哄彿
- int crnNo = 0;
+
// 鐩爣搴撲綅
LocMast locMast = null;
@@ -181,32 +186,35 @@
}
}
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
- if (null == locMast) {
- Shelves shelves = new Shelves(rowCount, crn_qty);
- int divides = (int) Arith.divides(1, curRow - 1, 4);
- curRow = (int) Arith.remainder(curRow, 4);
- if (curRow == 0) {
- curRow = 4;
- }
- for (int i = 0; i < shelves.group; i ++) {
- curRow = shelves.start(curRow);
- if (curRow < 0) {
- throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
- }
- Integer crnNo1 = shelves.get(curRow);
- crnNo1 = crnNo1 + divides*1;
- if (basCrnpService.checkSiteError(crnNo1, true)) {
- crnNo = crnNo1;
- curRow = curRow + divides*4;
- break;
- }
- }
- }
-
- if (crnNo == 0) {
- throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
- }
+// // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+// if (null == locMast) {
+// if(crnNo>1) {
+// curRow = curRow -2;
+// }
+// Shelves shelves = new Shelves(rowCount, crn_qty);
+// int divides = (int) Arith.divides(1, curRow - 1, 4);
+// curRow = (int) Arith.remainder(curRow, 4);
+// if (curRow == 0) {
+// curRow = 4;
+// }
+// for (int i = 0; i < shelves.group; i ++) {
+// curRow = shelves.start(curRow);
+// if (curRow < 0) {
+// throw new CoolException("妫�绱㈠簱浣嶅け璐ワ紝璇疯仈绯荤鐞嗗憳");
+// }
+// if (basCrnpService.checkSiteError(crnNo, true)) {
+// curRow = curRow + divides*4;
+// break;
+// }
+// }
+// if(crnNo>1) {
+// curRow = curRow +2;
+// }
+// }
+//
+// if (crnNo == 0) {
+// throw new CoolException("娌℃湁鍙敤鐨勫爢鍨涙満");
+// }
// 鑾峰彇鐩爣绔�
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", staDescId)
@@ -221,7 +229,19 @@
if (!staNo.getAutoing().equals("Y")) {
throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
}
-
+ if(curRow==1){
+ curRow=2;
+ }else if(curRow==2){
+ curRow=1;
+ }else if(curRow==3){
+ curRow=6;
+ }else if(curRow==6){
+ curRow=3;
+ }else if(curRow==7){
+ curRow=10;
+ }else if(curRow==10){
+ curRow=7;
+ }
// 鏇存柊搴撲綅鎺掑彿
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
@@ -245,18 +265,20 @@
if (!locMastService.checkEmptyCount(locMast)) {
locMast = null;
}
- // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
- if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
- LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
- if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
- locMast = null;
+ if(curRow >2){
+ // 鐩爣搴撲綅 ===>> 娴呭簱浣嶏紝 鍒欐牎楠屽叾娣卞簱浣嶆槸鍚︿负 F D X
+ if (null != locMast && Utils.isShallowLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast deepLoc = locMastService.selectById(Utils.getDeepLoc(slaveProperties, locMast.getLocNo()));
+ if (!deepLoc.getLocSts().equals("F") && !deepLoc.getLocSts().equals("D") && !deepLoc.getLocSts().equals("X")) {
+ locMast = null;
+ }
}
- }
- // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
- if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
- LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
- if (!shallowLoc.getLocSts().equals("O")) {
- locMast = null;
+ // 鐩爣搴撲綅 ===>> 娣卞簱浣嶏紝 鍒欐牎楠屽叾娴呭簱浣嶆槸鍚︿负 O
+ if (null != locMast && Utils.isDeepLoc(slaveProperties, locMast.getLocNo())) {
+ LocMast shallowLoc = locMastService.selectById(Utils.getShallowLoc(slaveProperties, locMast.getLocNo()));
+ if (!shallowLoc.getLocSts().equals("O")) {
+ locMast = null;
+ }
}
}
}
@@ -268,6 +290,18 @@
if (times < rowCount) {
times = times + 1;
return getLocNo(1, staDescId, sourceStaNo, matNos, locTypeDto, times);
+ }else if (times == rowCount) {
+
+ LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("crn_no", crnNo)
+ .eq("loc_sts", "O")
+ .orderBy("lev1"));
+ if(Cools.isEmpty(locMast1)){
+ throw new CoolException("鍫嗗灈鏈�="+crnNo+"娌℃湁绌哄簱浣�");
+ }
+ if(!locMastService.checkEmptyCount(locMast1)){
+ throw new CoolException("鍫嗗灈鏈�="+crnNo+"娌℃湁绌哄簱浣�");
+ }
}
// 杞昏揣鐗╂壘杞诲簱浣嶄负绌烘椂锛屽彲浠ュ幓鎵鹃噸搴撲綅浠�
--
Gitblit v1.9.1