From e84d4700e32dba450aa4d239779fc39f38ae4afa Mon Sep 17 00:00:00 2001
From: admin <841110950@qq.com>
Date: 星期三, 01 九月 2021 17:22:32 +0800
Subject: [PATCH] 1.0.8
---
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
index 3747006..e8ee621 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -58,6 +58,9 @@
if (!Cools.isEmpty(paramLocDetl.getMatNo())) {
//鏌ヨ鎵�鏈夊簱浣嶇姸鎬佷负F鐨勫簱浣嶄俊鎭�
List<LocDetl> locDetls=locDetlService.getlocDetlList(paramLocDetl.getMatNo());
+ if (locDetls.size()==0){
+ throw new CoolException("搴撲綅鐘舵�佸嚭閿�");
+ }
for (LocDetl locDetl : locDetls) {
WaitMatout waitMatout = waitMatoutService.selectOne(new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo()).eq("seq_no",paramLocDetl.getSeqNo()));
Double outQty = paramLocDetl.getCount() - waitMatout.getOutQty();
@@ -71,14 +74,14 @@
if (outQty >= locDetl.getQty()){
//鐢熸垚鏂囨。璁板綍
- stockOut(staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+ stockOut(waitMatout.getBillNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
//淇敼璁板綍
Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
.eq("seq_no",paramLocDetl.getSeqNo()));
}else {
//鐢熸垚鏂囨。璁板綍
- stockOut(staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+ stockOut(waitMatout.getBillNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
//淇敼璁板綍
Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
@@ -91,7 +94,7 @@
@Override
@Transactional
- public void stockOut(BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
+ public void stockOut(String billNo,BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
// 鐢熸垚宸ヤ綔妗�
LocDetl locDetl=locDetlDtos.getLocDetl();
// 鑾峰彇搴撲綅
@@ -140,6 +143,7 @@
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
+ wrkDetl.setBillNo(billNo);
wrkDetl.setModiUser(userId);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
--
Gitblit v1.9.1