From 1ee1574b1fce92407e45438b0141121d266efd3d Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期三, 29 四月 2026 15:27:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 2419347..379f4af 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -349,7 +349,7 @@
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
//绉伴噸
- if ((mast.getIoType()==1||mast.getIoType()==10)&&mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
+ if ((mast.getIoType()==1||mast.getIoType()==10) && mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
Double weight = 0.0;
if (!Cools.isEmpty(params.getData())){
JSONObject jsonObject = JSONObject.parseObject(params.getData());
@@ -627,6 +627,9 @@
}
}
} else { //鍏ュ簱/鍥炲簱鏈夋枡浠诲姟瀹屾垚
+ if(mast.getIoType() !=2){
+
+ }
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
if (Objects.isNull(wrkDetl)) {
throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
@@ -681,9 +684,9 @@
throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
}
//搴撳瓨鍑忓幓绉伴噸闀垮害
- Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+ Double v = Math.round((detl.getStockQty() - realQty) * 10000) / 10000.0;
log.info("涓讳换鍔℃槑缁嗗洖鍐欒绠�: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
- wrkNo, v, wrkDetl.getStockQty(), realQty);
+ wrkNo, v, detl.getStockQty(), realQty);
//鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
if(v<= 0){
detl.setAnfme(matnr.getSafeQty());//璁惧畾涓洪粯璁ゅ��
@@ -713,9 +716,9 @@
throw new CoolException("涓讳换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
}
//搴撳瓨鍑忓幓绉伴噸闀垮害
- Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+ Double v = Math.round((detl.getStockQty() - realQty) * 10000) / 10000.0;
log.info("鍥炲簱涓讳换鍔℃槑缁嗗洖鍐欒绠�: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
- wrkNo, v, wrkDetl.getStockQty(), realQty);
+ wrkNo, v, detl.getStockQty(), realQty);
//鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
if(v<= 0){
detl.setAnfme(matnr.getSafeQty());//璁惧畾涓洪粯璁ゅ��
--
Gitblit v1.9.1