第三方单据修改

master
anthonyywj2 3 years ago
parent d82d01f143
commit 99faf1988c

@ -131,6 +131,11 @@ public class PhxyyClient {
} }
BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray()); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), udiwmsOrderRequest, getHeaderArray());
BaseResponse baseResponse = BaseResponse baseResponse =
JSONObject.parseObject(response, new TypeReference<BaseResponse>() { JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
}); });

@ -232,7 +232,7 @@ public class ZaxyyClient {
} }
public BaseResponse submitOrders(ZaxzyyOrderRequest udiwmsOrderRequest) { public BaseResponse submitOrders(ZaxzyyOrderRequest udiwmsOrderRequest) {
if (StrUtil.isBlank(udiwmsOrderRequest.getId())) { if (StrUtil.isEmpty(udiwmsOrderRequest.getId())) {
return ResultVOUtils.error(500, "单据ID不能为空"); return ResultVOUtils.error(500, "单据ID不能为空");
} }
//查询单据和详情信息,组装第三方系统接口参数所需数据 //查询单据和详情信息,组装第三方系统接口参数所需数据
@ -252,9 +252,7 @@ public class ZaxyyClient {
if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) { if (StrUtil.isBlank(thirdSysBusApiEntity.getUrl())) {
return ResultVOUtils.error(500, "接口未配置,无法提交!"); return ResultVOUtils.error(500, "接口未配置,无法提交!");
} }
String thirdId = getThirdId(thirdSysBusApiEntity); String thirdId = getThirdId(thirdSysBusApiEntity);
udiwmsOrderRequest.setThirdSys(thirdId); //第三方系统标识 udiwmsOrderRequest.setThirdSys(thirdId); //第三方系统标识
udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode()); udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode());
@ -368,6 +366,8 @@ public class ZaxyyClient {
zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest));
} else if (thirdSysBusApiEntity.getUrl().equals("saveMaterialHight")) { } else if (thirdSysBusApiEntity.getUrl().equals("saveMaterialHight")) {
//临床出库 //临床出库
udiwmsOrderRequest.setLocInvCode(udiwmsOrderRequest.getLocStorageCode());
udiwmsOrderRequest.setLocInvName(udiwmsOrderRequest.getLocStorageName());
zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
key = "preInOrderSubmit"; key = "preInOrderSubmit";

@ -156,8 +156,6 @@ public class UdiWmsController {
} else if (curFlag.equals("ZAXZYY")) { } else if (curFlag.equals("ZAXZYY")) {
ZaxzyyOrderRequest zaxzyyOrderRequest = new ZaxzyyOrderRequest(); ZaxzyyOrderRequest zaxzyyOrderRequest = new ZaxzyyOrderRequest();
BeanUtil.copyProperties(udiwmsOrderRequest, zaxzyyOrderRequest); BeanUtil.copyProperties(udiwmsOrderRequest, zaxzyyOrderRequest);
zaxzyyOrderRequest.setLocInvCode(udiwmsOrderRequest.getLocStorageCode());
zaxzyyOrderRequest.setLocInvName(udiwmsOrderRequest.getLocStorageName());
return zaxyyClient.submitOrders(zaxzyyOrderRequest); return zaxyyClient.submitOrders(zaxzyyOrderRequest);
} }
return ResultVOUtils.error(500, "当前第三方系统不支持提交单据!"); return ResultVOUtils.error(500, "当前第三方系统不支持提交单据!");

Loading…
Cancel
Save