From 7444c4c07c82c1ae7816b4d3ee68b8d0eba7f4a0 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期六, 13 四月 2024 12:39:06 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index ae8a351..8a506d7 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -179,6 +179,11 @@
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"));
+ if (locMasts.size()<=10){
+ times++;
+ continue;
+ }
break;
} else {
times++;
@@ -214,6 +219,11 @@
String shallowLoc = Utils.getDeepLoc(slaveProperties,locMast1.getLocNo());
LocMast locMast2 = locMastService.selectById(shallowLoc);
if (!Cools.isEmpty(locMast2) && locMast2.getLocSts().equals("F")){
+ if (sourceStaNo<200){
+ if (locMast2.getCrnNo()==1 || locMast2.getCrnNo()==6){
+ continue;
+ }
+ }
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", locMast2.getLocNo()));
if (!Cools.isEmpty(locDetl) && matnr.equals(locDetl.getMatnr())) {
locMast = locMast1;
@@ -231,6 +241,11 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (sourceStaNo<200){
+ if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
+ continue;
+ }
+ }
if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
@@ -270,6 +285,11 @@
// 妫�娴嬬洰鏍囧簱浣嶆槸鍚︿负绌哄簱浣�
LocMast shallowLoc = locMastService.selectById(shallowLocNo);
if (shallowLoc != null && shallowLoc.getLocSts().equals("O")) {
+ if (sourceStaNo<200){
+ if (shallowLoc.getCrnNo()==1 || shallowLoc.getCrnNo()==6){
+ continue;
+ }
+ }
if (VersionUtils.locMoveCheckLocTypeComplete(shallowLoc, locTypeDto)) {
if (basCrnpService.checkSiteError(shallowLoc.getCrnNo(), true)) {
locMast = shallowLoc;
@@ -297,17 +317,18 @@
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")) {
// 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);
}
@@ -316,9 +337,9 @@
// 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));
for (LocMast locMast1 : locMasts) {
- if (VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
+ if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
continue;
}
String shallowLoc = Utils.getDeepLoc(slaveProperties, locMast1.getLocNo());
--
Gitblit v1.9.1