新增产品信息，往来单位信息提交到第三方系统

api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/PhxyyClient.java

@@ -1,7 +1,6 @@
 package com.glxp.mipsdl.admin.client.http;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ReflectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -19,14 +18,15 @@ import com.glxp.mipsdl.admin.dao.thrsys.ThrInvWarehouseDao;
 import com.glxp.mipsdl.admin.entity.basic.BasicThirdSysBusApiEntity;
 import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
-import com.glxp.mipsdl.admin.entity.basic.UnitMaintainEntity;
 import com.glxp.mipsdl.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
 import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
 import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
 import com.glxp.mipsdl.admin.entity.inventory.InvWarehouseEntity;
 import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity;
+import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity;
 import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
+import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.mipsdl.admin.req.UdiwmsOnhandRequest;
 import com.glxp.mipsdl.admin.req.UdiwmsOrderDetail;
 import com.glxp.mipsdl.admin.req.UdiwmsOrderRequest;
@@ -38,7 +38,7 @@ import com.glxp.mipsdl.admin.service.phxyy.BasicThirdSysBusApiService;
 import com.glxp.mipsdl.admin.service.phxyy.BussinessOriginTypeService;
 import com.glxp.mipsdl.admin.util.DateUtil;
 import com.glxp.mipsdl.admin.util.HttpClient;
-import com.glxp.mipsdl.admin.util.ThirdUtils;
+import com.glxp.mipsdl.admin.util.SubmitOrderUtils;
 import com.glxp.mipsdl.common.res.BaseResponse;
 import com.glxp.mipsdl.common.util.ResultVOUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -76,8 +76,6 @@ public class PhxyyClient {
     @Resource
     private ThrInvWarehouseDao thrInvWarehouseDao;
     @Resource
-    private UnitMaintainDao unitMaintainDao;
-    @Resource
     private BussinessTypeDao bussinessTypeDao;
     @Resource
     private BasicThirdSysDetailDao basicThirdSysDetailDao;
@@ -92,7 +90,8 @@ public class PhxyyClient {
     private BasicThirdSysBusApiService basicThirdSysBusApiService;
     @Resource
     private BussinessOriginTypeService bussinessOriginTypeService;
-
+    @Resource
+    SubmitOrderUtils submitOrderUtils;
 
     public HttpHeaders getHeaders() {
         HttpHeaders headers = new HttpHeaders();
@@ -185,7 +184,6 @@ public class PhxyyClient {
         }
         //查询单据和详情信息，组装第三方系统接口参数所需数据
         StockOrderEntity stockOrderEntity = stockOrderDao.findById(udiwmsOrderRequest.getId());
-
         OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk());
         List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId());
         udiwmsOrderRequest.setBillDate(stockOrderEntity.getBilldate());
@@ -202,7 +200,8 @@ public class PhxyyClient {
             return ResultVOUtils.error(500, "接口未配置，无法提交！");
         }
         String thirdId = getThirdId(thirdSysBusApiEntity);
-        udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode());
+//        udiwmsOrderRequest.setBillType(thirdSysBusApiEntity.getThirdBuyCode());
+        udiwmsOrderRequest.setBillType(submitOrderUtils.toBusType(stockOrderEntity.getBillType()));
         if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
             udiwmsOrderRequest.setCorpId(stockOrderEntity.getCorpName()); //往来单位编码，需转换为第三方系统的ID
             udiwmsOrderRequest.setCorpName(stockOrderEntity.getCorpName()); //往来单位名称，需转换为第三方系统的名称
@@ -222,18 +221,11 @@ public class PhxyyClient {
                 log.error("查询单据对应的第三方往来单位信息异常", e);
             }
         } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
-            //查询往来单位第三方系统对照编码
+            ThrCorpEntity thrCorpEntity = submitOrderUtils.toCorp(stockOrderEntity.getCorpId(), thirdId);
-            UnitMaintainEntity unitMaintainEntity = unitMaintainDao.selectThirdInfoByErpId(stockOrderEntity.getCorpId());
+            if (thrCorpEntity == null)
-            try {
+                return ResultVOUtils.error(500, "上传失败，往来单位未关联对应第三方产品编码！");
-                String thirdCorpId = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdId));
+            udiwmsOrderRequest.setCorpId(thrCorpEntity.getUnitId()); //往来单位编码，需转换为第三方系统的ID
-                udiwmsOrderRequest.setCorpId(thirdCorpId); //往来单位编码，需转换为第三方系统的ID
+            udiwmsOrderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称
-
-                String thirdName = ThirdUtils.getThirdName(thirdId);
-                String thirdCorpName = (String) ReflectUtil.getFieldValue(unitMaintainEntity, unitMaintainEntity.getClass().getField(thirdName));
-                udiwmsOrderRequest.setCorpName(thirdCorpName); //往来单位名称，需转换为第三方系统的名称
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
         }
 
         InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOneByCode(orderEntity.getFromSubInvCode());
@@ -244,7 +236,7 @@ public class PhxyyClient {
         } catch (Exception e) {
             log.error("查询第三方系统仓库异常", e);
         }
-        udiwmsOrderRequest.setBillFlag(stockOrderEntity.getBillFlag()); //单据状态
+        udiwmsOrderRequest.setBillFlag("1");
         //查询单据出入库类型
         String mainAction = bussinessTypeDao.selectInoutTypebByLocalAction(stockOrderEntity.getBillType());
         if (ConstantType.TYPE_PUT.equals(mainAction)) {
@@ -261,28 +253,31 @@ public class PhxyyClient {
             UdiwmsOrderDetail item = new UdiwmsOrderDetail();
             BeanUtil.copyProperties(stockOrderDetailEntity, item);
             if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) {
-                item.setProductDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate()));
+                item.setProductDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate()));
             }
             if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) {
-                item.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate()));
+                item.setExpireDate(com.glxp.mipsdl.admin.util.DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate()));
             }
             item.setMeasname(udiRelevanceEntity.getMeasname());
             item.setStandard(stockOrderDetailEntity.getSpec());
             item.setRegisterNo(stockOrderDetailEntity.getZczbhhzbapzbh());
             try {
-                String thirdProductId = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdId);
+                item.setPrice(stockOrderDetailEntity.getPrice());
-                item.setProductId(thirdProductId);
+                item.setFirstSalesInvNo(stockOrderDetailEntity.getFirstSalesInvNo());
-                String thirdName = ThirdUtils.getThirdName(thirdId);
+                item.setSecSalesInvNo(stockOrderDetailEntity.getSecSalesInvNo());
-                String thirdProductName = (String) ReflectUtil.getFieldValue(udiRelevanceEntity, thirdName);
+                item.setInvoiceDate(stockOrderDetailEntity.getInvoiceDate());
-                item.setProductName(thirdProductName);
+                item.setSecSalesListNo(stockOrderDetailEntity.getSecSalesListNo());
+                ThrProductsEntity thrProductsEntity = submitOrderUtils.toProduct(stockOrderDetailEntity, thirdId);
+                item.setProductId(thrProductsEntity.getCode());
+                item.setProductName(thrProductsEntity.getName());
                 items.add(item);
             } catch (Exception e) {
                 log.error(e.getMessage(), e);
             }
         }
+
         udiwmsOrderRequest.setItem(items);
         BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("orderSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
-
         //记录日志
         StockOrderUploadLogEntity uploadLog = new StockOrderUploadLogEntity();
         uploadLog.setBillDate(DateUtil.parseDate(udiwmsOrderRequest.getBillDate()));

api-sync/src/main/java/com/glxp/mipsdl/admin/client/http/TestClient.java

@@ -8,6 +8,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.github.pagehelper.PageInfo;
+import com.glxp.mipsdl.admin.config.ThirdSysConfig;
 import com.glxp.mipsdl.admin.constant.ConstantStatus;
 import com.glxp.mipsdl.admin.constant.ConstantType;
 import com.glxp.mipsdl.admin.dao.basic.BussinessTypeDao;
@@ -17,7 +18,11 @@ import com.glxp.mipsdl.admin.dao.business.StockOrderDetailDao;
 import com.glxp.mipsdl.admin.dao.business.StockOrderUploadLogDao;
 import com.glxp.mipsdl.admin.dao.inout.CodesDao;
 import com.glxp.mipsdl.admin.dao.inout.OrderDao;
-import com.glxp.mipsdl.admin.dao.test.*;
+import com.glxp.mipsdl.admin.dao.phxyy.BasicThirdSysDetailDao;
+import com.glxp.mipsdl.admin.dao.test.TestBusTypeDao;
+import com.glxp.mipsdl.admin.dao.test.TestCorpDao;
+import com.glxp.mipsdl.admin.dao.test.TestInvWarehouseDao;
+import com.glxp.mipsdl.admin.dao.test.TestProductDao;
 import com.glxp.mipsdl.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.mipsdl.admin.entity.basic.BussinessOriginTypeEntity;
 import com.glxp.mipsdl.admin.entity.basic.UdiRelevanceEntity;
@@ -26,6 +31,7 @@ import com.glxp.mipsdl.admin.entity.business.StockOrderEntity;
 import com.glxp.mipsdl.admin.entity.business.StockOrderUploadLogEntity;
 import com.glxp.mipsdl.admin.entity.inout.OrderEntity;
 import com.glxp.mipsdl.admin.entity.inout.WarehouseEntity;
+import com.glxp.mipsdl.admin.entity.phxyy.BasicThirdSysDetailEntity;
 import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity;
 import com.glxp.mipsdl.admin.entity.thrsys.ThrInvWarehouseEntity;
 import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity;
@@ -68,7 +74,10 @@ public class TestClient {
     TestProductDao testProductDao;
     @Value("${THIRD_ID}")
     private String thirdId;
-
+    @Resource
+    private BasicThirdSysDetailDao basicThirdSysDetailDao;
+    @Resource
+    private ThirdSysConfig thirdSysConfig;
 
     public BaseResponse testConnect() {
         return ResultVOUtils.success("连接成功！");
@@ -221,6 +230,28 @@ public class TestClient {
     }
 
 
+    /**
+     * 提交新增往来单位信息
+     */
+    public BaseResponse postThirdUnits(ThrCorpEntity thrCorpEntity) {
+
+        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("unitSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
+        String data = JSONUtil.toJsonStr(thrCorpEntity);
+        FileUtils.saveFileAs(data, "E:\\单据上传目录\\" + "往来单位信息_" + thirdId + "_" + thrCorpEntity.getUnitId() + ".json");
+        return ResultVOUtils.success("上传成功！");
+    }
+
+    /**
+     * 提交新增往来单位信息
+     */
+    public BaseResponse postThirdProductS(ThrProductsEntity thrProductsEntity) {
+        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailDao.selectByKey("productSubmitUrl", thirdSysConfig.getThirdSysConfig().getThirdId());
+        String data = JSONUtil.toJsonStr(thrProductsEntity);
+        FileUtils.saveFileAs(data, "E:\\单据上传目录\\" + "产品信息_" + thirdId + "_" + thrProductsEntity.getCode() + ".json");
+        return ResultVOUtils.success("上传成功！");
+    }
+
+
     @Resource
     SubmitOrderUtils submitOrderUtils;
     @Resource
@@ -243,22 +274,28 @@ public class TestClient {
             return ResultVOUtils.error(500, "单据ID不能为空！");
         }
         StockOrderEntity stockOrderEntity = stockOrderDao.findById(orderRequest.getId());
+        if (StrUtil.isEmpty(stockOrderEntity.getOrderIdFk())) {
+            return ResultVOUtils.error(500, "无法上传！");
+        }
         OrderEntity orderEntity = orderDao.findById(stockOrderEntity.getOrderIdFk());
         List<StockOrderDetailEntity> stockOrderDetailEntities = stockOrderDetailDao.findByOrderIdFk(stockOrderEntity.getId());
         BussinessLocalTypeEntity bussinessLocalTypeEntity = submitOrderUtils.getCurLocType(stockOrderEntity.getBillType());
         orderRequest.setBillDate(stockOrderEntity.getBilldate());
         orderRequest.setBillNo(stockOrderEntity.getBillNo());
         orderRequest.setBillType(submitOrderUtils.toBusType(stockOrderEntity.getBillType()));
+        orderRequest.setBillFlag("1");
 
         if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
             orderRequest.setCorpId(stockOrderEntity.getCorpName());
             orderRequest.setCorpName(stockOrderEntity.getCorpName());
         } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INNOR) {
-            ThrInvWarehouseEntity thrInvWarehouseEntity = submitOrderUtils.toInv(stockOrderEntity.getInvWarehouseCode(), thirdId);
+            ThrInvWarehouseEntity thrInvWarehouseEntity = submitOrderUtils.toInv(stockOrderEntity.getCorpId(), thirdId);
             orderRequest.setCorpId(thrInvWarehouseEntity.getCode());
             orderRequest.setCorpName(thrInvWarehouseEntity.getName());
         } else if (bussinessLocalTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_OUT) {
             ThrCorpEntity thrCorpEntity = submitOrderUtils.toCorp(stockOrderEntity.getCorpId(), thirdId);
+            if (thrCorpEntity == null)
+                return ResultVOUtils.error(500, "上传失败，往来单位未关联对应第三方产品编码！");
             orderRequest.setCorpId(thrCorpEntity.getUnitId()); //往来单位编码，需转换为第三方系统的ID
             orderRequest.setCorpName(thrCorpEntity.getName()); //往来单位名称，需转换为第三方系统的名称
         }
@@ -320,7 +357,7 @@ public class TestClient {
                 BaseResponse baseResponse =
                         JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
                         });
-                if (baseResponse.getCode().equals(20000)) {
+                if (baseResponse.getCode() == 20000) {
                     String thirdBillNo = String.valueOf(baseResponse.getData());
                     orderEntity.setExportStatus(1);
                     orderEntity.setThirdBillNo(thirdBillNo);

api-sync/src/main/java/com/glxp/mipsdl/admin/controller/ThirdGetController.java

@@ -0,0 +1,44 @@
+package com.glxp.mipsdl.admin.controller;
+
+import cn.hutool.core.util.StrUtil;
+import com.glxp.mipsdl.admin.http.UdiwmsClient;
+import com.glxp.mipsdl.admin.req.ThirdFilterInvRequest;
+import com.glxp.mipsdl.common.res.BaseResponse;
+import com.glxp.mipsdl.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * 被动查询
+ */
+
+@RestController
+public class ThirdGetController {
+
+
+    @Resource
+    UdiwmsClient udiwmsClient;
+
+
+    @PostMapping("/udiwms/inv/products/filter")
+    public BaseResponse filterInv(@RequestBody ThirdFilterInvRequest thirdFilterInvRequest) {
+
+        if (thirdFilterInvRequest == null)
+            return ResultVOUtils.error(500, "查询条件不能为空！");
+
+
+        if (StrUtil.isEmpty(thirdFilterInvRequest.getBatchNo()) &&
+                StrUtil.isEmpty(thirdFilterInvRequest.getProductName()) &&
+                StrUtil.isEmpty(thirdFilterInvRequest.getDiCode()) &&
+                StrUtil.isEmpty(thirdFilterInvRequest.getSupName())) {
+            return ResultVOUtils.error(500, "查询条件不能为空！");
+        }
+        return ResultVOUtils.success(udiwmsClient.postFilterInv(thirdFilterInvRequest));
+
+
+    }
+}
+

api-sync/src/main/java/com/glxp/mipsdl/admin/controller/UdiWmsController.java

@@ -3,6 +3,8 @@ package com.glxp.mipsdl.admin.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.glxp.mipsdl.admin.annotation.AuthRuleAnnotation;
 import com.glxp.mipsdl.admin.client.http.*;
+import com.glxp.mipsdl.admin.entity.thrsys.ThrCorpEntity;
+import com.glxp.mipsdl.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.mipsdl.admin.http.request.USignRequest;
 import com.glxp.mipsdl.admin.req.*;
 import com.glxp.mipsdl.admin.req.phxyy.*;
@@ -163,6 +165,39 @@ public class UdiWmsController {
     }
 
 
+    //获取库存产品基本信息（批次号，生产日期，失效日期，仓位号）
+    @PostMapping("/udiwms/erp/inv/getEnvProduct")
+    public BaseResponse getEnvProduct(@RequestBody UdiwmsOnhandRequest udiwmsOnhandRequest) {
+        if (curFlag.equals("YONGYOU_U8_V3.1")) {
+            return pzhzdClient.getInvProducts(udiwmsOnhandRequest);
+        } else if (curFlag.equals("TEST")) {
+            return testClient.getEnvProduct(udiwmsOnhandRequest);
+        } else if (curFlag.equals("ZAXZYY")) {
+            return zaxyyClient.getInvProducts(udiwmsOnhandRequest);
+        } else
+            return ResultVOUtils.error(500, "未设置系统版本！");
+    }
+
+    //提交第三方产品信息
+    @PostMapping("/udiwms/erp/post/product")
+    public BaseResponse postProduct(@RequestBody ThrProductsEntity thrProductsEntity) {
+        if (curFlag.equals("TEST")) {
+            return testClient.postThirdProductS(thrProductsEntity);
+        } else
+            return ResultVOUtils.error(500, "未设置系统版本！");
+    }
+
+
+    //提交第三方往来单位信息
+    @PostMapping("/udiwms/erp/post/unit")
+    public BaseResponse postUnit(@RequestBody ThrCorpEntity thrCorpEntity) {
+        if (curFlag.equals("TEST")) {
+            return testClient.postThirdUnits(thrCorpEntity);
+        } else
+            return ResultVOUtils.error(500, "未设置系统版本！");
+    }
+
+
     //提交单据
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/erp/preIn/submitOrders")
@@ -201,20 +236,6 @@ public class UdiWmsController {
         return ResultVOUtils.success("修改成功");
     }
 
-    //获取库存产品基本信息（批次号，生产日期，失效日期，仓位号）
-    @PostMapping("/udiwms/erp/inv/getEnvProduct")
-    public BaseResponse getEnvProduct(@RequestBody UdiwmsOnhandRequest udiwmsOnhandRequest) {
-        if (curFlag.equals("YONGYOU_U8_V3.1")) {
-            return pzhzdClient.getInvProducts(udiwmsOnhandRequest);
-        } else if (curFlag.equals("TEST")) {
-            return testClient.getEnvProduct(udiwmsOnhandRequest);
-        } else if (curFlag.equals("ZAXZYY")) {
-            return zaxyyClient.getInvProducts(udiwmsOnhandRequest);
-        } else
-            return ResultVOUtils.error(500, "未设置系统版本！");
-
-    }
-
 
     //修改ERP订单接口
     @PostMapping("/udiwms/erp/modifyBill")

api-sync/src/main/java/com/glxp/mipsdl/admin/http/UdiwmsClient.java

@@ -3,6 +3,7 @@ package com.glxp.mipsdl.admin.http;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.glxp.mipsdl.admin.req.ThirdFilterInvRequest;
 import com.glxp.mipsdl.admin.req.system.PostFileThrOrderRequest;
 import com.glxp.mipsdl.admin.req.system.PostThrCorpRequest;
 import com.glxp.mipsdl.admin.req.system.PostThrInvProductsRequest;
@@ -90,5 +91,13 @@ public class UdiwmsClient {
         return baseResponse;
     }
 
+    public BaseResponse postFilterInv(ThirdFilterInvRequest thirdFilterInvRequest) {
+        String response = httpClient.postJson(udiWmsUrl + "/udiwms/inv/products/filter", thirdFilterInvRequest, getHeaderArray());
+        BaseResponse baseResponse =
+                JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
+                });
+        return baseResponse;
+    }
+
 
 }

api-sync/src/main/java/com/glxp/mipsdl/admin/req/ThirdFilterInvRequest.java

@@ -0,0 +1,18 @@
+package com.glxp.mipsdl.admin.req;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class ThirdFilterInvRequest extends ListPageRequest {
+    @JsonProperty("diCode")
+    private String diCode;
+    @JsonProperty("productName")
+    private String productName;
+    @JsonProperty("batchNo")
+    private String batchNo;
+    @JsonProperty("supName")
+    private String supName;
+}

api-sync/src/main/java/com/glxp/mipsdl/admin/res/system/InvThirdGetResponse.java

@@ -0,0 +1,44 @@
+package com.glxp.mipsdl.admin.res.system;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class InvThirdGetResponse {
+
+
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("productName")
+    private String productName;
+    @JsonProperty("diCode")
+    private String diCode;
+    @JsonProperty("spec")
+    private String spec;
+    @JsonProperty("batchNo")
+    private String batchNo;
+    @JsonProperty("productionDate")
+    private String productionDate;
+    @JsonProperty("expireDate")
+    private String expireDate;
+    @JsonProperty("registerCompany")
+    private String registerCompany;
+    @JsonProperty("registerCert")
+    private String registerCert;
+    @JsonProperty("inCount")
+    private Integer inCount;
+    @JsonProperty("outCount")
+    private Integer outCount;
+    @JsonProperty("supName")
+    private String supName;
+    @JsonProperty("invStorageCode")
+    private String invStorageCode;
+    @JsonProperty("invStorageName")
+    private String invStorageName;
+    @JsonProperty("invSubStorageName")
+    private String invSubStorageName;
+    @JsonProperty("invWarehouseCode")
+    private String invWarehouseCode;
+}

api-sync/src/main/java/com/glxp/mipsdl/admin/util/HttpClient.java

@@ -13,6 +13,7 @@ import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 @Service
 public class HttpClient {
@@ -79,4 +80,17 @@ public class HttpClient {
         return response;
     }
 
+
+    public String get(String url, Map<String, String> params, String... headers) {
+        String response = "";
+        try {
+            response = okHttpCli.doGet(url, params, headers);
+        } catch (Exception e) {
+            response = "网络错误，或远程服务器无法异常，无法连接！";
+        }
+        logger.error(response);
+        return response;
+    }
+
+
 }

api-sync/src/main/java/com/glxp/mipsdl/admin/util/SubmitOrderUtils.java

@@ -78,7 +78,7 @@ public class SubmitOrderUtils {
         } catch (Exception e) {
             log.error(e.getMessage(), e);
         }
-        return thrCorpEntity;
+        return null;
     }
 
     //转换第三方仓库信息

api-sync/src/main/resources/application-pro.properties

@@ -2,8 +2,8 @@
 server.port=9997
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.jdbc-url=jdbc:mysql://192.168.235.137:33306/udiwms_erp?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-#spring.datasource.jdbc-url=jdbc:mysql://192.168.0.148:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://192.168.0.109:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
-spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
 spring.datasource.password=123456
 #spring.datasource.password=89083fb2fc145533