From 95ddc69ea2ff0d0fa5a721f4ed684184bf2e5316 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期四, 19 八月 2021 10:59:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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 81bf09b..e99acff 100644
--- a/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OutStockServiceImpl.java
@@ -41,6 +41,8 @@
private CommonService commonService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private LocNormalService locNormalService;
@Override
public Page<OutStockBillEntry> queryOutStock(Page<OutStockBillEntry> page) {
@@ -56,7 +58,7 @@
List<LocDetl> locList = new ArrayList<LocDetl>();
for (Integer i = 0; i < matList.size(); i++) {
/*鑷姩鏍规嵁鐗╂枡缂栫爜閫夊彇鏈�浼樺嚭璐ч『搴忥紙鍏堣繘鍏堝嚭锛岄潬澶栬揣鐗╁厛鍑猴級*/
- tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFNumber());
+ tempLocList = baseMapper.queryMatWithLoc(matList.get(i).getFnumber());
BigDecimal needNum = matList.get(i).getFAuxQty();
BigDecimal locNum = BigDecimal.ZERO;
if (tempLocList.size() > 0) {
@@ -73,6 +75,11 @@
}
}
return locList;
+ }
+
+ @Override
+ public Integer queryOutStockFInterID(String supplier) {
+ return baseMapper.queryOutStockFInterID(supplier);
}
@Override
@@ -148,6 +155,7 @@
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
wrkMast.setSourceLocNo(dto.getLocNo()); // 婧愬簱浣�
+ wrkMast.setBarcode(locMast.getBarcode()); // 鏉＄爜
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
wrkMast.setPicking("N"); // 鎷ｆ枡
wrkMast.setExitMk("N"); // 閫�鍑�
@@ -162,6 +170,13 @@
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
+ // 濡傛灉涓烘崱鏂欏嚭搴撻渶瑕佸垽鏂墭鐩樼爜鏄惁涓虹┖
+ if (ioType == 103) {
+ String zpallet = detlDto.getLocDetl().getZpallet();
+ if (Cools.isEmpty(zpallet)) {
+ throw new CoolException("鎷ｆ枡鍑哄簱蹇呴』鍚湁鎵樼洏鐮�");
+ }
+ }
// 鍑哄簱鏃讹紝鏁伴噺涓�0鐨勭洿鎺ュ拷鐣�
if (detlDto.getCount()==null || detlDto.getCount() <= 0.0D) {continue;}
WrkDetl wrkDetl = new WrkDetl();
@@ -174,7 +189,8 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setModiUser(userId);
- wrkDetl.setWarehouse(fbillNo);
+ wrkDetl.setSupplier(fbillNo);
+ wrkDetl.setMemo(detlDto.getLocDetl().getMemo());
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
--
Gitblit v1.9.1