10/15 基础数据 器械优化

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);
 

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());

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -152,7 +152,6 @@ public class UdiRelevanceController extends BaseController {
                 List<UdiRelevanceResponse> 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<UdiRelevanceResponse> temps = udiRelevanceService.filterUdiGp(filterUdiRelRequest);
                 if (temps != null && temps.size() > 0) {
                     filterUdiRelRequest.setOriginUuid(temps.get(0).getOriginUuid());
-                }
                     filterUdiRelRequest.setNameCode(null);
                 }
-
+            }
         } else {
             filterUdiRelRequest.setDiType(1);
         }

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<CollectOrderBizResponse> 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);
     }
 
 

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<Long> existid;
 
 

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<BasicProductCategory> basicProductCategories = basicProductCategoryMapper.selectLowTypeAll(basicProductTypeFilterRequest.getCode());
             List<Long> ids = basicProductCategories.stream().map(BasicProductCategory::getId).collect(Collectors.toList());
-            ew.notIn("id", ids);
+//            ew.notIn("id", ids);
         }
         List<BasicProductCategory> 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<BasicProductCategory> ew = new QueryWrapper<>();
         ew.select("max(code) as code");
         BasicProductCategory basicProductCategory1 = basicProductCategoryMapper.selectOne(ew);
+        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) {

src/main/java/com/glxp/api/service/basic/UdiProductService.java

@@ -304,6 +304,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
                 udiProductEntity.setGgxh(addProductRequest.getSpec());
                 udiProductEntity.setPrice(addProductRequest.getPrice() == null ? "0" : addProductRequest.getPrice().toString());
                 udiProductEntity.setZczbhhzbapzbh(addProductRequest.getRegisterNo());
+                udiProductEntity.setUpdateTime(new Date());
                 if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {
                     udiProductEntity.setDiType(1);
                 }
@@ -345,6 +346,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
             udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
+
 //            if (addProductRequest.getDistributeLevelDi() != null) {
 //                udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
 //            }

src/main/java/com/glxp/api/service/sync/HeartService.java

@@ -1766,6 +1766,7 @@ public class HeartService {
         Integer code = obj.getInt("code");
         if (!code.equals(20000)) {
             log.error("从UDI自助平台拉取数据错误，报文-----{}", data);
+            log.error("从UDI自助平台拉取数据错误，报文-----{}类型", exportType);
             return;
         }
         //数据内容

src/main/resources/mybatis/mapper/basic/BasicProductCategoryRelMapper.xml

@@ -38,6 +38,9 @@
             or basic_udirel.thirdId3 LIKE concat('%', #{thrPiId}, '%')
             or basic_udirel.thirdId4 LIKE concat('%', #{thrPiId}, '%'))
           </if>
+          <if test="productsType != '' and productsType != null">
+            AND  basic_products.productsType= #{productsType}
+          </if>
           <if test="code != '' and code != null">
             AND  basic_product_category_rel.code= #{code}
           </if>

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -894,6 +894,9 @@
             <if test="id != '' and id != null">
                 AND basic_udirel.id = #{id}
             </if>
+            <if test="productsType != '' and productsType != null">
+                AND basic_products.productsType = #{productsType}
+            </if>
             <if test="originUuid != null and originUuid != ''">
                 and originUuid = #{originUuid}
             </if>