From 9b6a50bf1288d2f7f06a67bec0c902d1256e44fe Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 05 七月 2025 11:15:54 +0800
Subject: [PATCH] 1.订单出库改物料多的先出 2.新增订单明细打印功能
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 397 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 262 insertions(+), 135 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 0715e40..1f47c0a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -1,8 +1,13 @@
package com.zy.asrs.common.wms.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.dto.LocRangeDto;
import com.zy.asrs.common.domain.dto.LocTypeDto;
import com.zy.asrs.common.domain.dto.StartupDto;
+import com.zy.asrs.common.domain.entity.StaDesc;
+import com.zy.asrs.common.sys.service.StaDescService;
+import com.zy.asrs.common.utils.Utils;
+import com.zy.asrs.common.utils.VersionUtils;
import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
@@ -11,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -35,6 +41,12 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private LocRuleService locRuleService;
+ @Autowired
+ private LocDirectionService locDirectionService;
+
+ private Long WHS_TYPE = 0L;//榛樿绔嬪簱
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -43,7 +55,7 @@
* @return workNo(宸ヤ綔鍙�)
*/
public int getWorkNo(Integer wrkMk) {
- WrkLastno wrkLastno = wrkLastnoService.getById(wrkMk);
+ WrkLastno wrkLastno = wrkLastnoService.getOne(new LambdaQueryWrapper<WrkLastno>().eq(WrkLastno::getWrkMk, wrkMk));
if (Cools.isEmpty(wrkLastno)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
@@ -78,41 +90,40 @@
/**
* 妫�绱㈠簱浣嶅彿
- *
- * @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
- * @param staDescId 璺緞ID
- * @param sourceStaNo 婧愮珯
- * @param matnr 鐗╂枡鍙烽泦鍚�
- * @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, Integer moveCrnNo, LocTypeDto locTypeDto, int times) {
+ public StartupDto getLocNo(Integer staDescId, Integer sourceStaNo, List<String> matnrs, String batch, Long hostId, LocTypeDto locTypeDto, int times) {
+ if (sourceStaNo==999){//骞冲簱鍐呯疆鍒ゆ柇绔欑偣锛堜复鏃惰В鍐虫柟妗堬級
+ WHS_TYPE = 1L;//骞冲簱
+ } else {
+ WHS_TYPE = 0L;//绔嬪簱
+ }
// 鐩爣搴撲綅
LocMast locMast = null;
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- locMast = getLocNoStep4(staDescId, locTypeDto, sourceStaNo);
+ locMast = getLocNoEmptyPakIn(staDescId, locTypeDto, sourceStaNo, hostId);
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
}
-// //搴撲綅瑙勫垯
-// locMast = getLocNoStepRule(matnr, locTypeDto, staDescId, sourceStaNo);
-// if (locMast != null) {
-// //鎵惧埌搴撲綅锛岃繑鍥瀌to
-// return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
-// }
+ //搴撲綅瑙勫垯
+ locMast = getLocNoStepRule(matnrs, batch, locTypeDto, hostId);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
-// locMast = getLocNoStep3(staDescId, matnr, batch, grade, locTypeDto, sourceStaNo);
-// if (locMast != null) {
-// //鎵惧埌搴撲綅锛岃繑鍥瀌to
-// return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
-// }
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ locMast = getLocNoNearPlace(staDescId, matnrs, batch, locTypeDto, sourceStaNo, hostId);
+ if (locMast != null) {
+ //鎵惧埌搴撲綅锛岃繑鍥瀌to
+ return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
+ }
//鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo);
+ locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo, hostId);
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
@@ -122,121 +133,159 @@
throw new CoolException("娌℃湁绌哄簱浣�");
}
-// /**
-// * 搴撲綅瑙勫垯
-// */
-// private LocMast getLocNoStepRule(String matnr, LocTypeDto locTypeDto, Integer staDescId, Integer sourceStaNo) {
-// LocMast locMast = null;
-//
-// // 搴撳尯閿佸畾
-// List<LocRule> locRules = locRuleService.find(matnr);
-// if (locRules == null || locRules.isEmpty()) {
-// return null;//娌℃湁搴撲綅瑙勫垯锛岃烦鍑哄綋鍓嶄换鍔�
-// }
-//
-// // 鑾峰彇鐩爣绔�
-// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-// .eq("type_no", staDescId)
-// .eq("stn_no", sourceStaNo);
-// StaDesc staDesc = staDescService.selectOne(wrapper);
-// if (staDesc == null) {
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-// }
-//
-// for (LocRule locRule : locRules) {
-// if (locRule == null) {
-// continue;
-// }
-//
-// List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), staDesc.getCrnNo());
-// for (LocMast locMast0 : locMasts) {
-// //棰勭暀绌哄簱浣�
-// if (locMastService.checkEmptyCount(locMast0, 10)) {
-// return locMast0;
-// }
-// }
-// }
-//
-// if (locRules.get(0).getKeepGo() == 0) {
-// //鎵句笉鍒扮┖搴撲綅锛屼笖绂佹缁х画瀵绘壘鍏朵粬闈炴贩杞藉尯鍩熷簱浣�
-// //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
-// throw new CoolException("瑙勫垯鍖哄煙娌℃湁绌哄簱浣�");
-// }
-//
-// return locMast;
-// }
+ /**
+ * 搴撲綅瑙勫垯
+ */
+ private LocMast getLocNoStepRule(List<String> matnrs, String batch, LocTypeDto locTypeDto, Long hostId) {
+ if (matnrs.size() != 1) {
+ return null;
+ }
+ String matnr = matnrs.get(0);
+ LambdaQueryWrapper<LocRule> wrapper = new LambdaQueryWrapper<LocRule>()
+ .eq(LocRule::getHostId, hostId)
+ .eq(LocRule::getMatnr, matnr);
+ if (batch != null) {
+ wrapper.eq(LocRule::getBatch, batch);
+ }
+ List<LocRule> locRules = locRuleService.list(wrapper);
+ if (locRules == null || locRules.isEmpty()) {
+ return null;//娌℃湁搴撲綅瑙勫垯锛岃烦鍑哄綋鍓嶄换鍔�
+ }
-// // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
-// private LocMast getLocNoStep3(Integer staDescId, String matnr, String batch, String grade, LocTypeDto locTypeDto, Integer sourceStaNo) {
-// LocMast locMast = null;
-// if (staDescId == 1) {
-// // 鑾峰彇鐩爣绔�
-// Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
-// .eq("type_no", staDescId)
-// .eq("stn_no", sourceStaNo);
-// StaDesc staDesc = staDescService.selectOne(wrapper);
-// if (staDesc == null) {
-// throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
-// }
-//
-// //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
-// List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matnr, batch, grade, staDesc.getCrnNo());
-// for (WrkMast wrkMast : wrkMasts) {
-// LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo());
-// if (null != locMast0) {
-// // 娴呭簱浣嶇鍚堝昂瀵告娴�
-// if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
-// locMast = locMast0;
-// }
-// }
-// }
-// if (Cools.isEmpty(locMast)) {
-// //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
-// List<String> locNos = locDetlService.getSameDetl(matnr, batch, grade, staDesc.getCrnNo());
-// for (String locNo : locNos) {
-// LocMast locMast0 = locMastService.findNearloc(locNo);
-// if (null != locMast0) {
-// // 娴呭簱浣嶇鍚堝昂瀵告娴�
-// if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
-// locMast = locMast0;
-// break;
-// }
-// }
-// }
-// }
-// }
-//
-// return locMast;
-// }
+ for (LocRule locRule : locRules) {
+ if (locRule == null) {
+ continue;
+ }
+
+ List<LocMast> locMasts = locMastService.queryFreeLocMast2(locTypeDto.getLocType1(), locRule.getRowBeg(), locRule.getRowEnd(), locRule.getBayBeg(), locRule.getBayEnd(), locRule.getLevBeg(), locRule.getLevEnd(), hostId,WHS_TYPE);
+ for (LocMast locMast0 : locMasts) {
+ //棰勭暀绌哄簱浣�
+ if (locMastService.checkEmptyCount(locMast0, 5, hostId)) {
+ return locMast0;
+ }
+ }
+ }
+
+ if (locRules.get(0).getKeepGo() == 0) {
+ //鎵句笉鍒扮┖搴撲綅锛屼笖绂佹缁х画瀵绘壘鍏朵粬闈炴贩杞藉尯鍩熷簱浣�
+ //鎵句笉鍒板簱浣嶏紝鎶涘嚭寮傚父
+ throw new CoolException("瑙勫垯鍖哄煙娌℃湁绌哄簱浣�");
+ }
+
+ return null;
+ }
+
+ // 闈犺繎鎽嗘斁瑙勫垯 --- 鐩稿悓璁㈠崟鍙�, 鍚屽ぉ鍚岃鏍肩墿鏂�
+ private LocMast getLocNoNearPlace(Integer staDescId, List<String> matnrs, String batch, LocTypeDto locTypeDto, Integer sourceStaNo, Long hostId) {
+ LocMast locMast = null;
+ if (staDescId == 1) {
+ // 鑾峰彇鐩爣绔�
+ LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
+ .eq(StaDesc::getTypeNo, staDescId)
+ .eq(StaDesc::getStnNo, sourceStaNo)
+ .eq(StaDesc::getHostId, hostId);
+ StaDesc staDesc = staDescService.getOne(wrapper);
+ if (staDesc == null) {
+ throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
+ }
+
+ String matnr = matnrs.get(0);
+
+ //搴撲綅鎼滅储鑼冨洿
+ LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
+
+ //鍏堝垽鏂伐浣滄。锛屾煡鎵句富妗OType=1锛� wrkSts < 10鐨勫伐浣滄槑缁嗭紝鏂欏彿鐩稿悓鐨勬槑缁嗗簱浣�
+ List<WrkMast> wrkMasts = wrkMastService.selectSameMatnrs(matnr, batch, locTypeDto.getLocRangeDto(), hostId);
+ for (WrkMast wrkMast : wrkMasts) {
+ LocMast locMast0 = locMastService.findNearloc(wrkMast.getLocNo(), hostId, locRangeDto);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ }
+ }
+ }
+ if (Cools.isEmpty(locMast)) {
+ //鍐嶅垽鏂簱瀛樻槑缁嗘。锛屾枡鍙风浉鍚岀殑鏄庣粏搴撲綅
+ List<String> locNos = locDetlService.getSameDetl(matnr, batch, hostId);
+ for (String locNo : locNos) {
+ LocMast locMast0 = locMastService.findNearloc(locNo, hostId, locRangeDto);
+ if (null != locMast0) {
+ // 娴呭簱浣嶇鍚堝昂瀵告娴�
+ if (VersionUtils.checkLocType(locMast0, locTypeDto)) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ return locMast;
+ }
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
- private LocMast getLocNoStep4(Integer staDescId, LocTypeDto locTypeDto, Integer sourceStaNo) {
+ private LocMast getLocNoEmptyPakIn(Integer staDescId, LocTypeDto locTypeDto, Integer sourceStaNo, Long hostId) {
LocMast locMast = null;
// 闈犺繎鎽嗘斁瑙勫垯 --- 绌烘墭
if (staDescId == 10) {
// 鑾峰彇鐩爣绔�
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
.eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo);
+ .eq(StaDesc::getStnNo, sourceStaNo)
+ .eq(StaDesc::getHostId,hostId);
StaDesc staDesc = staDescService.getOne(wrapper);
if (staDesc == null) {
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
- List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>()
+ //鎵剧浉鍚岀┖鎵樼洏
+ LambdaQueryWrapper<LocMast> wrapper0 = new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocSts, "D")
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
+ .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
+ .eq(LocMast::getWhsType, WHS_TYPE)
+ .eq(LocMast::getHostId, hostId);
+
+ LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
- .eq(LocMast::getLocType1, 1)
- .eq(LocMast::getCrnNo, staDesc.getCrnNo())
- .orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1));
- if (!locMasts.isEmpty()) {
- for (LocMast loc : locMasts) {
-// LocMast locMast0 = locMastService.findNearloc(loc.getLocNo());
-// if (null != locMast0) {
-// locMast = locMast0;
-// break;
-// }
- locMast = loc;
- break;
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
+ .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
+ .eq(LocMast::getWhsType, WHS_TYPE)
+ .eq(LocMast::getHostId, hostId);
+
+ //搴撲綅鎼滅储鑼冨洿
+ LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
+ if (locRangeDto != null) {
+ wrapper1.ge(LocMast::getRow1, locRangeDto.getStartRow());
+ wrapper1.le(LocMast::getRow1, locRangeDto.getTargetRow());
+ wrapper1.ge(LocMast::getBay1, locRangeDto.getStartBay());
+ wrapper1.le(LocMast::getBay1, locRangeDto.getTargetBay());
+ wrapper1.ge(LocMast::getLev1, locRangeDto.getStartLev());
+ wrapper1.le(LocMast::getLev1, locRangeDto.getTargetLev());
+ }
+
+ List<LocMast> locMasts0 = locMastService.list(wrapper0);
+ if (!locMasts0.isEmpty()) {
+ for (LocMast loc : locMasts0) {
+ LocMast locMast0 = locMastService.findNearloc(loc.getLocNo(), hostId, locRangeDto);
+ if (null != locMast0) {
+ locMast = locMast0;
+ break;
+ }
+ }
+ }
+
+ if (locMast == null) {
+ List<LocMast> locMasts = locMastService.list(wrapper1);
+ if (!locMasts.isEmpty()) {
+ for (LocMast loc : locMasts) {
+ LocMast locMast0 = locMastService.findNearloc(loc.getLocNo(), hostId, locRangeDto);
+ if (null != locMast0) {
+ locMast = locMast0;
+ break;
+ }
+ }
}
}
@@ -248,28 +297,107 @@
}
// 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
- private LocMast getLocNoStepSingle(LocTypeDto locTypeDto, Integer staDescId, Integer sourceStaNo) {
+ private LocMast getLocNoStepSingle(LocTypeDto locTypeDto, Integer staDescId, Integer sourceStaNo, Long hostId) {
LocMast locMast = null;
// 鑾峰彇鐩爣绔�
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
.eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo);
+ .eq(StaDesc::getStnNo, sourceStaNo)
+ .eq(StaDesc::getHostId, hostId);
StaDesc staDesc = staDescService.getOne(wrapper);
if (staDesc == null) {
throw new CoolException("鍏ュ簱璺緞涓嶅瓨鍦�");
}
- List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocSts, "O"));//鎼滅储璐х墿
-
- if (locMasts == null) {
- return null;
+ RowLastno rowLastno = rowLastnoService.getOne(new LambdaQueryWrapper<RowLastno>().eq(RowLastno::getWhsType, 1).eq(RowLastno::getHostId, hostId));
+ if (Cools.isEmpty(rowLastno)) {
+ throw new CoolException("1鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛�");
}
+ int curRow = rowLastno.getCurrentRow();
+ int sRow = rowLastno.getStartRow();
+ int eRow = rowLastno.getTargetRow();
+
+ LambdaQueryWrapper<LocMast> wrapper1 = new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getLocSts, "O")
+ .eq(LocMast::getHostId, hostId)
+ .eq(LocMast::getLocType1, locTypeDto.getLocType1())
+ .le(LocMast::getRow1, eRow)
+ .ge(LocMast::getRow1, sRow)
+// .in(LocMast::getRow1, curRow)
+ .orderByAsc(LocMast::getLev1)
+ .orderByAsc(LocMast::getBay1);
+
+
+ //搴撲綅鎼滅储鑼冨洿
+ LocRangeDto locRangeDto = locTypeDto.getLocRangeDto();
+ if (locRangeDto != null) {
+ wrapper1.ge(LocMast::getRow1, locRangeDto.getStartRow());
+ wrapper1.le(LocMast::getRow1, locRangeDto.getTargetRow());
+ wrapper1.ge(LocMast::getBay1, locRangeDto.getStartBay());
+ wrapper1.le(LocMast::getBay1, locRangeDto.getTargetBay());
+ wrapper1.ge(LocMast::getLev1, locRangeDto.getStartLev());
+ wrapper1.le(LocMast::getLev1, locRangeDto.getTargetLev());
+ }
+ List<LocMast> locMasts = locMastService.list(wrapper1);//鎼滅储璐х墿
for (LocMast mast : locMasts) {
- locMast = mast;
- break;
+ LocMast innerLoc = null;
+ for (String loc : Utils.getGroupLoc(mast.getLocNo(), hostId)) {
+ //1 2
+ LocMast one = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, loc).eq(LocMast::getHostId, hostId));
+ if (!one.getLocSts().equals("O")) {
+// innerLoc = null;
+ continue;
+ }
+ if(Utils.getRow(one.getLocNo())==2){
+ LocMast locMast1=locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getRow1, 1)
+ .eq(LocMast::getBay1,one.getBay1())
+ .eq(LocMast::getLev1,one.getLev1())
+ .eq(LocMast::getHostId, hostId));
+ if(!locMast1.getLocSts().equals("F")){
+ continue;
+ }else if (locMast1.getLocSts().equals("O")){
+ one=locMast1;
+ }
+ }else if(Utils.getRow(one.getLocNo())==3){
+ LocMast locMast1=locMastService.getOne(new LambdaQueryWrapper<LocMast>()
+ .eq(LocMast::getRow1, 4)
+ .eq(LocMast::getBay1,one.getBay1())
+ .eq(LocMast::getLev1,one.getLev1())
+ .eq(LocMast::getHostId, hostId));
+ if(!locMast1.getLocSts().equals("F")){
+ continue;
+ }else if (locMast1.getLocSts().equals("O")){
+ one=locMast1;
+ }
+ }
+ innerLoc = one;
+
+// if (innerLoc == null) {
+// List<Integer> innerDeepRow = locDirectionService.getInnerDeepRow(hostId);
+//// if (innerDeepRow.contains(one.getRow1())) {
+// innerLoc = one;
+//// }
+// }
+ }
+
+ if(innerLoc == null) {
+ continue;
+ }
+
+ if (VersionUtils.checkLocType(innerLoc, locTypeDto)) {
+ locMast = innerLoc;
+ break;
+ }
}
+ curRow++;
+ if (curRow > eRow) {
+ curRow = sRow;
+ }
+ rowLastno.setCurrentRow(curRow);
+ rowLastnoService.updateById(rowLastno);
return locMast;
}
@@ -279,8 +407,7 @@
// 鑾峰彇鐩爣绔�
LambdaQueryWrapper<StaDesc> wrapper = new LambdaQueryWrapper<StaDesc>()
.eq(StaDesc::getTypeNo, staDescId)
- .eq(StaDesc::getStnNo, sourceStaNo)
- .eq(StaDesc::getCrnNo,locMast.getCrnNo());
+ .eq(StaDesc::getStnNo, sourceStaNo);
StaDesc staDesc = staDescService.getOne(wrapper);
if (Cools.isEmpty(staDesc)) {
log.error("鍏ュ簱璺緞涓嶅瓨鍦�, staDescId={}, sourceStaNo={}", staDescId, sourceStaNo);
@@ -288,9 +415,9 @@
}
// 妫�娴嬬洰鏍囩珯
- BasDevp staNo = basDevpService.getById(staDesc.getCrnStn());
+ BasDevp staNo = basDevpService.getById(staDesc.getDeviceStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getCrnStn() + "涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getDeviceStn() + "涓嶅彲鐢�");
}
// 鐢熸垚宸ヤ綔鍙�
@@ -300,7 +427,7 @@
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locMast.getLocNo());
- startupDto.setCrnNo(staDesc.getCrnNo());
+ startupDto.setCrnNo(locMast.getCrnNo());
return startupDto;
}
}
--
Gitblit v1.9.1