From a1e94379b115721b2e604070dc48063b8016f72f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 21 十月 2025 19:32:59 +0800
Subject: [PATCH] 侧面输送线出库码盘信息对接
---
src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
index 78d5074..5fde269 100644
--- a/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/ToWmsServiceImpl.java
@@ -17,8 +17,8 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.io.IOException;
import java.util.Date;
+import java.util.concurrent.TimeUnit;
@Slf4j
@Service("toWmsService")
@@ -107,20 +107,25 @@
try {
response = new HttpHandler.Builder()
.setUri(wmsUrl)
+ .setTimeout(30, TimeUnit.SECONDS)
.setPath(inboundTaskApplyPath)
.setJson(JSON.toJSONString(wmsParam))
.build()
.doPost();
if (!Cools.isEmpty(response)) {
JSONObject jsonObject = JSON.parseObject(response);
- if (successCode.equals(jsonObject.get(code).toString())) {
+ if ("700".equals(jsonObject.get(code).toString())) {
+ TaskWrk taskWrk=new TaskWrk();
+ taskWrk.setWrkNo(-1);
+ return taskWrk;
+ } else if (successCode.equals(jsonObject.get(code).toString())) {
WmsResult result = JSON.parseObject(jsonObject.get(data).toString(), WmsResult.class);
return createInTask(result, wmsParam.getBarcode(), wmsParam.getStationCode());
}
}
- } catch (IOException e) {
+ } catch (Exception e) {
e.printStackTrace();
- log.info("璇锋眰wms鎶ラ敊锛寋}", e.getMessage());
+ log.info("璇锋眰wms鎶ラ敊锛屽叆鍙傦細{},寮傚父锛歿}", JSON.toJSONString(wmsParam), e.getMessage());
} finally {
addApiLog("鍏ュ簱浠诲姟璇锋眰鑾峰彇搴撲綅", wmsUrl + inboundTaskApplyPath, JSON.toJSONString(wmsParam), response, success);
}
@@ -133,9 +138,9 @@
boolean bool = false;
JSONObject param = new JSONObject();
try {
- log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝浠诲姟鍙凤細{}锛屾墽琛岀姸鎬侊細{}", taskNo,wrkSts);
- param.put("taskNo",taskNo);
- param.put("wrkSts",wrkSts);
+ log.info("浠诲姟鎵ц鐘舵�佷笂鎶ワ紝浠诲姟鍙凤細{}锛屾墽琛岀姸鎬侊細{}", taskNo, wrkSts);
+ param.put("taskNo", taskNo);
+ param.put("wrkSts", wrkSts);
response = new HttpHandler.Builder()
// .setHeaders(headParam)
.setUri(wmsUrl)
@@ -148,7 +153,7 @@
}
} catch (Exception e) {
- log.error("浠诲姟鎵ц鐘舵�佷笂鎶ュ紓甯�" + e);
+ log.error("浠诲姟鎵ц鐘舵�佷笂鎶ュ紓甯�" + e);
} finally {
apiLogService.save("浠诲姟鐘舵�佷笂鎶�"
, wmsUrl + executionStatusReport
@@ -171,6 +176,7 @@
taskWrk.setWrkNo(workNo1);
taskWrk.setStatus(TaskStatusType.DISTRIBUTE.id);//浠诲姟鐘舵�侊細娲惧彂
taskWrk.setCreateTime(now);
+ taskWrk.setAssignTime(now);
taskWrk.setIoType(1);//浠诲姟绫诲瀷
taskWrk.setIoPri(13);//浼樺厛绾�
taskWrk.setBarcode(barcode);//鏉＄爜
@@ -178,7 +184,6 @@
taskWrk.setCrnNo(locMast.getCrnNo());
taskWrk.setTargetPoint(locNo);
taskWrk.setStartPoint(startPoint + "");
- taskWrk.setCrnNo(locMast.getCrnNo());
if (taskWrk.getIoType() == 1) {
taskWrk.setWrkSts(2);
if (!Cools.isEmpty(taskWrk.getTargetPoint())) {
--
Gitblit v1.9.1