diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index e7a3dc27..cf666732 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -85,6 +85,7 @@ public class UdiInfoResponse { private String basicPrductRemak6; private String basicPrductRemak7; private String basicPrductRemak8; + private String remark; public Integer getId() { return id; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index 4928d49f..6afe1238 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -133,13 +133,23 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { public UdiInfoResponse getDiProductDetail(String uuid) { ThrProductsAddDiEntity thrProductsAddDiEntity = thrProductsAddDiDao.filterThrProductsGetUuid(uuid); UdiInfoResponse udiInfoResponse = thrProductsAddDiDao.getDiProductDetail(uuid); - udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm()); - udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm()); - udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); - udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms()); - udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname()); - udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); - udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice()); + if(udiInfoResponse!=null){ + udiInfoResponse.setSptm(thrProductsAddDiEntity.getSptm()); + udiInfoResponse.setYbbm(thrProductsAddDiEntity.getYbbm()); + udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); + udiInfoResponse.setCpms(thrProductsAddDiEntity.getCpms()); + udiInfoResponse.setMeasname(thrProductsAddDiEntity.getMeasname()); + udiInfoResponse.setManufactory(thrProductsAddDiEntity.getManufactory()); + udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice()); + udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1()); + udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2()); + udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3()); + udiInfoResponse.setBasicPrductRemak4(thrProductsAddDiEntity.getBasicPrductRemak4()); + udiInfoResponse.setBasicPrductRemak5(thrProductsAddDiEntity.getBasicPrductRemak5()); + udiInfoResponse.setBasicPrductRemak6(thrProductsAddDiEntity.getBasicPrductRemak6()); + udiInfoResponse.setBasicPrductRemak7(thrProductsAddDiEntity.getBasicPrductRemak7()); + udiInfoResponse.setBasicPrductRemak8(thrProductsAddDiEntity.getBasicPrductRemak8()); + } return udiInfoResponse; }