From df00fdc69e154ff2864500324e65aeb54f884bf1 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 15 Oct 2024 18:26:58 +0800 Subject: [PATCH] =?UTF-8?q?10/15=20=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=99=A8=E6=A2=B0=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/BasicProductCategoryController.java | 1 + .../basic/UdiContrastController.java | 3 +++ .../basic/UdiRelevanceController.java | 4 +--- .../collect/IoCollectOrderController.java | 19 +++++++++++++++++-- .../req/basic/FilterUdiProductRequest.java | 1 + .../BasicProductCategoryServiceImpl.java | 10 ++++++++-- .../api/service/basic/UdiProductService.java | 2 ++ .../glxp/api/service/sync/HeartService.java | 1 + .../basic/BasicProductCategoryRelMapper.xml | 3 +++ .../mybatis/mapper/basic/UdiRelevanceDao.xml | 3 +++ 10 files changed, 40 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java index 11ad37860..21fbfbb4d 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductCategoryController.java @@ -266,6 +266,7 @@ public class BasicProductCategoryController { filterUdiProductRequest.setUnionCode(filterUdiRelRequest.getUnionCode()); filterUdiProductRequest.setThrPiId(filterUdiRelRequest.getThrPiId()); filterUdiProductRequest.setNameCode(filterUdiRelRequest.getNameCode()); + filterUdiProductRequest.setProductsType(filterUdiRelRequest.getProductsType()); filterUdiProductRequest.setExistid(list); udiRelevanceResponses = basicProductCategoryService.selectAll(filterUdiProductRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index 8a134e0ae..64cc4361f 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -279,6 +279,9 @@ public class UdiContrastController { UdiInfoRequest.setUuid(CustomUtil.getUUId()); UdiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); UdiInfoRequest.setDiType(1); + UdiInfoRequest.setRequireScanCode(1); + UdiInfoRequest.setProductsType(1); + UdiInfoRequest.setPackLevel(1 + ""); udiProductService.insertUdiInfo(UdiInfoRequest); udiRelevanceEntity.setUuid(UdiInfoRequest.getUuid()); udiRelevanceEntity.setUpdateTime(new Date()); 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 3f5757d00..a2f1b5b40 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -152,7 +152,6 @@ public class UdiRelevanceController extends BaseController { List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (temps != null && temps.size() > 0) { filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); -// filterUdiRelRequest.setNameCode(null);原为空 } } @@ -162,10 +161,9 @@ public class UdiRelevanceController extends BaseController { List temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest); if (temps != null && temps.size() > 0) { filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid()); + filterUdiRelRequest.setNameCode(null); } - filterUdiRelRequest.setNameCode(null); } - } else { filterUdiRelRequest.setDiType(1); } diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java index 4b597d430..df7b9813c 100644 --- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java +++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java @@ -422,12 +422,27 @@ public class IoCollectOrderController extends BaseController { CollectOrderBizRequest collectOrderBizRequest = new CollectOrderBizRequest(); collectOrderBizRequest.setOrderIdFk(collectOrderRequest.getBillNo()); List collectOrderBizResponses = collectOrderService.combieOrderDetail(collectOrderBizRequest); + // 全部自动赋码 boolean isAllTag = collectOrderBizResponses.stream() .allMatch(obj -> obj.getAutoTagStatus() == 2); -// StrUtil.isNotEmpty(obj.getFinishUdiCode()) || boolean isAllTag2 = collectOrderBizResponses.stream() .allMatch(obj -> IntUtil.value(obj.getScanActCount()) >= IntUtil.value(obj.getCount())); - return ResultVOUtils.success(isAllTag || isAllTag2); + if (isAllTag || isAllTag2){ + return ResultVOUtils.success(true); + } + //如果有一条自动赋码的 + boolean isAllTag3 = collectOrderBizResponses.stream() + .anyMatch(obj -> obj.getAutoTagStatus() == 2); + if (isAllTag3){ + //过滤掉自动赋码的 + boolean isAllTag4 = collectOrderBizResponses.stream() + .filter(obj -> obj.getAutoTagStatus() != 2) + .allMatch(obj -> IntUtil.value(obj.getScanActCount()) >= IntUtil.value(obj.getCount())); + if (isAllTag4){ + return ResultVOUtils.success(true); + } + } + return ResultVOUtils.success(false); } diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiProductRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiProductRequest.java index 98fa46517..99cfb9b92 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiProductRequest.java @@ -21,6 +21,7 @@ public class FilterUdiProductRequest extends ListPageRequest { private String thrPiId; private String originUuid; private Integer diType; + private Integer productsType; private List existid; diff --git a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java index 44f227da2..33d294f1e 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/BasicProductCategoryServiceImpl.java @@ -55,7 +55,7 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ if (basicProductTypeFilterRequest.getType() != null && basicProductTypeFilterRequest.getType() == 1 && StrUtil.isNotEmpty(basicProductTypeFilterRequest.getCode())) { List basicProductCategories = basicProductCategoryMapper.selectLowTypeAll(basicProductTypeFilterRequest.getCode()); List ids = basicProductCategories.stream().map(BasicProductCategory::getId).collect(Collectors.toList()); - ew.notIn("id", ids); +// ew.notIn("id", ids); } List list = basicProductCategoryMapper.selectList(ew); return list; @@ -113,6 +113,8 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ basicProductCategory.setName(basicProductTypeRequest.getName()); basicProductCategory.setParentCode(basicProductTypeRequest.getParentCode()); basicProductCategory.setRemark(basicProductTypeRequest.getRemark()); + basicProductCategory.setDeptCode(basicProductTypeRequest.getDeptCode()); + basicProductCategory.setInvCode(basicProductTypeRequest.getInvCode()); Long userId = customerService.getUserId(); basicProductCategory.setCreateUser(userId + ""); basicProductCategory.setUpdateUser(userId + ""); @@ -120,7 +122,11 @@ public class BasicProductCategoryServiceImpl implements BasicProductCategoryServ QueryWrapper ew = new QueryWrapper<>(); ew.select("max(code) as code"); BasicProductCategory basicProductCategory1 = basicProductCategoryMapper.selectOne(ew); - basicProductCategory.setCode(Integer.valueOf(basicProductCategory1.getCode()) + 1 + ""); + if (basicProductCategory1 != null){ + basicProductCategory.setCode(Integer.valueOf(basicProductCategory1.getCode()) + 1 + ""); + }else { + basicProductCategory.setCode(basicProductTypeRequest.getCode()); + } basicProductCategory.setId(IdUtil.getSnowflakeNextId()); int insert = basicProductCategoryMapper.insert(basicProductCategory); if (insert == 0) { diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index fe5b5b2fd..44b15d9d2 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -304,6 +304,7 @@ public class UdiProductService extends ServiceImpl + + AND basic_products.productsType= #{productsType} + AND basic_product_category_rel.code= #{code} diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index b78b8e081..2b1145d91 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -894,6 +894,9 @@ AND basic_udirel.id = #{id} + + AND basic_products.productsType = #{productsType} + and originUuid = #{originUuid}