From a7b476eaa50abb7cdebf691cc232c26926ee1328 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 18 九月 2021 10:40:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java | 15 ++++++++++-----
src/main/webapp/static/js/waitMatout/waitMatout.js | 5 +++--
src/main/java/com/zy/asrs/service/MatOutService.java | 4 +---
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/MatOutService.java b/src/main/java/com/zy/asrs/service/MatOutService.java
index dac8115..bc526d4 100644
--- a/src/main/java/com/zy/asrs/service/MatOutService.java
+++ b/src/main/java/com/zy/asrs/service/MatOutService.java
@@ -4,8 +4,6 @@
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.common.model.LocDetlDto;
-import java.util.List;
-
public interface MatOutService {
/**
@@ -20,5 +18,5 @@
* @param locDetls 寰呭嚭搴撲骇鍝�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
- void stockOut(String billNO,BasDevp staNo, LocDetlDto locDetls, Integer ioType, Long userId);
+ void stockOut(String billNO,Integer seqNo,BasDevp staNo, LocDetlDto locDetls, Integer ioType, Long userId);
}
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 e8ee621..07969ca 100644
--- a/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MatOutServiceImpl.java
@@ -9,7 +9,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocDetlDto;
-import com.zy.common.model.OutLocDto;
import com.zy.common.service.CommonService;
import com.zy.ints.entity.WaitMatout;
import com.zy.ints.mapper.WaitMatoutMapper;
@@ -18,7 +17,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
@Service
public class MatOutServiceImpl implements MatOutService {
@@ -74,15 +75,17 @@
if (outQty >= locDetl.getQty()){
//鐢熸垚鏂囨。璁板綍
- stockOut(waitMatout.getBillNo(),staNo,new LocDetlDto(locDetl,locDetl.getQty()),ioType,userId);
+ 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(),staNo,new LocDetlDto(locDetl,outQty),ioType,userId);
+ 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()));
@@ -94,7 +97,7 @@
@Override
@Transactional
- public void stockOut(String billNo,BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
+ public void stockOut(String billNo, Integer seqNo, BasDevp staNo, LocDetlDto locDetlDtos, Integer ioType, Long userId) {
// 鐢熸垚宸ヤ綔妗�
LocDetl locDetl=locDetlDtos.getLocDetl();
// 鑾峰彇搴撲綅
@@ -144,10 +147,12 @@
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
wrkDetl.setBillNo(billNo);
+ wrkDetl.setSeqNo(seqNo);
wrkDetl.setModiUser(userId);
if (!wrkDetlService.insert(wrkDetl)) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｆ槑缁嗗け璐�");
}
+
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
locMast = locMastService.selectById(locDetl.getLocNo());
if (locMast.getLocSts().equals("F")) {
diff --git a/src/main/webapp/static/js/waitMatout/waitMatout.js b/src/main/webapp/static/js/waitMatout/waitMatout.js
index 8025c27..fff1015 100644
--- a/src/main/webapp/static/js/waitMatout/waitMatout.js
+++ b/src/main/webapp/static/js/waitMatout/waitMatout.js
@@ -100,7 +100,7 @@
return util.toDateString(d.createTime);
}, width: 180
},
- {field: 'outqty', title: '宸插嚭搴撻噺'},
+ {field: 'outQty', title: '宸插嚭搴撻噺'},
{field: 'color', title: '棰滆壊'},
{field: 'specs', title: '瑙勬牸'},
]],
@@ -120,7 +120,8 @@
response: {
statusCode: 200
},
- done: function () {
+ done: function (res) {
+ // console.log(res);
$(layero).find('.layui-table-view').css('margin', '0');
},
size: ''
--
Gitblit v1.9.1