From ef117b5e4dfb7a42b62a8df9fc8e4e2ac8e30118 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 一月 2024 13:35:40 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 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..559e5b9 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
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.wms.entity.*;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.exception.CoolException;
@@ -43,7 +45,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,15 +80,9 @@
/**
* 妫�绱㈠簱浣嶅彿
- *
- * @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, Long hostId, LocTypeDto locTypeDto, int times) {
// 鐩爣搴撲綅
LocMast locMast = null;
@@ -112,7 +108,7 @@
// }
//鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo);
+ locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo, hostId);
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
@@ -226,7 +222,7 @@
List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>()
.eq(LocMast::getLocSts, "O")
.eq(LocMast::getLocType1, 1)
- .eq(LocMast::getCrnNo, staDesc.getCrnNo())
+ .eq(LocMast::getCrnNo, staDesc.getDeviceNo())
.orderByAsc(LocMast::getLev1, LocMast::getBay1, LocMast::getRow1));
if (!locMasts.isEmpty()) {
for (LocMast loc : locMasts) {
@@ -248,18 +244,19 @@
}
// 鎼滅储鍗曞搧(鏁翠釜搴撲綅缁�)
- 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"));//鎼滅储璐х墿
+ List<LocMast> locMasts = locMastService.list(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocSts, "O").eq(LocMast::getHostId, hostId));//鎼滅储璐х墿
if (locMasts == null) {
return null;
@@ -279,8 +276,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 +284,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 +296,6 @@
startupDto.setSourceStaNo(sourceStaNo);
startupDto.setStaNo(staNo.getDevNo());
startupDto.setLocNo(locMast.getLocNo());
- startupDto.setCrnNo(staDesc.getCrnNo());
return startupDto;
}
}
--
Gitblit v1.9.1