From a5468f143101fe97ccf607987ac94a851dca0aac Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 30 十二月 2023 12:45:29 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 11 ++++++-----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 2 +-
zy-asrs-wms/src/main/webapp/views/report/locDetl.html | 9 +++++++--
3 files changed, 14 insertions(+), 8 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 8e12215..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
@@ -82,7 +82,7 @@
* 妫�绱㈠簱浣嶅彿
*/
@Transactional
- public StartupDto getLocNo(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;
@@ -108,7 +108,7 @@
// }
//鎼滅储鏁翠釜绌哄簱浣嶇粍
- locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo);
+ locMast = getLocNoStepSingle(locTypeDto, staDescId, sourceStaNo, hostId);
if (locMast != null) {
//鎵惧埌搴撲綅锛岃繑鍥瀌to
return getLocNoStep6(staDescId, sourceStaNo, locMast);//杩斿洖dto
@@ -244,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;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index c505036..3da20c3 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -59,7 +59,7 @@
}
Date now = new Date();
LocTypeDto locTypeDto = new LocTypeDto();
- StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), null, locTypeDto, 0);
+ StartupDto dto = commonService.getLocNo(1, param.getDevpNo(), hostId, locTypeDto, 0);
// 鐢熸垚宸ヤ綔鍙�
int workNo = dto.getWorkNo();
// 鐢熸垚宸ヤ綔妗�
diff --git a/zy-asrs-wms/src/main/webapp/views/report/locDetl.html b/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
index fc3f4b8..75b3d9d 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/locDetl.html
@@ -43,7 +43,12 @@
var $ = layui.jquery;
var form = layui.form;
- $('#locNo').val(parent.locNo);
+ var tmp = getQueryVariable("locNo")
+ if (tmp == false) {
+ $('#locNo').val(parent.locNo);
+ }else {
+ $('#locNo').val(tmp);
+ }
// 鏁版嵁娓叉煋
tableIns = table.render({
@@ -53,7 +58,7 @@
page: true,
limit: 20,
skin: 'line',
- where: {loc_no: parent.locNo},
+ where: {loc_no: $('#locNo').val()},
even: true,
cellMinWidth: 50,
cols: [getCol()],
--
Gitblit v1.9.1