From b7e27e0760d7a912de932dc24cb49a5302530355 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 09 二月 2026 09:30:55 +0800
Subject: [PATCH] 1
---
zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
index 3622d04..6e325b8 100644
--- a/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
+++ b/zy-acs-cv/src/main/java/com/zy/asrs/service/impl/WmsMainServiceImpl.java
@@ -1,15 +1,10 @@
package com.zy.asrs.service.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.core.exception.CoolException;
-import com.zy.asrs.controller.requestParam.StationRequestParam;
import com.zy.asrs.controller.vo.ApplyInDto;
import com.zy.asrs.controller.vo.ApplyInRepsonseDto;
-import com.zy.asrs.controller.vo.OpenBusSubmitParam;
-import com.zy.asrs.controller.vo.StationStatus;
-import com.zy.asrs.service.CtuMainService;
import com.zy.asrs.service.WmsMainService;
import com.zy.common.utils.HttpHandler;
import lombok.Data;
@@ -18,8 +13,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.List;
import java.util.concurrent.TimeUnit;
/**
@@ -33,22 +26,20 @@
public class WmsMainServiceImpl implements WmsMainService {
- @Value("${ctu.url}")
+ @Value("${wms.url}")
private String wmsUrl;
-
- @Value("${ctu.sendTask}")
+ @Value("${wms.apply}")
private String apply;
- private String code ="code";
+ private String code = "code";
- private String dataCode ="data";
+ private String dataCode = "data";
- private Integer codeValue =200;
+ private Integer codeValue = 200;
private Integer timeout = 1200;
-
/**
@@ -70,17 +61,16 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger(code).equals(codeValue)) {
log.info("WMS杩斿洖鏁版嵁锛歿}", response);
- JSONArray data = jsonObject.getJSONArray(dataCode);
- return JSONObject.parseObject(data.toString(), ApplyInRepsonseDto.class);
+ return JSONObject.parseObject(jsonObject.getString(dataCode), ApplyInRepsonseDto.class);
} else {
log.error("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛歿}锛屽搷搴斿唴瀹癸細{}", jsonObject.getInteger(code), response);
- throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
+ //throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊锛屽搷搴旂爜锛�" + jsonObject.getInteger(code));
}
} catch (CoolException e) {
log.error("璋冪敤绔欑偣鐘舵�佹帴鍙ｅ紓甯�", e);
- throw e;
+ //throw e;
} catch (Exception e) {
- log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝鏉＄爜缂栧彿锛歿},绔欑偣锛歿}", applyInDto.getBarcode(),applyInDto.getStaNo(), e);
+ log.error("妫�鏌ョ珯鐐圭姸鎬佸け璐ワ紝鏉＄爜缂栧彿锛歿},绔欑偣锛歿}", applyInDto.getBarcode(), applyInDto.getStaNo(), e);
}
return null;
}
--
Gitblit v1.9.1