From 4f2b7db1184798a55046f04e17d5540b4a7e19f4 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 29 四月 2026 11:12:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 249 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 246 insertions(+), 3 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 a053cf1..814b709 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -145,6 +145,25 @@
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R backLocsV2(String params) {
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", params));
+ if (Objects.isNull(mast)) {
+ throw new CoolException("浠诲姟涓嶅瓨鍦紒锛�");
+ }
+ if(Cools.isEmpty(mast.getIsSuplus())){
+ throw new CoolException("鏈寚瀹氬洖搴撶被鍨嬶紒锛�");
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no",mast.getLocNo()));
+ if((mast.getCrnNo() != locMast.getCrnNo()) && mast.getIsSuplus()!=0){ //鑻ユ簮搴撲綅涓嶅湪鏈贩閬�/绌烘澘鐩存帴鍥炴湰宸烽亾
+ return workService.backLocOperationV2(mast.getWrkNo() + "", mast.getAppeUser());
+ }
+
+ return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
+
+ }
+
/**
* 涓嬪彂浠诲姟鑷砏CS
*
@@ -330,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());
@@ -365,6 +384,7 @@
}
if (!Cools.isEmpty(weight)) {
Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
+ //TODO 閲嶉噺鍒ゆ柇璁＄畻
if (val.compareTo(0.0) > 0) {
WrkDetl wrkDetl = new WrkDetl();
if (Objects.isNull(locDetl)) {
@@ -417,7 +437,7 @@
} else {
throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
- }else{
+ }else{ //TODO 璁＄畻寮傚父鍚庤繖閲屾槸浠�涔堟祦绋�
String wrkNo = mast.getWrkCode();
WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
if (Objects.isNull(orgWrk)) {
@@ -441,7 +461,7 @@
}
Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
if (!Cools.isEmpty(weight)) {
- Double val = Math.round((weight - 2.5) * 10000) / 10000.0;
+ Double val = Math.round((weight - matnr.getSafeQty()) * 10000) / 10000.0;
//绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
realQty = val * matnr.getVolume();
if (realQty<matnr.getSafeQty()){
@@ -532,6 +552,229 @@
}
return R.ok();
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R receviceTaskFromWcsV2(ReceviceTaskParams params) {
+ log.info("wcs浠诲姟鍙嶉="+JSON.toJSONString(params));
+ if (Objects.isNull(params.getSuperTaskNo())) {
+ throw new CoolException("WMS浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(params.getNotifyType())) {
+ throw new CoolException("鍔ㄤ綔绫诲瀷涓嶈兘涓虹┖锛侊紒");
+ }
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getSuperTaskNo()));
+ 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())) {
+ 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>()
+ .eq("zpallet", mast.getBarcode())
+ .eq("loc_no", mast.getSourceLocNo()));
+ WrkDetl mainWrkDetl = null;
+ if (Objects.isNull(locDetl) && !Cools.isEmpty(mast.getWrkCode())) {
+ mainWrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", mast.getWrkCode())
+ .eq("zpallet", mast.getBarcode()));
+ if (Objects.isNull(mainWrkDetl)) {
+ mainWrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>()
+ .eq("wrk_no", mast.getWrkCode()));
+ }
+ if (!Objects.isNull(mainWrkDetl)) {
+ log.info("locDetl涓虹┖锛屽洖閫�鏌ヨ涓讳换鍔℃槑缁嗭紝wrkNo={}, mainWrkNo={}, barcode={}",
+ mast.getWrkNo(), mast.getWrkCode(), mast.getBarcode());
+ }
+ }
+ if (Objects.isNull(locDetl) && Objects.isNull(mainWrkDetl)) {
+ throw new CoolException("鏄庣粏鏁版嵁涓嶅瓨鍦紒锛�");
+ }
+ String matnrNo = Objects.isNull(locDetl) ? mainWrkDetl.getMatnr() : locDetl.getMatnr();
+ Mat matnr = matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnrNo));
+ 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();
+ WrkMast orgWrk = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(orgWrk)) {
+ throw new CoolException("鏁版嵁閿欒锛屼富浠诲姟妗ｄ笉瀛樺湪鎴栧凡鍒犻櫎锛侊紒");
+ }
+ 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;
+ 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()))) {
+ 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("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
+ WrkDetl detl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo));
+ if (Objects.isNull(detl)) {
+ throw new CoolException("瀛愪换鍔℃。鏄庣粏涓嶅瓨鍦紒锛�");
+ }
+ //搴撳瓨鍑忓幓绉伴噸闀垮害
+ 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);
+ if (!wrkDetlService.update(detl, new EntityWrapper<WrkDetl>().eq("wrk_no", wrkNo).eq("matnr", detl.getMatnr()).eq("barcode", detl.getBarcode()))) {
+ throw new CoolException("鍘熶换鍔℃。鏄庣粏淇敼澶辫触锛侊紒");
+ }
+ } 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((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);
+ 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瀛楁");
+ }
+ }
+ }
+
+ if (!Objects.isNull(mast.getWrkCode())) {
+ if (mast.getOveMk().equals("N") && !Cools.isEmpty(mast.getIsSuplus())) {
+ throw new CoolException("浠诲姟鏈笂鎶ラ噸閲忥紝鏃犳硶瀹岀粨浠诲姟锛侊紒");
+ }
+ }
+ if (mast.getIoType() == 1 || mast.getIoType() == 2 ||mast.getIoType() == 10) {
+ mast.setWrkSts(4L);
+ } else if ((mast.getIoType() == 101||mast.getIoType()==110) && mast.getWrkSts()<14) {
+ mast.setWrkSts(14L);
+ if(Cools.isEmpty(mast.getStaNo())){
+ 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")) {
+ //todo 鍙栨秷浠诲姟
+ }else if (params.getMsgType().equals("task_arrive")) {
+ //鍒拌揪鐩殑鍦�
+ //濡傛灉鍑哄簱浠诲姟鏄法鍖哄垯闇�瑕佺敓鎴愭柊鐨勫叆搴撲换鍔″叆搴�
+ if(!Cools.isEmpty(mast.getLocNo()) ){
+ mast.setOnlineYn("N");//绛夊緟鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟
+ }
+ mast.setWrkSts(14L);
+ if(Cools.isEmpty(mast.getStaNo())){
+ mast.setOveMk("Y");
+ }
+ mast.setModiTime(new Date());
+ if (!wrkMastService.updateById(mast)) {
+ throw new CoolException("浠诲姟鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+ }
+ } else if (params.getNotifyType().equals("weight")) {
+
+ }
+ return R.ok();
+ }
//杈撳叆搴撲綅鑷姩鍐荤粨绠楀嚭鐩搁偦搴撲綅搴忓彿
@Override
public Integer[] freezeLocAround(Integer locId) {
--
Gitblit v1.9.1