From bc5ad338f7250ef79225e135ca68bdc5a445dc27 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 28 四月 2026 17:48:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 7e96444..f311353 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -156,7 +156,7 @@
throw new CoolException("鏈寚瀹氬洖搴撶被鍨嬶紒锛�");
}
LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",mast.getLocNo()));
- if(mast.getCrnNo() != locMast.getCrnNo()){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�
+ if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�/绌烘澘鐩存帴鍥炴湰宸烽亾
return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
}
@@ -567,6 +567,9 @@
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")) {
@@ -579,6 +582,7 @@
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,6 +621,7 @@
}
mast.setOveMk("Y");
orgWrk.setOveMk("Y");
+ log.info("绌烘澘浠诲姟绉伴噸澶勭悊: childWrkNo={}, mainWrkNo={}, setOveMk=Y", mast.getWrkNo(), wrkNo);
if (!wrkMastService.updateById(orgWrk)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -629,14 +636,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 +660,7 @@
mast.setOveMk("Y");
+ log.info("瀛愪换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", mast.getWrkNo());
if (!wrkMastService.updateById(mast)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -657,6 +672,7 @@
throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
}
orgWrk.setOveMk("Y");
+ log.info("涓讳换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", wrkNo);
if (!wrkMastService.updateById(orgWrk)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -666,11 +682,15 @@
}
//搴撳瓨鍑忓幓绉伴噸闀垮害
Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欒绠�: mainWrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
+ wrkNo, v, wrkDetl.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);
@@ -696,6 +716,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("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -704,7 +726,7 @@
}else if (params.getMsgType().equals("task_arrive")) {
//鍒拌揪鐩殑鍦�
//濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
- if(!Cools.isEmpty(mast.getLocNo())){
+ if(!Cools.isEmpty(mast.getLocNo()) ){
mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
}
mast.setWrkSts(14L);
--
Gitblit v1.9.1