平和接口修改，长泰新增产品接口修改

src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java

@@ -145,55 +145,60 @@ public class CtqyyClient extends CommonHttpClient {
      */
     @Override
     public BaseResponse postRelProduct(PostRelProductRequest postThrInvProductsRequest) {
-        List<UdiRelevanceResponse> udiRelevanceResponses = postThrInvProductsRequest.getDatas();
+        UdiRelevanceResponse udiRelevanceResponse = postThrInvProductsRequest.getUdiRelevanceResponse();
 
-        if (CollUtil.isEmpty(udiRelevanceResponses)) {
+        if (udiRelevanceResponse == null) {
             return ResultVOUtils.error(500, "提交产品列表不能为空！");
         }
-        List<MaterialDictEntity> materialDictEntities = new ArrayList<>();
+        MaterialDictEntity materialDictEntity = new MaterialDictEntity();
-        for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
+        if (udiRelevanceResponse.getMainId().isEmpty() && StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid()))
-            MaterialDictEntity materialDictEntity = new MaterialDictEntity();
             materialDictEntity.setOperatType(1);
-            materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc());
+        else
-            materialDictEntity.setCostlySign(1);
+            materialDictEntity.setOperatType(2);
-            materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getNameCode());
+        materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc());
-            materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId());
+        materialDictEntity.setCostlySign(1);
-            materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh());
+        materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getNameCode());
-            materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname());
+        materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId());
-            //暂无区分进货价，零售价
+        materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh());
-            materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice());
+        materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname());
-            materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice());
+        //暂无区分进货价，零售价
-            materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory());
+        materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice());
-            materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName());
+        materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice());
-            materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm());
+        materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory());
-            materialDictEntity.setRegeditNo(udiRelevanceResponse.getZczbhhzbapzbh());
+        materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName());
-            //暂无中标标识
+        materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm());
-            materialDictEntity.setPublicFlag(null);
+        materialDictEntity.setRegeditNo(udiRelevanceResponse.getZczbhhzbapzbh());
-            materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8());
+        //暂无中标标识
-            //暂无收费标志
+        materialDictEntity.setPublicFlag(null);
-            materialDictEntity.setFeeFlag(null);
+        materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8());
-            materialDictEntities.add(materialDictEntity);
+        //暂无收费标志
-
+        materialDictEntity.setFeeFlag(null);
-            CtqyyRequest ctqyyRequest = new CtqyyRequest();
+
-            ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict"));
+        CtqyyRequest ctqyyRequest = new CtqyyRequest();
-            ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity));
+        ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict"));
-            String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest);
+        ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity));
-            response = parserResult(response);
+        String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest);
-            try {
+        response = parserResult(response);
-                log.error("提交新增产品信息：" + ctqyyRequest.getMsgBody());
+        try {
-                CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class);
+            log.error("提交新增产品信息：" + ctqyyRequest.getMsgBody());
-                if (baseResponse.getReturnCode() != 20000) {
+            CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class);
-                    log.error("提交新增产品信息，异常：{}", response);
+            if (baseResponse.getReturnCode() != 20000) {
-                } else {
+                String errMsg = "提交新增产品信息，异常：{}" + response;
-                    log.error("提交新增产品信息，成功：{}", response);
+                log.error(errMsg);
-                }
+                return ResultVOUtils.error(500, "提交新增产品失败！");
-            } catch (Exception e) {
+
-                log.error("提交新增产品信息，返回结果：{}", response);
+            } else {
-                log.error("异常信息：{}", e);
+//                materialDictEntity.setMaterialNo(baseResponse.getMaterialNo());
-//                return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")");
+                log.error("提交新增产品信息，成功：{}", response);
+                return ResultVOUtils.success(baseResponse.getMaterialNo());
             }
+        } catch (Exception e) {
+            String errMsg = "提交新增产品信息，异常：{}" + response;
+            log.error(errMsg);
+            log.error("异常信息：{}", e);
+            return ResultVOUtils.error(500, errMsg);
+
         }
-        return ResultVOUtils.success("新增成功！");
     }
 
 

src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java

@@ -185,10 +185,9 @@ public class PhxyyClient extends CommonHttpClient {
             } catch (Exception e) {
                 log.error("查询单据对应往来单位的第三方仓库信息异常", e);
             }
-        } else if (basicBussinessTypeEntity.getCorpType().equals(Constants.CORP_SP)) {
+        } else {
             //供应商
             BasicCorpEntity basicCorpEntity = basicCorpDao.selectByErpId(orderEntity.getFromCorp());
-
             if (null != basicCorpEntity) {
                 phOrderRequest.setCorpId(basicCorpEntity.getThirdId());
                 phOrderRequest.setCorpName(basicCorpEntity.getName());

src/main/java/com/glxp/mipsdl/entity/basic/BasicBussinessTypeEntity.java

@@ -307,8 +307,7 @@ public class BasicBussinessTypeEntity {
      * 是否供应商使用
      */
     @TableField(value = "spUse")
-    private Boolean spUse;
+    private int spUse;
-
     /**
      * 是否预验收单据类型
      */
@@ -339,4 +338,4 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "updateUser")
     private String updateUser;
 
-}
+}

src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java

@@ -86,4 +86,11 @@ public class MaterialDictEntity {
      */
     private Integer feeFlag;
 
+
+    /**
+     * 系统返回物资编码
+     * materialNo
+     */
+    private String materialNo;
+
 }

src/main/java/com/glxp/mipsdl/req/post/PostRelProductRequest.java

@@ -12,5 +12,6 @@ public class PostRelProductRequest {
     private String uploadType;
     private String thirdSys;
     List<UdiRelevanceResponse> datas;
+    UdiRelevanceResponse udiRelevanceResponse;
 
 }