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 | 67 +++++++++++++++++++++++++++++++--
1 files changed, 62 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 2d36a55..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());
@@ -567,18 +567,22 @@
if (Objects.isNull(mast)) {
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
+ log.info("浠诲姟鍩虹淇℃伅: wrkNo={}, ioType={}, wrkSts={}, staNo={}, locNo={}, sourceLocNo={}, barcode={}, wrkCode={}, oveMk={}, isSuplus={}, exitMk={}",
+ mast.getWrkNo(), mast.getIoType(), mast.getWrkSts(), mast.getStaNo(), mast.getLocNo(), mast.getSourceLocNo(),
+ mast.getBarcode(), mast.getWrkCode(), mast.getOveMk(), mast.getIsSuplus(), mast.getExitMk());
if (params.getNotifyType().equals("task")) {
//浠诲姟
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());
weight=jsonObject.getDouble("weight");
}
+ log.info("绉伴噸鏁版嵁瑙ｆ瀽: wrkNo={}, ioType={}, rawData={}, weight={}", mast.getWrkNo(), mast.getIoType(), params.getData(), weight);
if (mast.getIoType() == 10) {//绌烘澘浠诲姟瀹屾垚
//绌烘澘鍏ュ簱浠诲姟妗�
LocDetl locDetl = locDetlService.selectOne(new EntityWrapper<LocDetl>()
@@ -606,6 +610,8 @@
if (Objects.isNull(matnr)) {
throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
}
+ log.info("绌烘澘浠诲姟绉伴噸璁＄畻鍓嶇疆: wrkNo={}, matnr={}, safeQty={}, volume={}, weight={}",
+ mast.getWrkNo(), matnrNo, matnr.getSafeQty(), matnr.getVolume(), weight);
if (!Cools.isEmpty(weight)) {
//鍙栨秷閲嶉噺鍒ゆ柇鏀瑰彉鍥炲簱绫诲瀷
String wrkNo = mast.getWrkCode();
@@ -615,11 +621,15 @@
}
mast.setOveMk("Y");
orgWrk.setOveMk("Y");
+ log.info("绌烘澘浠诲姟绉伴噸澶勭悊: childWrkNo={}, mainWrkNo={}, setOveMk=Y", mast.getWrkNo(), wrkNo);
if (!wrkMastService.updateById(orgWrk)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
}
} else { //鍏ュ簱/鍥炲簱鏈夋枡浠诲姟瀹屾垚
+ if(mast.getIoType() !=2){
+
+ }
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
if (Objects.isNull(wrkDetl)) {
throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
@@ -629,14 +639,21 @@
throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
}
Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
+ log.info("鏈夋枡浠诲姟绉伴噸璁＄畻鍒濆��: wrkNo={}, matnr={}, stockQty={}, anfme={}, realQty(init)={}, safeQty={}, volume={}, weight={}",
+ mast.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getStockQty(), wrkDetl.getAnfme(), realQty,
+ matnr.getSafeQty(), matnr.getVolume(), weight);
if (!Cools.isEmpty(weight)) {
Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
//绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
realQty = val * matnr.getVolume();
+ log.info("鏈夋枡浠诲姟绉伴噸璁＄畻杩囩▼: wrkNo={}, val=(weight-safeQty)={}, realQty=val*volume={}",
+ mast.getWrkNo(), val, realQty);
if (realQty<matnr.getSafeQty()){//涓嶆敼涓虹┖鏉匡紝浠嶄綔涓鸿涓簃atnr.getSafeQty()
wrkDetl.setAnfme(matnr.getSafeQty()*matnr.getVolume());
+ log.info("鏈夋枡浠诲姟绉伴噸淇: wrkNo={}, realQty<safeQty, setAnfme={}", mast.getWrkNo(), wrkDetl.getAnfme());
}else{
wrkDetl.setAnfme(realQty);
+ log.info("鏈夋枡浠诲姟绉伴噸淇: wrkNo={}, realQty>=safeQty, setAnfme={}", mast.getWrkNo(), wrkDetl.getAnfme());
}
wrkDetl.setWeight(weight);
if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
@@ -646,6 +663,7 @@
mast.setOveMk("Y");
+ log.info("瀛愪换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", mast.getWrkNo());
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -657,6 +675,7 @@
throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
}
orgWrk.setOveMk("Y");
+ log.info("涓讳换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", wrkNo);
if (!wrkMastService.updateById(orgWrk)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -665,20 +684,56 @@
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, detl.getStockQty(), realQty);
//鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
if(v<= 0){
detl.setAnfme(matnr.getSafeQty());//璁惧畾涓洪粯璁ゅ��
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: mainWrkNo={}, v<=0, setAnfme(safeQty)={}", wrkNo, detl.getAnfme());
}else{
detl.setAnfme(v);
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: mainWrkNo={}, v>0, setAnfme={}", wrkNo, detl.getAnfme());
}
detl.setWeight(weight);
if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
}
- } else {
- throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
+ } else if(!Cools.isEmpty(mast.getPacked())){
+ String wrkNo = mast.getPacked();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屽洖搴撲富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ orgWrk.setOveMk("Y");
+ log.info("鍥炲簱涓讳换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", wrkNo);
+ 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((detl.getStockQty() - realQty) * 10000) / 10000.0;
+ log.info("鍥炲簱涓讳换鍔℃槑缁嗗洖鍐欒绠�: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
+ wrkNo, v, detl.getStockQty(), realQty);
+ //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
+ if(v<= 0){
+ detl.setAnfme(matnr.getSafeQty());//璁惧畾涓洪粯璁ゅ��
+ log.info("鍥炲簱涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: mainWrkNo={}, v<=0, setAnfme(safeQty)={}", wrkNo, detl.getAnfme());
+ }else{
+ detl.setAnfme(v);
+ log.info("鍥炲簱涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: mainWrkNo={}, v>0, setAnfme={}", wrkNo, detl.getAnfme());
+
+ }
+ detl.setWeight(weight);
+ if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
+ throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ }else{
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
}
}
@@ -696,6 +751,8 @@
mast.setOveMk("Y");
}
}
+ log.info("浠诲姟鐘舵�佸彉鏇�: wrkNo={}, ioType={}, msgType={}, setWrkSts={}, oveMk={}",
+ mast.getWrkNo(), mast.getIoType(), params.getMsgType(), mast.getWrkSts(), mast.getOveMk());
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
--
Gitblit v1.9.1