From 3c2720bc6434acc91f2b085e41083bec374e5a85 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 09 四月 2021 13:39:24 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud
---
src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 52 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 1beff42..547e5f9 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -254,9 +254,59 @@
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>()
.eq("doc_num", param.getNumber())
.in("wrk_sts", 1, 2));
- // 淇敼搴撳瓨鏁伴噺
for (Pakout pakout : pakouts) {
LocDetl locDetl = locDetlService.getLocDetl(pakout.getNodeId(), pakout.getMatnr());
+ // 缂鸿揣 or 绔嬪簱
+ if (locDetl == null) {
+ // 缂鸿揣
+ if (pakout.getLocNo().equals("缂鸿揣")) {
+ Double count = Optional.ofNullable(locDetlService.selectCountByMatnr(pakout.getMatnr())).orElse(0.0D);
+ if (count < pakout.getAnfme()) {
+ throw new CoolException(pakout.getMaktx()+"缂鸿揣");
+ }
+ Date now = new Date();
+ // 鏌ユ壘鎺ㄨ崘璐т綅鏄惁搴撳瓨瓒冲
+ List<LocDetl> locDetls = locDetlService.findOfSort(pakout.getMatnr());
+ double issued = Optional.ofNullable(pakout.getAnfme()).orElse(0.0D) ;
+ for (LocDetl locDetl1 : locDetls) {
+ if (issued > 0) {
+ // 淇濆瓨鍑哄簱閫氱煡鍗�
+ Pakout newPakout = new Pakout();
+ newPakout.setWrkSts(3L);
+ newPakout.setAnfme(issued>=locDetl1.getAnfme()?locDetl1.getAnfme():issued);
+ newPakout.setZpallet(locDetl1.getZpallet());
+ newPakout.setLocNo(locDetl1.getLocNo());
+ newPakout.setNodeId(locDetl1.getNodeId());
+ newPakout.setWrkNo(String.valueOf(snowflakeIdWorker.nextId()));
+ VersionUtils.setPakout(newPakout, locDetl1);
+ newPakout.setDocId(pakout.getDocId()); // 鍗曟嵁绫诲瀷
+ newPakout.setDocNum(pakout.getDocNum()); // 鍗曟嵁缂栧彿
+ newPakout.setCreateTime(now);
+ newPakout.setUpdateTime(now);
+ newPakout.setStatus(1);
+ if (!pakoutService.insert(newPakout)) {
+ throw new CoolException("淇濆瓨鍑哄簱閫氱煡鍗曞け璐�");
+ }
+ if (issued>=locDetl1.getAnfme()) {
+ // 鍒犻櫎搴撳瓨鏄庣粏
+ if (!locDetlService.removeStock(locDetl1.getNodeId(), newPakout.getMatnr())) {
+ throw new CoolException("鍒犻櫎搴撳瓨鏄庣粏澶辫触");
+ }
+ } else {
+ // 淇敼搴撳瓨鏄庣粏鏁伴噺
+ if (!locDetlService.reduceStock(locDetl1.getNodeId(), newPakout.getMatnr(), issued)) {
+ throw new CoolException("淇敼搴撳瓨鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
+ issued = issued - locDetl1.getAnfme();
+ }
+ }
+
+ }
+ continue;
+ }
+ // 淇敼搴撳瓨鏁伴噺
if (pakout.getAnfme()>=locDetl.getAnfme()) {
// 鍒犻櫎搴撳瓨鏄庣粏
if (!locDetlService.removeStock(locDetl.getNodeId(), pakout.getMatnr())) {
@@ -269,6 +319,7 @@
}
}
}
+
// 淇敼鍑哄簱鍗曠姸鎬�
if (!pakoutService.stockOutComplete(param.getWrkNo(), param.getNumber(), userId)) {
return R.error("淇濆瓨鏁版嵁澶辫触");
--
Gitblit v1.9.1