From f4d88f2a2317c2f08391173856b81ec3083ae29a Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 15:52:08 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 171 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 122 insertions(+), 49 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 83aa038..eb3a3a7 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());
}
@@ -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,25 @@
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 ("task".equals(params.getNotifyType())) {
//浠诲姟
- if (params.getMsgType().equals("task_complete")) {
+ if (Objects.isNull(params.getMsgType())) {
+ throw new CoolException("娑堟伅绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ if ("task_complete".equals(params.getMsgType())) {
//绉伴噸
- if ((mast.getIoType()==1||mast.getIoType()==10)&&mast.getWrkSts() == 2 && Cools.isEmpty(mast.getStaNo())) {
+ if ((mast.getIoType()==1||mast.getIoType()==10||mast.getIoType()==2) && 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 +613,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,48 +624,34 @@
}
mast.setOveMk("Y");
orgWrk.setOveMk("Y");
+ log.info("绌烘澘浠诲姟绉伴噸澶勭悊: childWrkNo={}, mainWrkNo={}, setOveMk=Y", mast.getWrkNo(), wrkNo);
if (!wrkMastService.updateById(orgWrk)) {
throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
}
} else { //鍏ュ簱/鍥炲簱鏈夋枡浠诲姟瀹屾垚
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()));
- if (Objects.isNull(wrkDetl)) {
- throw new CoolException("鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
- }
- Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", wrkDetl.getMatnr()));
- if (Objects.isNull(matnr)) {
- throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
- }
- Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
- if (!Cools.isEmpty(weight)) {
- Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
- //绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
- realQty = val * matnr.getVolume();
- if (realQty<matnr.getSafeQty()){//涓嶆敼涓虹┖鏉匡紝浠嶄綔涓鸿涓簃atnr.getSafeQty()
- wrkDetl.setAnfme(matnr.getSafeQty()*matnr.getVolume());
- }else{
- wrkDetl.setAnfme(realQty);
- }
- wrkDetl.setWeight(weight);
- if (!wrkDetlService.update(wrkDetl, new EntityWrapper<WrkDetl>().eq("wrk_no", mast.getWrkNo()).eq("matnr", wrkDetl.getMatnr()).eq("barcode", wrkDetl.getBarcode()))) {
- throw new CoolException("浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
- }
- }
+ if(mast.getIoType() !=2){
+ WrkDetl wrkDetl = selectWrkDetlByWrkNo(String.valueOf(mast.getWrkNo()), "鏁版嵁閿欒锛屼换鍔℃槑缁嗕笉瀛樺湪锛侊紒");
+ Mat matnr = selectMatByMatnr(wrkDetl.getMatnr());
+ applyWeightAndUpdateDetl("瀛愪换鍔�", String.valueOf(mast.getWrkNo()), wrkDetl, matnr, weight, "浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
- mast.setOveMk("Y");
- if (!wrkMastService.updateById(mast)) {
- throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ mast.setOveMk("Y");
+ log.info("瀛愪换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", mast.getWrkNo());
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
}
if (!Cools.isEmpty(mast.getWrkCode())) {
String wrkNo = mast.getWrkCode();
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("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
@@ -664,21 +659,29 @@
if (Objects.isNull(detl)) {
throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
}
- //搴撳瓨鍑忓幓绉伴噸闀垮害
- Double v = Math.round((wrkDetl.getStockQty() - realQty) * 10000) / 10000.0;
- //鍘熷嚭涓烘暟閲忎笌鐪熷疄鏁伴噺浜掓崲锛屼繚鎸佷竴鑷存��
- if(v<= 0){
- detl.setAnfme(matnr.getSafeQty());//璁惧畾涓洪粯璁ゅ��
- }else{
- detl.setAnfme(v);
-
+ Mat matnr = selectMatByMatnr(detl.getMatnr());
+ Double realQty = applyWeightAndUpdateDetl("涓讳换鍔�", wrkNo, detl, matnr, weight, "浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ updateDetlRemainAfterWeight("涓讳换鍔℃槑缁嗗洖鍐�", wrkNo, detl, matnr, weight, realQty, "鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ } 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("鏁版嵁閿欒锛屽洖搴撲富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
}
- 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("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ orgWrk.setOveMk("Y");
+ log.info("鍥炲簱涓讳换鍔℃洿鏂�: wrkNo={}, setOveMk=Y", wrkNo);
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
}
- } else {
- throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
+ WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detl)) {
+ throw new CoolException("涓讳换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ Mat matnr = selectMatByMatnr(detl.getMatnr());
+ Double realQty = applyWeightAndUpdateDetl("鍥炲簱涓讳换鍔�", wrkNo, detl, matnr, weight, "浠诲姟妗ｆ槑缁嗕慨鏀瑰け璐ワ紒锛�");
+ updateDetlRemainAfterWeight("鍥炲簱涓讳换鍔℃槑缁嗗洖鍐�", wrkNo, detl, matnr, weight, realQty, "鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }else{
+ throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
}
}
@@ -696,16 +699,17 @@
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("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
- } else if (params.getMsgType().equals("task_cancel")) {
+ } else if ("task_cancel".equals(params.getMsgType())) {
//todo 鍙栨秷浠诲姟
- }else if (params.getMsgType().equals("task_arrive")) {
+ }else if ("task_arrive".equals(params.getMsgType())) {
//鍒拌揪鐩殑鍦�
//濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
- if(!Cools.isEmpty(mast.getLocNo()) && mast.getStaNo().equals("1070") ){
-
+ if(!Cools.isEmpty(mast.getLocNo()) ){
mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
}
mast.setWrkSts(14L);
@@ -717,11 +721,80 @@
throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
}
- } else if (params.getNotifyType().equals("weight")) {
+ } else if ("weight".equals(params.getNotifyType())) {
}
return R.ok();
}
+
+ private WrkDetl selectWrkDetlByWrkNo(String wrkNo, String errMsg) {
+ WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detl)) {
+ throw new CoolException(errMsg);
+ }
+ return detl;
+ }
+
+ private Mat selectMatByMatnr(String matnrNo) {
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnrNo));
+ if (Objects.isNull(matnr)) {
+ throw new CoolException("鐗╂枡鍩虹淇℃伅涓嶅瓨鍦紒锛�");
+ }
+ return matnr;
+ }
+
+ private Double applyWeightAndUpdateDetl(String scene, String wrkNo, WrkDetl detl, Mat matnr, Double weight, String errMsg) {
+ Double realQty = round4(detl.getStockQty() - detl.getAnfme());
+ log.info("鏈夋枡浠诲姟绉伴噸璁＄畻鍒濆��: scene={}, wrkNo={}, matnr={}, stockQty={}, anfme={}, realQty(init)={}, safeQty={}, volume={}, weight={}",
+ scene, wrkNo, detl.getMatnr(), detl.getStockQty(), detl.getAnfme(), realQty, matnr.getSafeQty(), matnr.getVolume(), weight);
+ if (!Cools.isEmpty(weight)) {
+ Double val = round4(weight - matnr.getSafeQty());
+ realQty = val * matnr.getVolume();
+ log.info("鏈夋枡浠诲姟绉伴噸璁＄畻杩囩▼: scene={}, wrkNo={}, val=(weight-safeQty)={}, realQty=val*volume={}", scene, wrkNo, val, realQty);
+ if (realQty < matnr.getSafeQty()) {
+ detl.setAnfme(matnr.getSafeQty() * matnr.getVolume());
+ log.info("鏈夋枡浠诲姟绉伴噸淇: scene={}, wrkNo={}, realQty<safeQty, setAnfme={}", scene, wrkNo, detl.getAnfme());
+ } else {
+ detl.setAnfme(realQty);
+ log.info("鏈夋枡浠诲姟绉伴噸淇: scene={}, wrkNo={}, realQty>=safeQty, setAnfme={}", scene, 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(errMsg);
+ }
+ }
+ return realQty;
+ }
+
+ private void updateDetlRemainAfterWeight(String scene, String wrkNo, WrkDetl detl, Mat matnr, Double weight, Double realQty, String errMsg) {
+ Double v = round4(detl.getStockQty() - realQty);
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欒绠�: scene={}, wrkNo={}, v=(stockQty-realQty)={}, stockQty={}, realQty={}",
+ scene, wrkNo, v, detl.getStockQty(), realQty);
+ if (v <= 0) {
+ detl.setAnfme(matnr.getSafeQty());
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: scene={}, wrkNo={}, v<=0, setAnfme(safeQty)={}", scene, wrkNo, detl.getAnfme());
+ } else {
+ detl.setAnfme(v);
+ log.info("涓讳换鍔℃槑缁嗗洖鍐欎慨姝�: scene={}, wrkNo={}, v>0, setAnfme={}", scene, 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(errMsg);
+ }
+ }
+
+ private Double round4(Double value) {
+ if (value == null) {
+ return null;
+ }
+ return Math.round(value * 10000) / 10000.0;
+ }
//杈撳叆搴撲綅鑷姩鍐荤粨绠楀嚭鐩搁偦搴撲綅搴忓彿
@Override
public Integer[] freezeLocAround(Integer locId) {
--
Gitblit v1.9.1