From 4a655363927ba4c189b34072cffd3351eadf00fb Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期六, 17 八月 2024 08:33:01 +0800
Subject: [PATCH] 将错误单据跳过
---
src/main/java/com/zy/common/service/CommonService.java | 205 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 160 insertions(+), 45 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 5b69e5b..eb95817 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
@@ -19,6 +20,10 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -50,7 +55,6 @@
/**
* 鐢熸垚宸ヤ綔鍙�
- *
* @param wrkMk
* @return workNo(宸ヤ綔鍙�)
*/
@@ -63,17 +67,17 @@
int workNo = wrkLastno.getWrkNo();
int sNo = wrkLastno.getSNo();
int eNo = wrkLastno.getENo();
- workNo = workNo >= eNo ? sNo : workNo + 1;
+ workNo = workNo>=eNo ? sNo : workNo+1;
while (true) {
WrkMast wrkMast = wrkMastService.selectById(workNo);
if (null != wrkMast) {
- workNo = workNo >= eNo ? sNo : workNo + 1;
+ workNo = workNo>=eNo ? sNo : workNo+1;
} else {
break;
}
}
// 淇敼搴忓彿璁板綍
- if (workNo > 0) {
+ if (workNo > 0){
wrkLastno.setWrkNo(workNo);
wrkLastnoService.updateById(wrkLastno);
}
@@ -81,11 +85,27 @@
if (workNo == 0) {
throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
} else {
- if (wrkMastService.selectById(workNo) != null) {
+ if (wrkMastService.selectById(workNo)!=null) {
throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
}
}
return workNo;
+ }
+
+ //鎷嗙洏鏈哄绌烘澘鎵爜锛岄┍鍔ㄦ墭鐩樺悜鐮佸灈浣嶏紝涓嶅叆搴�
+ @Transactional
+ public StartupDto getScanBarcodeEmptyBoard(){
+ StartupDto startupDto = new StartupDto();
+ Integer staNo = 0;
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 216))<2){
+ staNo=216;
+ }
+ if (wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 201).eq("staNo", 220))<2){
+ staNo=220;
+ }
+
+ startupDto.setStaNo(staNo);
+ return startupDto;
}
/**
@@ -98,7 +118,22 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
+ whsType = Utils.GetWhsType(sourceStaNo);
+ return getLocNoRun(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
+ }
+
+ /**
+ * 妫�绱㈠簱浣嶅彿
+ *
+ * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
+ * @param staDescId 璺緞ID
+ * @param sourceStaNo 婧愮珯
+ * @param matnr 鐗╂枡鍙烽泦鍚�
+ * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
+ */
+ @Transactional
+ public StartupDto getLocNoRun(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
@@ -128,14 +163,29 @@
// ===============>>>> 寮�濮嬫墽琛�
curRow = rowLastno.getCurrentRow();
+ if (!Cools.isEmpty(moveCrnNo) && moveCrnNo!=0){
+ crnNumber = moveCrnNo;
+ if (times==0){
+ curRow = moveCrnNo*4-1;
+ }else {
+ curRow = moveCrnNo*4-2;
+ }
+ }
+
//姝ょ▼搴忕敤浜庝紭鍖栧爢鍨涙満寮傚父鏃剁殑杩愯鏃堕棿
- for (int i = times; i < crnNumber; i++) {
+ for (int i = times; i < crnNumber*2; i++) {
int[] locNecessaryParameters = Utils.LocNecessaryParameters(whsType, curRow, crnNumber);
curRow = locNecessaryParameters[1];
crnNo = locNecessaryParameters[2];
if (basCrnpService.checkSiteError(crnNo, true)) {
rowCount = locNecessaryParameters[0];
nearRow = locNecessaryParameters[3];
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ int crnCountO = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("crn_no", crnNo).le("io_type",100));
+ if (locMasts.size()-crnCountO<=2){
+ times++;
+ continue;
+ }
break;
} else {
times++;
@@ -145,29 +195,45 @@
throw new CoolException("鏃犲彲鐢ㄥ爢鍨涙満");
}
+ boolean signRule1 = false;
+ boolean signRule2 = false;
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
-// if (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
-// 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.selectOne(new EntityWrapper<LocMast>().eq("loc_no",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 (!Cools.isEmpty(matnr) && (staDescId == 1 || staDescId == 11 || staDescId == 111)) {
- List<String> locNos = locDetlService.getSameDetlToday(matnr,batch, sRow, eRow);
+ if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //鍒嗙鐗�
+ if (!Cools.isEmpty(matnr) && staDescId == 1){
+ signRule1 = true;
+ }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鍚屽ぉ鍚岃鏍肩墿鏂� //浜掗�氱増
+ if (!Cools.isEmpty(matnr) && staDescId == 1) {
+ signRule2 = true;
+ }
+
+ if (!Cools.isEmpty(matnr) && (staDescId == 11 || staDescId == 111)) {
+ signRule1 = true;
+ }
+ }
+
+ if (signRule1){
+ 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;
+ }
+ }
+ }
+ }
+ }else if (signRule2){
+ List<String> locNos = locDetlService.getSameDetlToday(matnr, sRow, eRow);
for (String locNo : locNos) {
if (Utils.isShallowLoc(slaveProperties, locNo)) {
continue;
@@ -188,7 +254,7 @@
}
// // 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //鍒嗙鐗�
-// if (staDescId == 10) {
+// if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
// List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
// for (LocMast locMast1:locMasts){
// if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
@@ -204,7 +270,7 @@
// }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭 //浜掗�氱増
- if (staDescId == 10) {
+ if (staDescId == 10 && Utils.BooleanWhsTypeStaIoType(whsType)) {
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "D").ge("row1", sRow).le("row1", eRow));
if (locMasts.size() > 0) {
for (LocMast loc : locMasts) {
@@ -242,17 +308,19 @@
log.error("type_no={},stn_no={},crn_no={}", staDescId, sourceStaNo, crnNo);
// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
crnNo = 0;
- }
- staNo = basDevpService.selectById(staDesc.getCrnStn());
- if (!staNo.getAutoing().equals("Y")) {
+ }else {
+ staNo = basDevpService.selectById(staDesc.getCrnStn());
+ if (!staNo.getAutoing().equals("Y")) {
+ log.error("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
// throw new CoolException("鐩爣绔�"+staDesc.getCrnStn()+"涓嶅彲鐢�");
- crnNo = 0;
+ crnNo = 0;
+ }
+ startupDto.setStaNo(staNo.getDevNo());
}
- startupDto.setStaNo(staNo.getDevNo());
}
// 鏇存柊搴撲綅鎺掑彿
- if (Utils.BooleanWhsTypeSta(whsType, staDescId)) {
+ if (Utils.BooleanWhsTypeSta(whsType, staDescId) && Cools.isEmpty(locMast)) {
rowLastno.setCurrentRow(curRow);
rowLastnoService.updateById(rowLastno);
}
@@ -261,16 +329,63 @@
// 1.鎸夎鍒欐煡鎵惧簱浣�
if (Cools.isEmpty(locMast) && crnNo != 0) {
- List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
+ List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
+ .eq("row1", nearRow)
+ .eq("loc_sts", "O")
+ .orderBy("lev1",true).orderBy("bay1",true));
for (LocMast locMast1 : locMasts) {
- if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
- String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
- LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", shallowLoc).eq("loc_sts", "O"));
- if (!Cools.isEmpty(locMast2)) {
- locMast = locMast2;
- break;
+ if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ } else {
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ break;
+ }
+ }
+ }
+
+ if (Cools.isEmpty(locMast) && Utils.BooleanWhsTypeStaIoType(whsType)){
+ for (LocMast locMast1 : locMasts) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ continue;
+ }
+ if (Utils.BooleanWhsTypeStaIoType(whsType)){
+ String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
+ LocMast locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "O"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ } else {
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "F"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ } else {
+ locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", shallowLoc).eq("loc_sts", "D"));
+ if (!Cools.isEmpty(locMast2)) {
+ locMast = locMast2;
+ break;
+ }
+ }
+ }
+ } else {
+ if (!Cools.isEmpty(locMast1)) {
+ locMast = locMast1;
+ break;
+ }
+ }
}
}
}
@@ -282,9 +397,9 @@
// 閫掑綊鏌ヨ
if (Cools.isEmpty(locMast) || !locMast.getLocSts().equals("O")) {
// 褰撳墠宸烽亾鏃犵┖搴撲綅鏃讹紝閫掑綊璋冩暣鑷充笅涓�宸烽亾锛屾绱㈠叏閮ㄥ贩閬撴棤鏋滃悗锛岃烦鍑洪�掑綊
- if (times < rowCount) {
+ if (times < rowCount*2) {
times = times + 1;
- return getLocNo(1, staDescId, sourceStaNo, matnr, batch, grade, locTypeDto, times);
+ return getLocNoRun(whsType, staDescId, sourceStaNo, matnr, batch, grade,moveCrnNo, locTypeDto, times);
}
// // 2.搴撲綅褰撳墠鎵�灞炲昂瀵告棤绌哄簱浣嶆椂锛岃皟鏁村昂瀵稿弬鏁帮紝鍚戜笂鍏煎妫�绱㈠簱浣�
// if (locTypeDto.getLocType1() < 2) {
--
Gitblit v1.9.1