From 518099da49917ed319318dc88860e3c5bbf04925 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:20:04 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 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 6fc2806..599d58b 100644
--- a/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
+++ b/src/main/java/com/zy/api/service/impl/WcsApiServiceImpl.java
@@ -22,6 +22,7 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.constant.MesConstant;
import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -31,6 +32,9 @@
import java.util.*;
import java.util.stream.Collectors;
+import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
+
+@Slf4j
@Service
public class WcsApiServiceImpl implements WcsApiService {
@@ -127,28 +131,36 @@
if (Objects.isNull(params.getTaskNo())) {
return R.error("浠诲姟鍙蜂笉鑳戒负绌猴紒锛�");
}
- if (Objects.isNull(params.getBarcode())) {
- return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
- }
- if (Objects.isNull(params.getLocNo())) {
- return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
- }
+// if (params.getType().equals("in"))
+// if (Objects.isNull(params.getBarcode())) {
+// return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+// }
+// if (Objects.isNull(params.getLocNo())) {
+// return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
+// }
String url = MesConstant.PUB_TASK_IN;
- if (Objects.isNull(params.getType()) && params.getType().equals("out")) {
+ if (!Objects.isNull(params.getType()) && params.getType().equals("out")) {
url = MesConstant.PUB_TASK_OUT;
}
+
+ log.info("鍑哄簱浠诲姟涓嬪彂鍙傛暟锛歿}", JSON.toJSONString(params));
String response;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
+ .setUri(MesConstant.WCS_URL)
.setPath(url)
.setJson(JSON.toJSONString(params))
.build()
.doPost();
- R result = JSON.parseObject(response, R.class);
+ Map<String, Object> result = JSON.parseObject(response, Map.class);
- if (result.get("code").equals("200")) {
+ if (result.get("code").equals(200)) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getTaskNo()));
+ wrkMast.setWrkSts(12L);
+ wrkMastService.updateById(wrkMast);
//TODO 涓婃姤鏄惁鎴愬姛
+ } else {
+ return R.error().add(result);
}
} catch (IOException e) {
throw new RuntimeException(e);
@@ -167,22 +179,23 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R receviceTaskFromWcs(ReceviceTaskParams params) {
- if (Objects.isNull(params.getWrkNo())) {
+ 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.getWrkNo()));
+ WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", params.getSuperTaskNo()));
if (Objects.isNull(mast)) {
throw new CoolException("浠诲姟妗ｄ笉瀛樺湪锛侊紒");
}
+ log.info("浠诲姟鎵ц鍙傛暟鍥炲啓:{}", JSON.toJSONString(params));
if (params.getNotifyType().equals("task")) {
//浠诲姟
if (params.getMsgType().equals("task_complete")) {
- if (mast.getIoType() == 1) {
+ if (mast.getIoType() == 1 || mast.getIoType() == 10 || mast.getIoType() == 53 || mast.getIoType() == 54 || mast.getIoType() == 57) {
mast.setWrkSts(4L);
- } else if (mast.getIoType() == 101) {
+ } else if (mast.getIoType() == 101 || mast.getIoType() == 110 || mast.getIoType() == 103 || mast.getIoType() == 104 || mast.getIoType() == 107) {
mast.setWrkSts(14L);
}
if (!wrkMastService.updateById(mast)) {
--
Gitblit v1.9.1