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 de376e9..af2b3a0 100644 --- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java +++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java @@ -152,18 +152,18 @@ public class CtqyyClient extends CommonHttpClient { } MaterialDictEntity materialDictEntity = new MaterialDictEntity(); if (udiRelevanceResponse.getMainId().isEmpty() && StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) - materialDictEntity.setOperatType(1); + materialDictEntity.setOperatType("1"); else - materialDictEntity.setOperatType(2); + materialDictEntity.setOperatType("2"); materialDictEntity.setMaterialName(udiRelevanceResponse.getCpmctymc()); - materialDictEntity.setCostlySign(1); - materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getNameCode()); + materialDictEntity.setCostlySign("1"); + materialDictEntity.setMaterialMasterCode(udiRelevanceResponse.getNameCode()); materialDictEntity.setHisMaterialCode(udiRelevanceResponse.getMainId()); materialDictEntity.setMaterialSpec(udiRelevanceResponse.getGgxh()); materialDictEntity.setMaterialUnit(udiRelevanceResponse.getMeasname()); //暂无区分进货价,零售价 - materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice()); - materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice()); + materialDictEntity.setImportPrice(udiRelevanceResponse.getPrice() == null ? null : udiRelevanceResponse.getPrice().toString()); + materialDictEntity.setRetailPrice(udiRelevanceResponse.getPrice() == null ? null : udiRelevanceResponse.getPrice().toString()); materialDictEntity.setFactoryName(udiRelevanceResponse.getManufactory()); materialDictEntity.setSupplierName(udiRelevanceResponse.getSupName()); materialDictEntity.setInsuranceCode(udiRelevanceResponse.getYbbm()); @@ -172,7 +172,7 @@ public class CtqyyClient extends CommonHttpClient { materialDictEntity.setPublicFlag(null); materialDictEntity.setPriceItemClass(udiRelevanceResponse.getBasicPrductRemak8()); //暂无收费标志 - materialDictEntity.setFeeFlag(null); + materialDictEntity.setFeeFlag("1"); CtqyyRequest ctqyyRequest = new CtqyyRequest(); ctqyyRequest.setMsgHeader(getMsgHeader("addMaterialDict")); 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 47e6b14..a2893c0 100644 --- a/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java +++ b/src/main/java/com/glxp/mipsdl/entity/ctqyy/MaterialDictEntity.java @@ -13,7 +13,7 @@ public class MaterialDictEntity { * 2修改 * 9作废 */ - private Integer operatType; + private String operatType; /** * 物资名称 */ @@ -22,7 +22,7 @@ public class MaterialDictEntity { * 高值耗材标志 * 1高值,0低值 */ - private Integer costlySign; + private String costlySign; /** * 物资码 * 高值,不能为空 @@ -44,11 +44,11 @@ public class MaterialDictEntity { /** * 进货价 */ - private BigDecimal importPrice; + private String importPrice; /** * 零售价 */ - private BigDecimal retailPrice; + private String retailPrice; /** * 生产厂家代码 */ @@ -84,7 +84,7 @@ public class MaterialDictEntity { /** * 收费标志 */ - private Integer feeFlag; + private String feeFlag; /**