From dcf65d113a1dd03d1ddff06d23e5b4336f7a93ef Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 21 Jul 2022 09:25:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A5=E9=BD=90=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api-sync/pom.xml | 6 ++ .../mipsdl/admin/client/http/ZaxyyClient.java | 64 +++++++++++-------- .../mipsdl/admin/req/UdiwmsOrderRequest.java | 1 + .../admin/req/UdiwmsPreInOrderRequest.java | 30 +-------- .../mipsdl/admin/req/ZaxzyyOrderRequest.java | 2 + 5 files changed, 48 insertions(+), 55 deletions(-) diff --git a/api-sync/pom.xml b/api-sync/pom.xml index f8a0cee..57b7849 100644 --- a/api-sync/pom.xml +++ b/api-sync/pom.xml @@ -177,6 +177,12 @@ cxf-spring-boot-starter-jaxws 3.5.2 + + + org.dom4j + dom4j + 2.1.3 + diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java index adc3c4f..1416c2c 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/ZaxyyClient.java @@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.mipsdl.admin.config.ThirdSysConfig; import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao; -import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysBusApiEntity; import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity; import com.glxp.mipsdl.admin.entity.zy.ZaZyHeareRequest; import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest; @@ -17,13 +16,16 @@ import com.glxp.mipsdl.admin.req.phxyy.PhBusTypeRequest; import com.glxp.mipsdl.admin.req.phxyy.PhProductRequest; import com.glxp.mipsdl.admin.req.phxyy.PhUnitRequest; import com.glxp.mipsdl.admin.req.phxyy.PhWarehouseRequest; -import com.glxp.mipsdl.admin.res.phxyy.BussinessOriginTypeResponse; import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService; import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService; import com.glxp.mipsdl.admin.util.HttpClient; import com.glxp.mipsdl.common.res.BaseResponse; import com.glxp.mipsdl.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; +import org.dom4j.Document; +import org.dom4j.DocumentException; +import org.dom4j.DocumentHelper; +import org.dom4j.io.SAXReader; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -66,9 +68,9 @@ public class ZaxyyClient { public BaseResponse testConnect() { - String msgHead = "\n" + - "\n" + - "getMasterialInput\n" + + String msgHead = "" + + "" + + "getMasterialInput" + ""; @@ -84,11 +86,11 @@ public class ZaxyyClient { public String getMsgHeader(String methodName) { - String msgHead = "\n" + - "\n" + + String msgHead = "" + + "" + "" + methodName + - "\n" + + "" + ""; return msgHead; } @@ -96,7 +98,7 @@ public class ZaxyyClient { public BaseResponse getUnit(PhUnitRequest unitRequest) { BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("corpUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("getUnit")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialUnit")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(unitRequest)); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), zaZyHeareRequest, getHeaderArray()); @@ -116,7 +118,7 @@ public class ZaxyyClient { BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("piQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("getProducts")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialDict")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsProductRequest)); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), zaZyHeareRequest, getHeaderArray()); @@ -136,7 +138,7 @@ public class ZaxyyClient { BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("busTypeQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("getOrderTypes")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialType")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsBusTypeRequest)); @@ -155,21 +157,22 @@ public class ZaxyyClient { public BaseResponse getOrders(UdiwmsOrderRequest udiwmsOrderRequest) { - if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { - return ResultVOUtils.error(500, "单据类型不能未空"); - } - if (StrUtil.isEmpty(udiwmsOrderRequest.getThirdSys())) { - return ResultVOUtils.error(500, "第三方系统ID不能为空"); - } - BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), thirdSysConfig.getThirdSysConfig().getThirdId()); - udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction()); +// if (StrUtil.isEmpty(udiwmsOrderRequest.getBillType())) { +// return ResultVOUtils.error(500, "单据类型不能未空"); +// } +// if (StrUtil.isEmpty(udiwmsOrderRequest.getThirdSys())) { +// return ResultVOUtils.error(500, "第三方系统ID不能为空"); +// } +// BussinessOriginTypeResponse bussinessOriginTypeResponse = bussinessOriginTypeService.findByKey(udiwmsOrderRequest.getBillType(), thirdSysConfig.getThirdSysConfig().getThirdId()); +// udiwmsOrderRequest.setBillType(bussinessOriginTypeResponse.getThirdAction()); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("getOrders")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialApply")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); - BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1); - String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysBusApiEntity.getUrl(), zaZyHeareRequest, getHeaderArray()); +// BasicThirdSysBusApiEntity basicThirdSysBusApiEntity = basicThirdSysBusApiService.selectByKey(bussinessOriginTypeResponse.getThirdAction(), bussinessOriginTypeResponse.getThirdSys(), 1); + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); + String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), zaZyHeareRequest, getHeaderArray()); try { BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { @@ -195,7 +198,7 @@ public class ZaxyyClient { interStr = basicThirdSysDetailEntity.getValue(); } ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("submitOrders")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMasterialInput")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOrderRequest)); @@ -219,7 +222,7 @@ public class ZaxyyClient { interStr = basicThirdSysDetailEntity.getValue(); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("submitPreInOrders")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("saveMaterialHight")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest)); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + interStr, zaZyHeareRequest, getHeaderArray()); @@ -238,9 +241,18 @@ public class ZaxyyClient { public BaseResponse getInvProducts(UdiwmsOnhandRequest udiwmsOnhandRequest) { BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("invPiUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("udiwmsWarehouseRequest")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialStorage")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsOnhandRequest)); String response = httpClient.postJson(thirdSysConfig.getThirdSysConfig().getThirdSysUrl() + basicThirdSysDetailEntity.getValue(), zaZyHeareRequest, getHeaderArray()); + + if (response.contains("() { @@ -255,7 +267,7 @@ public class ZaxyyClient { public BaseResponse getWarehouse(PhWarehouseRequest udiwmsWarehouseRequest) { ZaZyHeareRequest zaZyHeareRequest = new ZaZyHeareRequest(); - zaZyHeareRequest.setMsgHeader(getMsgHeader("udiwmsWarehouseRequest")); + zaZyHeareRequest.setMsgHeader(getMsgHeader("getMaterialDept")); zaZyHeareRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsWarehouseRequest)); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("warehouseQueryUrl", thirdSysConfig.getThirdSysConfig().getThirdId()); diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java index 947a019..6624a2e 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsOrderRequest.java @@ -34,6 +34,7 @@ public class UdiwmsOrderRequest { private String locInvCode; private String locInvName; private String locStorageCode; + private String actor; private String locStorageName; private List item; //单据详情数组 diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsPreInOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsPreInOrderRequest.java index 61f1b5c..56cc354 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsPreInOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/UdiwmsPreInOrderRequest.java @@ -1,69 +1,41 @@ package com.glxp.mipsdl.admin.req; -import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; -import lombok.NoArgsConstructor; import java.util.List; -@NoArgsConstructor @Data public class UdiwmsPreInOrderRequest { - @JsonProperty("billNo") private String billNo; - @JsonProperty("billdate") private String billdate; - @JsonProperty("corpId") private String corpId; - @JsonProperty("corpName") private String corpName; - @JsonProperty("locInvCode") private String locInvCode; - @JsonProperty("locInvName") private String locInvName; - @JsonProperty("actor") private String actor; - @JsonProperty("remark") + private String thirdSys; private String remark; - @JsonProperty("item") private List items; - @NoArgsConstructor @Data public static class ItemDTO { - @JsonProperty("code") private String code; - @JsonProperty("productId") private String productId; - @JsonProperty("productName") private String productName; - @JsonProperty("standard") private String standard; - @JsonProperty("expireDate") private String expireDate; - @JsonProperty("productDate") private String productDate; - @JsonProperty("batchNo") private String batchNo; - @JsonProperty("count") private Integer count; - @JsonProperty("measname") private String measname; - @JsonProperty("registerNo") private String registerNo; - @JsonProperty("price") private Double price; - @JsonProperty("secSalesInvNo") private String secSalesInvNo; - @JsonProperty("invoiceDate") private String invoiceDate; - @JsonProperty("secSalesListNo") private String secSalesListNo; - @JsonProperty("firstSalesInvNo") private String firstSalesInvNo; - @JsonProperty("remark") private String remark; } } diff --git a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java index f7a7d89..fb2dacc 100644 --- a/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java +++ b/api-sync/src/main/java/com/glxp/mipsdl/admin/req/ZaxzyyOrderRequest.java @@ -18,6 +18,8 @@ public class ZaxzyyOrderRequest { private String corpName; //往来单位 private String locInvCode; private String locInvName; + private String thirdSys; + private String actor; private List item; //单据详情数组 }