diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java index d0cf42d..6e933ac 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java @@ -237,6 +237,12 @@ public class ThrProductsAddDiController { if (null != deleteRequest && deleteRequest.getId() == null) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); } + ThrProductsAddDiEntity thrProductsAddDiEntity=thrProductsAddDiService.filterThrProductsGetId(Integer.valueOf(deleteRequest.getId())); + if(thrProductsAddDiEntity!=null){ + if(thrProductsAddDiEntity.getStatus()!=1){ + return ResultVOUtils.error(877,"审批状态发生改变请刷新页面重新操作!"); + } + } thrProductsAddDiService.delThrDiProducts(Long.valueOf(deleteRequest.getId())); return ResultVOUtils.success(); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java index 7630ba8..659d1a3 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/thrsys/ThrProductsAddDiDao.java @@ -33,4 +33,7 @@ public interface ThrProductsAddDiDao { boolean updateDiProduct(ThrProductsAddDiEntity thrProductsAddDiEntity); UdiInfoEntity getDiProductDetail(@Param("uuid") String uuid); + + /** 根据ID查询 */ + ThrProductsAddDiEntity filterThrProductsGetId(@Param("id") Integer id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java index 757f32c..242d65a 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/ThrProductsAddDiService.java @@ -5,6 +5,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest; import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.sale.admin.res.thrsys.ThrProductsAddDiResponse; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,4 +29,7 @@ public interface ThrProductsAddDiService { boolean addThrAddDiProducts(AddThrDiProductsRequest thrDiProductsRequest); UdiInfoEntity getDiProductDetail(String uuid); + + /** 根据ID查询 */ + ThrProductsAddDiEntity filterThrProductsGetId( Integer id); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java index dd24718..e6c02f0 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/service/thrsys/impl/ThrProductsAddDiServiceImpl.java @@ -97,4 +97,9 @@ public class ThrProductsAddDiServiceImpl implements ThrProductsAddDiService { public UdiInfoEntity getDiProductDetail(String uuid) { return thrProductsAddDiDao.getDiProductDetail(uuid); } + + @Override + public ThrProductsAddDiEntity filterThrProductsGetId(Integer id) { + return thrProductsAddDiDao.filterThrProductsGetId(id); + } } diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 7b889a7..6906f4a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -306,6 +306,7 @@ + Group by basic_udirel.uuid ORDER BY modifyTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml index 27cee70..30b61cb 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml @@ -71,6 +71,14 @@ where id = #{id} + + + +