From 4c21c78a5ede0449917f9629f3fa5c84dc633847 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期六, 21 三月 2026 20:32:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 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 3b3fc44..5a84f79 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -123,9 +123,9 @@
// if (!wrkMastService.updateById(mast)) {
// throw new CoolException("浠诲姟鐘舵�佹洿鏂板け璐ワ紒锛�");
// }
- workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
- return R.ok("鎺ユ敹鎴愬姛锛屾墽琛屽洖搴撲腑...");
+ return workService.backLocOperation(mast.getWrkNo() + "", mast.getAppeUser());
+
}
/**
@@ -153,7 +153,7 @@
}else if (!Objects.isNull(params.getType()) && params.getType().equals("move")) {
url = createLocMoveTask;
}
- String response;
+ String response = null;
R r = R.ok();
try {
log.info("涓嬪彂鎼繍浠诲姟缁檞cs="+JSON.toJSONString(params));
@@ -201,7 +201,7 @@
}
}
}
- }else if (wrkMast.getIoType()==101){
+ }else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==110) {
wrkMast.setWrkSts(12L);
wrkMast.setModiTime(new Date());
wrkMastService.updateById(wrkMast);
@@ -209,7 +209,7 @@
String s = Utils.convertLocFormat(params.getLocNo());
LocAroundBind bind = locAroundBindService.selectOne(new EntityWrapper<LocAroundBind>()
.eq("b_loc_no", s));
- if (!Objects.isNull(bind)&&Cools.isEmpty(wrkMast.getStaNo())) {
+ if (!Objects.isNull(bind)) {
bind.setFreeze(1);
locAroundBindService.updateById(bind);
//鍐荤粨鐩搁偦搴撲綅
@@ -233,15 +233,21 @@
}
//TODO 涓婃姤鏄惁鎴愬姛
}else {
- r =R.error();
+ String msg = jsonObject.getString("msg");
+ if (Cools.isEmpty(msg)) {
+ msg = jsonObject.getString("message");
+ }
+ r = R.error(Cools.isEmpty(msg) ? "涓嬪彂浠诲姟澶辫触" : msg);
}
} catch (IOException e) {
- throw new RuntimeException(e);
+ log.error("涓嬪彂浠诲姟缁檞cs寮傚父, request={}", JSON.toJSONString(params), e);
+ return R.error("璋冪敤WCS鎺ュ彛澶辫触锛�" + e.getMessage());
+ } catch (Exception e) {
+ log.error("瑙ｆ瀽WCS涓嬪彂缁撴灉寮傚父, request={}, response={}", JSON.toJSONString(params), response, e);
+ return R.error("WCS杩斿洖缁撴灉寮傚父锛�" + e.getMessage());
}
return r;
}
-
-
/**
* 涓婃姤閿佸畾/閲婃斁搴撲綅淇℃伅
*
@@ -258,7 +264,7 @@
url = MesConstant.RELEASE_LOCS_URL;
}
}
- String response;
+ String response = null;
try {
response = new HttpHandler.Builder()
.setUri(MesConstant.URL)
@@ -371,6 +377,17 @@
} else {
throw new CoolException("浠诲姟鍙锋埅鍙栧け璐ワ紝璇锋鏌ヤ富浠诲姟妗ｄ换妗rkCode瀛楁");
}
+ }else{
+ 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");
+ if (!wrkMastService.updateById(orgWrk)) {
+ throw new CoolException("浠诲姟妗ｄ慨鏀瑰け璐ワ紒锛�");
+ }
}
}
} else {
@@ -384,7 +401,7 @@
}
Double realQty = Math.round((wrkDetl.getStockQty() - wrkDetl.getAnfme()) * 10000) / 10000.0;
if (!Cools.isEmpty(weight)) {
- Double val = Math.round((weight - 2.35) * 10000) / 10000.0;
+ Double val = Math.round((weight - 3) * 10000) / 10000.0;
//绉伴噸鍚庯紝璁＄畻鍑虹湡瀹為暱搴�
realQty = val * matnr.getVolume();
if (realQty<matnr.getSafeQty()){
@@ -509,3 +526,5 @@
return locAround;
}
}
+
+
--
Gitblit v1.9.1