From 9268cd77b4e864b901a8b0bf965f441f2e8c4fbd Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 04 一月 2026 08:06:14 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/common/service/CommonService.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 282c5f1..313ed9c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -102,13 +102,13 @@
StartupDto startupDto = null;
StringBuilder builder = new StringBuilder();
try {
- startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto);
+ startupDto = searchLocNoByCrnNo(staDescId, sourceStaNo, findLocNoAttributeVo, locTypeDto,barcode);
} catch (Exception e) {
builder.append(e.getMessage()).append(",");
}
if(startupDto == null) {
- builder.append("鎵句笉鍒扮┖搴撲綅");
+ builder.append("鎵句笉鍒扮┖搴撲綅--->" + barcode);
throw new CoolException(builder.toString());
}
@@ -125,14 +125,17 @@
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
- public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto) {
+ public StartupDto searchLocNoByCrnNo(Integer staDescId, Integer sourceStaNo, FindLocNoAttributeVo findLocNoAttributeVo, LocTypeDto locTypeDto,String barcode) {
LocMast locMast = null;
if (staDescId == 10) {
//鎼滅储绌烘墭鐩�
- locMast = searchEmptyPallet(locTypeDto);
+// locMast = searchEmptyPallet(locTypeDto);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_sts","O").eq("barcode",barcode));
+
}else {
//婊℃墭鐩�
- locMast = searchMaxPallet(findLocNoAttributeVo, locTypeDto);
+// locMast = searchMaxPallet(findLocNoAttributeVo, locTypeDto);
+ locMast = locMastService.selectOne(new EntityWrapper<LocMast>().in("loc_sts","O","P").eq("barcode",barcode));
}
if(locMast == null) {
--
Gitblit v1.9.1