From 8a57dfc1179f53bad5c874dda908f57b8afc5091 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 16:10:40 +0800
Subject: [PATCH] 工作档添加完成称重校验
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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 02922fa..a635949 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;
@@ -215,7 +216,7 @@
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
if (!Objects.isNull(mast.getWrkCode())) {
- if (mast.getOveMk().equals("N") && mast.getIoType() == 1) {
+ if (mast.getOveMk().equals("N") && !Cools.isEmpty(mast.getIsSuplus())) {
throw new CoolException("浠诲姟鏈笂鎶ラ噸閲忥紝鏃犳硶瀹岀粨浠诲姟锛侊紒");
}
}
@@ -253,7 +254,6 @@
//浣欐枡闀垮害
wrkDetl.setRealQty(val * matnr.getVolume());
mast.setIoType(1);
- mast.setOveMk("Y");
mast.setIsSuplus(1);
if (!wrkMastService.updateById(mast)) {
throw new CoolException("涓绘。鐘舵�佷慨鏀瑰け璐�");
@@ -274,18 +274,16 @@
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) {
@@ -305,7 +303,6 @@
//搴撳瓨鍑忓幓绉伴噸闀垮害
Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
//鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
- detl.setRealQty(detl.getAnfme());
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()))) {
--
Gitblit v1.9.1