From a2944efa3e8b687d7fcb7e703c763fdbf77c8a95 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Apr 2023 20:43:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/UdiRelevanceController.java | 1 + .../api/entity/basic/UdiProductEntity.java | 10 ++ .../api/req/basic/FilterUdiRelRequest.java | 7 +- .../req/basic/UdiRelevanceSaveRequest.java | 9 +- .../mybatis/mapper/basic/UdiProductDao.xml | 3 + .../mybatis/mapper/basic/UdiRelevanceDao.xml | 154 ++++++++++-------- 6 files changed, 112 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index b84edc8f..822c2a8e 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -317,6 +317,7 @@ public class UdiRelevanceController extends BaseController { udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch()); udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire()); udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct()); + udiProductEntity.setAllowNoSerial(udiRelevanceSaveRequest.getAllowNoSerial()); udiProductEntity.setZxxsbzbhsydysl(udiRelevanceEntity.getUseNum()); udiProductEntity.setBasicPrductRemak1(udiRelevanceSaveRequest.getBasicPrductRemak1()); udiProductEntity.setBasicPrductRemak2(udiRelevanceSaveRequest.getBasicPrductRemak2()); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index d725ed77..160b6c0b 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -47,6 +47,7 @@ public class UdiProductEntity { private Boolean allowNoBatch; private Boolean allowNoExpire; private Boolean allowNoProduct; + private Boolean allowNoSerial; private String spmc; private String cplx; private String hchzsb; @@ -78,6 +79,9 @@ public class UdiProductEntity { private String supId; + private Integer relSupId; + + public Boolean getAllowNoBatch() { if (allowNoBatch == null) return false; @@ -96,5 +100,11 @@ public class UdiProductEntity { return allowNoProduct; } + public Boolean getAllowNoSerial() { + if (allowNoSerial == null) + return false; + return allowNoSerial; + } + } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 043503cb..6c3efdb2 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -12,6 +12,7 @@ public class FilterUdiRelRequest extends ListPageRequest { private String cpmctymc; private String nameCode; private String uuid; + private String originUuid; private String ggxh; private String thirdId; private Long id; @@ -56,12 +57,16 @@ public class FilterUdiRelRequest extends ListPageRequest { private String uniqueNameCode; private String supName; private String unitFk; - private String originUuid; private String relId; private String companyName; private String bindRlIds; private String relCode; private String bindType; + private String certIdFk; + private String manufactory; + private String tyshxydm; + private Boolean dispatch; + private Boolean groupBuy; } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index c1a09123..68603f09 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -70,6 +70,7 @@ public class UdiRelevanceSaveRequest { private Boolean allowNoBatch; private Boolean allowNoExpire; private Boolean allowNoProduct; + private Boolean allowNoSerial; private String spmc; private String cplx; private String hchzsb; @@ -85,17 +86,19 @@ public class UdiRelevanceSaveRequest { private String price; private Integer useExpireTime; - //关联修改提交:true;单独提交:false - private Boolean relSubmit; - private Integer lowStockNum; private Integer overStockNum; private Integer recentDateTime; private Integer isDateBy; private String relCode; + //关联修改提交:true;单独提交:false + private Boolean relSubmit; + private boolean dispatch; //是否可配送 private boolean groupBuy; //是否集采产品 + private boolean needCert; //是否需要资质材料 + private String certIdFk; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml index de638dc7..4421c271 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml @@ -301,6 +301,9 @@ allowNoBatch=#{allowNoBatch}, allowNoExpire=#{allowNoExpire}, allowNoProduct=#{allowNoProduct}, + + allowNoSerial=#{allowNoSerial}, + spmc=#{spmc}, cplx=#{cplx}, hchzsb=#{hchzsb}, diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 2182f30b..e664e1f6 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -251,59 +251,62 @@ @@ -761,6 +776,9 @@ relCode=#{relCode}, + + needCert=#{needCert}, + WHERE id = #{id}