From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
index f6b79d0..09a4c8a 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.api.controller.params.ReceviceTaskParams;
@@ -214,19 +215,30 @@
if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
- mast.setWrkSts(4L);
+ if (!Objects.isNull(mast.getWrkCode())) {
+ if (mast.getOveMk().equals("N") && !Cools.isEmpty(mast.getIsSuplus())) {
+ throw new CoolException("浠诲姟鏈笂鎶ラ噸閲忥紝鏃犳硶瀹岀粨浠诲姟锛侊紒");
+ }
+ }
+ if (mast.getIoType() == 1) {
+ mast.setWrkSts(4L);
+ } else if (mast.getIoType() == 101) {
+ mast.setWrkSts(14L);
+ }
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
} else if (params.getMsgType().equals("task_cancel")) {
-
+ //todo 鍙栨秷浠诲姟
}
} else if (params.getNotifyType().equals("weight")) {
//绉伴噸
if (mast.getWrkSts() == 2) {
if (mast.getIoType() == 10) {
//绌烘澘鍏ュ簱浠诲姟妗�
- LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("loc_no", mast.getSourceLocNo()));
+ LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
+ .eq("barcode", mast.getBarcode())
+ .eq("loc_no", mast.getSourceLocNo()));
if (Objects.isNull(locDetl)) {
throw new CoolException("鏄庣粏鏁版嵁涓嶅瓨鍦紒锛�");
}
@@ -239,17 +251,41 @@
WrkDetl wrkDetl = new WrkDetl();
BeanUtils.copyProperties(locDetl, wrkDetl);
wrkDetl.setWrkNo(mast.getWrkNo());
+ wrkDetl.setStockQty(locDetl.getAnfme());
wrkDetl.setIoTime(new Date());
wrkDetl.setWeight(params.getWeight());
//浣欐枡闀垮害
- wrkDetl.setRealQty(val * matnr.getVolume());
+ wrkDetl.setAnfme(val * matnr.getVolume());
mast.setIoType(1);
mast.setIsSuplus(1);
+ mast.setOveMk("Y");
if (!wrkMastService.updateById(mast)) {
- throw new CoolException("涓绘。鐘舵�佷慨鏀瑰け璐�");
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
- if (!wrkDetlService.insert(wrkDetl)) {
- throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ // 鏇存柊鍘熷嚭搴撳崟
+ int indexOf = mast.getWrkCode().indexOf("-1");
+ if (indexOf != -1) {
+ String wrkNo = mast.getWrkCode().substring(0, indexOf);
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+ //绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
+ Double realQty = val * matnr.getVolume();
+ //搴撳瓨鍑忓幓绉伴噸闀垮害
+ Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+ //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+ wrkDetl.setAnfme(v);
+ wrkDetl.setWeight(params.getWeight());
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒");
+ }
+ } else {
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
}
} else {
@@ -262,19 +298,18 @@
throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
}
Double val = Math.round((params.getWeight() - matnr.getSafeQty()) * 10000) / 10000.0;
+ //绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
Double realQty = val * matnr.getVolume();
-// if (val.compareTo(0.0) > 0) {
-// //浣欐枡闀垮害
-// wrkDetl.setRealQty(realQty);
-// } else {
-// //绌烘澘
-// wrkDetl.setRealQty(0.0);
-// }
wrkDetl.setAnfme(realQty);
wrkDetl.setWeight(params.getWeight());
if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
}
+ mast.setOveMk("Y");
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+
// 鏇存柊鍘熷嚭搴撳崟
int indexOf = mast.getWrkCode().indexOf("-1");
if (indexOf != -1) {
@@ -283,12 +318,18 @@
if (Objects.isNull(orgWrk)) {
throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
}
+ orgWrk.setOveMk("Y");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
if (Objects.isNull(detl)) {
throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
}
+ //搴撳瓨鍑忓幓绉伴噸闀垮害
Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
- detl.setRealQty(v);
+ //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+ detl.setAnfme(v);
detl.setWeight(params.getWeight());
if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
--
Gitblit v1.9.1