diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java index cac446d..de376e9 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/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 udiRelevanceResponses = postThrInvProductsRequest.getDatas(); + UdiRelevanceResponse udiRelevanceResponse = postThrInvProductsRequest.getUdiRelevanceResponse(); - if (CollUtil.isEmpty(udiRelevanceResponses)) { + if (udiRelevanceResponse == null) { return ResultVOUtils.error(500, "提交产品列表不能为空！"); } - List materialDictEntities = new ArrayList<>(); - for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { - MaterialDictEntity materialDictEntity = new MaterialDictEntity(); + MaterialDictEntity materialDictEntity = new MaterialDictEntity(); + if (udiRelevanceResponse.getMainId().isEmpty() && StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) materialDictEntity.setOperatType(1); - materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc()); - materialDictEntity.setCostlySign(1); - materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getNameCode()); - materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId()); - materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh()); - materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname()); - //暂无区分进货价，零售价 - materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice()); - materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice()); - materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory()); - materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName()); - materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm()); - materialDictEntity.setRegeditNo(udiRelevanceResponse.getZczbhhzbapzbh()); - //暂无中标标识 - materialDictEntity.setPublicFlag(null); - materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8()); - //暂无收费标志 - materialDictEntity.setFeeFlag(null); - materialDictEntities.add(materialDictEntity); - - CtqyyRequest ctqyyRequest = new CtqyyRequest(); - ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict")); - ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity)); - String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest); - response = parserResult(response); - try { - log.error("提交新增产品信息：" + ctqyyRequest.getMsgBody()); - CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class); - if (baseResponse.getReturnCode() != 20000) { - log.error("提交新增产品信息，异常：{}", response); - } else { - log.error("提交新增产品信息，成功：{}", response); - } - } catch (Exception e) { - log.error("提交新增产品信息，返回结果：{}", response); - log.error("异常信息：{}", e); -// return ResultVOUtils.error(500, "网络错误，或远程服务器异常无法返回正确结果（" + response + ")"); + else + materialDictEntity.setOperatType(2); + materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc()); + materialDictEntity.setCostlySign(1); + materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getNameCode()); + materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId()); + materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh()); + materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname()); + //暂无区分进货价，零售价 + materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice()); + materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice()); + materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory()); + materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName()); + materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm()); + materialDictEntity.setRegeditNo(udiRelevanceResponse.getZczbhhzbapzbh()); + //暂无中标标识 + materialDictEntity.setPublicFlag(null); + materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8()); + //暂无收费标志 + materialDictEntity.setFeeFlag(null); + + CtqyyRequest ctqyyRequest = new CtqyyRequest(); + ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict")); + ctqyyRequest.setMsgBody(JSONUtil.toJsonStr(materialDictEntity)); + String response = httpClient.postJson(thrSystemDetailService.getUrlExclude(Constants.URL_NAME_PRODUCT_SUBMIT_URL), ctqyyRequest); + response = parserResult(response); + try { + log.error("提交新增产品信息：" + ctqyyRequest.getMsgBody()); + CtBaseResponse baseResponse = JSONObject.parseObject(response, CtBaseResponse.class); + if (baseResponse.getReturnCode() != 20000) { + String errMsg = "提交新增产品信息，异常：{}" + response; + log.error(errMsg); + return ResultVOUtils.error(500, "提交新增产品失败！"); + + } else { +// materialDictEntity.setMaterialNo(baseResponse.getMaterialNo()); + 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("新增成功！"); } diff --git a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java b/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java index 93c2d0e..4d185ad 100644 --- a/src/main/java/com/glxp/mipsdl/client/phxyy/PhxyyClient.java +++ b/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()); diff --git a/src/main/java/com/glxp/mipsdl/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/mipsdl/entity/basic/BasicBussinessTypeEntity.java index 3bdd905..ac0855f 100644 --- a/src/main/java/com/glxp/mipsdl/entity/basic/BasicBussinessTypeEntity.java +++ b/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; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java b/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java index 983e22b..47e6b14 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java @@ -86,4 +86,11 @@ public class MaterialDictEntity { */ private Integer feeFlag; + + /** + * 系统返回物资编码 + * materialNo + */ + private String materialNo; + } diff --git a/src/main/java/com/glxp/mipsdl/req/post/PostRelProductRequest.java b/src/main/java/com/glxp/mipsdl/req/post/PostRelProductRequest.java index a7a33fd..a29a532 100644 --- a/src/main/java/com/glxp/mipsdl/req/post/PostRelProductRequest.java +++ b/src/main/java/com/glxp/mipsdl/req/post/PostRelProductRequest.java @@ -12,5 +12,6 @@ public class PostRelProductRequest { private String uploadType; private String thirdSys; List datas; + UdiRelevanceResponse udiRelevanceResponse; }