root/xuGong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.40.234.130:8899/wangs/xuGong

Browse Source
This commit is contained in:
周俊杰
2023-04-23 16:07:29 +08:00
parent b7cf50cd10 18b5a9cd38
commit a703dfa83a
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -45,6 +45,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
*/ */
@Override @Override
public Map<String, Object> receiveTaskStatusAcs(String string) { public Map<String, Object> receiveTaskStatusAcs(String string) {
log.info("receiveTaskStatusAcs接口输入参数为：-------------------------------------"+string);
JSONArray array = JSONArray.parseArray(string); JSONArray array = JSONArray.parseArray(string);
//返回处理失败的任务 //返回处理失败的任务
JSONArray errArr = new JSONArray(); JSONArray errArr = new JSONArray();
@@ -116,6 +117,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
public Map<String, Object> orderFinish(String string) { public Map<String, Object> orderFinish(String string) {
log.info("orderFinish接口输入参数为：-------------------------------------"+string);
JSONObject orderJson = JSONObject.parseObject(string); JSONObject orderJson = JSONObject.parseObject(string);
String ext_order_id = orderJson.getString("ext_order_id"); String ext_order_id = orderJson.getString("ext_order_id");
// JSONArray array = JSONArray.parseArray(string); // JSONArray array = JSONArray.parseArray(string);
@@ -139,6 +141,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public JSONObject apply(JSONObject whereJson) { public JSONObject apply(JSONObject whereJson) {
log.info("apply接口输入参数为：-------------------------------------"+whereJson.toString());
String type = whereJson.getString("type"); String type = whereJson.getString("type");
String point_code = whereJson.getString("point_code"); String point_code = whereJson.getString("point_code");
String vehicle_num = whereJson.getString("vehicle_num"); String vehicle_num = whereJson.getString("vehicle_num");

4
lms/hd/nladmin-system/src/main/java/org/nl/wms/sch/AcsUtil.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpRequest;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.nl.modules.system.service.impl.ParamServiceImpl; import org.nl.modules.system.service.impl.ParamServiceImpl;
import org.nl.utils.SpringContextHolder; import org.nl.utils.SpringContextHolder;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
@@ -12,8 +13,10 @@ import org.springframework.http.HttpStatus;
/** /**
* ACS连接工具类: * ACS连接工具类:
*/ */
@Slf4j
public class AcsUtil { public class AcsUtil {
public static JSONObject notifyAcs(String api, JSONArray list) { public static JSONObject notifyAcs(String api, JSONArray list) {
log.info("下发ACS参数----------------------------------------+"+api+",---"+list.toString());
//判断是否连接ACS系统 //判断是否连接ACS系统
String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue(); String isConnect = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("IS_CONNECT_ACS").getValue();
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
@@ -33,6 +36,7 @@ public class AcsUtil {
.body(String.valueOf(list)) .body(String.valueOf(list))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);
log.info("ACS相应参数----------------------------------------+"+api+",---"+result.toString());
} catch (Exception e) { } catch (Exception e) {
String msg = e.getMessage(); String msg = e.getMessage();