From 0574251b05ea099b84d7ddd4bdc65a78ff03aea7 Mon Sep 17 00:00:00 2001
From: wang..123 <brook_w@163.com>
Date: 星期五, 18 二月 2022 08:11:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 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 07969ca..adccb2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -71,25 +71,33 @@
// 鍒ゆ柇鍏ュ嚭搴撶被鍨嬶細101.鍏ㄦ澘鍑哄簱 or 103.鎷ｆ枡鍑哄簱
Double sumCount=locDetlService.getLocDetlSumQty(locDetl.getLocNo());
int ioType=0;
- ioType=sumCount-outQty>0?103 : 101;
+ ioType = sumCount-locDetl.getQty()>0 ? 103 : 101;
- if (outQty >= locDetl.getQty()){
- //鐢熸垚鏂囨。璁板綍
- stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
- waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
- waitMatout.setIoStatus(1);
- //淇敼璁板綍
- Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
- .eq("seq_no",paramLocDetl.getSeqNo()));
- }else {
- //鐢熸垚鏂囨。璁板綍
- stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
- waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
- waitMatout.setIoStatus(1);
- //淇敼璁板綍
- Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
- .eq("seq_no",paramLocDetl.getSeqNo()));
- }
+ Double curOutQty = outQty >= locDetl.getQty() ? locDetl.getQty() : outQty; //鏈鍑哄簱閲�
+ stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,curOutQty),ioType,userId);
+ waitMatout.setOutQty(waitMatout.getOutQty() + curOutQty);
+ waitMatout.setIoStatus(1);
+ //淇敼璁板綍
+ Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+ .eq("seq_no",paramLocDetl.getSeqNo()));
+
+// if (outQty >= locDetl.getQty()){
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + locDetl.getQty());
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }else {
+// //鐢熸垚鏂囨。璁板綍
+// stockOut(waitMatout.getBillNo(),waitMatout.getSeqNo(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+// waitMatout.setOutQty(waitMatout.getOutQty() + outQty);
+// waitMatout.setIoStatus(1);
+// //淇敼璁板綍
+// Integer update = waitMatoutMapper.update(waitMatout, new EntityWrapper<WaitMatout>().eq("bill_no", paramLocDetl.getBillNo())
+// .eq("seq_no",paramLocDetl.getSeqNo()));
+// }
}
}
}
@@ -111,8 +119,14 @@
if (Cools.isEmpty(staDesc)) {
throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
}
+ int rok;
+ if(ioType==103){
+ rok=2;
+ }else{
+ rok=1;
+ }
// 鐢熸垚宸ヤ綔鍙�
- int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
+ int workNo = commonService.getWorkNo(rok);
// 鐢熸垚宸ヤ綔妗�
WrkMast wrkMast = new WrkMast();
wrkMast.setWrkNo(workNo);
--
Gitblit v1.9.1