From b47369fbc73269f0661ba169c6387e04fb037e87 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期一, 16 三月 2026 14:26:23 +0800
Subject: [PATCH] 发货通知单打印日志
---
src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
index 3eff23f..b3fd738 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -55,8 +55,12 @@
@Override
public Page<OutStockBillEntry> queryOutStock(Page<OutStockBillEntry> page) {
- page.setRecords(baseMapper.queryOutStock(page.getCondition()));
- page.setTotal(baseMapper.queryOutStockCount(page.getCondition()));
+ Map<String, Object> cond = page.getCondition();
+ page.setRecords(baseMapper.queryOutStock(cond));
+ page.setTotal(baseMapper.queryOutStockCount(cond));
+ if (log.isDebugEnabled()) {
+ log.debug("queryOutStock 鏉′欢 FBillNo={}, FSourceBillNo={}, 鏌ヨ缁撴灉 total={}", cond.get("FBillNo"), cond.get("FSourceBillNo"), page.getTotal());
+ }
return page;
}
@@ -73,13 +77,13 @@
if (tempLocList.size() > 0) {
for (Integer j = 0; j < tempLocList.size(); j ++) {
locNum = locNum.add(new BigDecimal(tempLocList.get(j).getAnfme()));
- /* 璁＄畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
- if (needNum.compareTo(locNum) == 1) {
+// /* 璁＄畻闇�瑕佺殑鏁伴噺锛岀鍚堟暟閲忓悗缁撴潫寰幆 */
+// if (needNum.compareTo(locNum) == 1) {
locList.add(tempLocList.get(j));
- } else {
- locList.add(tempLocList.get(j));
- break;
- }
+// } else {
+// locList.add(tempLocList.get(j));
+// break;
+// }
}
}
}
@@ -113,7 +117,7 @@
}
if (complete) {
List<OutStockBillEntry> select1 = this.selectList(new EntityWrapper<OutStockBillEntry>().eq("FInterID", FInterID));
- if(select1.size()==1){
+ if(select1.size()<=1){
if (!completeCPakOut(FBillNo) ) {
log.error("{}鍑哄簱鍗曟爣璁板畬鎴愬け璐�", FBillNo);
}
@@ -166,7 +170,8 @@
// 鑾峰彇搴撲綅鏄庣粏
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
- if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
+ if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())
+ && paramLocDetl.getCount() > 0) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(paramLocDetl.getLocNo());
sqlParam.setMatnr(paramLocDetl.getMatnr());
@@ -204,11 +209,15 @@
// 鐢熸垚宸ヤ綔妗�
for (OutLocDto dto : dtos) {
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
- if (ioType == null) {
+// if (ioType == null) {
ioType = dto.isAll() ? 101 : 103;
- }
+// }
// 鑾峰彇搴撲綅
LocMast locMast = locMastService.selectById(dto.getLocNo());
+ //濡傛灉鎵樼洏鏉＄爜涓虹┖锛屽氨涓嶈兘杩涜鎷ｆ枡锛屾棤娉曞啀鍏ュ簱
+ if(ioType==103 && null!=locMast && Cools.isEmpty(locMast.getBarcode())){
+ throw new CoolException("搴撲綅娌℃湁鎵樼洏鐮侊紝鏃犳硶鎷ｆ枡浣滀笟===>>" + locMast.getLocNo());
+ }
// 鑾峰彇璺緞
Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
.eq("type_no", ioType)
--
Gitblit v1.9.1