diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 6b2baf7c..facddda2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -635,7 +635,14 @@ public class WareHouseController { } } } - + if (bussinessTypeEntity.isPreIn()) { + if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) { + List invProductDetailEntities = invPreInProductDetailService.findByOriginCode(code); + if(CollUtil.isNotEmpty(invProductDetailEntities)){ + return ResultVOUtils.error(500, "条码已存在!"); + } + } + } //预验收校验 if (addOrderRequest.isPreCheck()) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java index bf1820b8..921e039f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvPreInProductDetailService.java @@ -8,6 +8,7 @@ import com.glxp.api.admin.res.inventory.InvProductDetailJoinResponse; import java.util.List; public interface InvPreInProductDetailService { + List findByOriginCode(String code); List filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java index 87c7b5b6..064ef6b6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java @@ -29,6 +29,14 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe @Resource InvPreInProductDao invPreInProductDao; + @Override + public List findByOriginCode(String code) { + FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest(); + filterInvProductDetailRequest.setOriginCode(code); + List invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest); + return invProductDetailEntities; + } + @Override public List filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) { if (filterInvProductDetailRequest == null) {