拆零整取数量重新计算

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

@@ -389,6 +389,8 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setUuid(udiRelevanceSaveRequest.getUuid());
         udiProductService.updateUdiInfoByUuid(udiProductEntity);
 
+        udiProductService.updateLevelCount(udiRelevanceEntity);
+
         return ResultVOUtils.success("更新成功");
     }
 

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -635,11 +635,21 @@ public class IoCodeTempController extends BaseController {
 
                 BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity);
                 genDetaiEntity.setCount(1);
-                genDetaiEntity.setReCount(udiCalCountUtil.getSplitActCount(udiRelevanceResponses.get(0)));
+
+                if (bussinessTypeEntity.isUse()) {
+                    genDetaiEntity.setReCount(udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    genDetaiEntity.setReCount(udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
+
 
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
-                exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getSplitActCount(udiRelevanceResponses.get(0)));
 
+                if (bussinessTypeEntity.isUse()) {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
 
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
                     return ResultVOUtils.error(500, "重复扫码！");
@@ -770,7 +780,11 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
                 }
                 //计算实际数量
-                codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getSplitActCount(udiRelevanceResponse));
+                if (bussinessTypeEntity.isUse()) {
+                    codeEnttity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                } else {
+                    codeEnttity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                }
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");
@@ -1031,11 +1045,20 @@ public class IoCodeTempController extends BaseController {
 
                 BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity);
                 genDetaiEntity.setCount(1);
-                genDetaiEntity.setReCount(udiCalCountUtil.getSplitActCount(udiRelevanceResponses.get(0)));
+
+                if (bussinessTypeEntity.isUse()) {
+                    genDetaiEntity.setReCount( udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    genDetaiEntity.setReCount( udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
 
                 exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
-                exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getSplitActCount(udiRelevanceResponses.get(0)));
 
+                if (bussinessTypeEntity.isUse()) {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() *  udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyCount() *  udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
 
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
                     return ResultVOUtils.error(500, "重复扫码！");
@@ -1163,7 +1186,12 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
                 }
                 //计算实际数量
-                codeEnttity.setReCount(codeEnttity.getMyCount() * udiCalCountUtil.getSplitActCount(udiRelevanceResponse));
+
+                if (bussinessTypeEntity.isUse()) {
+                    codeEnttity.setReCount(codeEnttity.getMyCount() *  udiCalCountUtil.getUseActCount(udiRelevanceResponse));
+                } else {
+                    codeEnttity.setReCount(codeEnttity.getMyCount() *  udiCalCountUtil.getCirActCount(udiRelevanceResponse));
+                }
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");

src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.glxp.api.constant.ConstantType;
 import lombok.Data;
 import org.apache.xpath.operations.Bool;
 
@@ -174,6 +175,11 @@ public class BasicBussinessTypeEntity {
 
     /**
      * 往来单位类型
+     * 1;          //客户
+     * 2;            //供应商
+     * 3;     //内部科室等
+     * 4;     //特俗往来
+     * 5;      //医院客户
      */
     @TableField(value = "corpType")
     private int corpType;
@@ -486,7 +492,6 @@ public class BasicBussinessTypeEntity {
     private Integer groupBuySplit;
 
 
-
     /**
      * 校验产品属性 ：1：校验；2.无需校验
      */
@@ -517,5 +522,29 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "codeCheck")
     private Integer codeCheck;
 
+    /**
+     * 是否流通单据类型
+     */
+    public Boolean isDistribute() {
+        if (this.corpType != 1)
+            return true;
+        else
+            return false;
+
+    }
+
+    /**
+     * 是否使用单据类型
+     *
+     * @return
+     */
+    public Boolean isUse() {
+        if (this.action.equals(ConstantType.SPLIT_RETURN) || this.action.equals(ConstantType.SPLIT_OUT)) {
+            return true;
+        }
+        if (this.corpType == 1)
+            return true;
+        return false;
+    }
 
 }

src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java

@@ -326,4 +326,10 @@ public class UdiProductEntity {
     @TableField(value = "bhsycjsl")
     private Integer bhsycjsl;
 
+    public Integer getMyBhxjsl() {
+        if (bhxjsl == null || bhxjsl == 0)
+            return 1;
+        return bhxjsl;
+    }
+
 }

src/main/java/com/glxp/api/req/basic/UpdateLevelDrugRequest.java

@@ -32,4 +32,10 @@ public class UpdateLevelDrugRequest {
     private Integer bhxjsl;
     private Long relId;
     private String uuid;
+
+    public Integer getMyBhxjsl() {
+        if (bhxjsl == null || bhxjsl == 0)
+            return 1;
+        return bhxjsl;
+    }
 }

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -243,7 +243,15 @@ public class UdiRelevanceResponse {
     private Integer useLeverCount;
     private String payFeeCode;
 
+    /**
+     * 当前层级包含流通层级使用数量
+     */
+    private Integer bhltcjsl;
 
+    /**
+     * 当前层级包含使用层级数量
+     */
+    private Integer bhsycjsl;
     public int getBhzxxsbzsl() {
         if (bhzxxsbzsl == null || bhzxxsbzsl == 0) {
             return 1;

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

@@ -117,12 +117,14 @@ public class BasicBackUpdateProductService {
                             udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4());
                         }
                         udiRelevanceEntity1.setThirdId(invmandocResponse.getCode());
-                        String time = MsDateUtil.getDateTime();
                         udiRelevanceEntity1.setUpdateTime(new Date());
                         udiRelevanceEntity.setModifyTime(new Date());
                         udiRelevanceEntity.setIsDisable(false);
                         udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
+
+                        udiRelevanceEntity1 = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity1, udiProductEntity);
                         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
+                        udiProductService.updateLevelCount(udiRelevanceEntity1);
                     }
                 }
 

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

@@ -95,6 +95,8 @@ public class BasicUpdateProductService {
                     }
                     udiRelevanceEntity1.setId(gennerOrderUtils.getRelId());
                     udiRelevanceEntity1.setIsDisable(false);
+
+                    udiRelevanceEntity1 = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity1, udiProductEntity);
                     udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1);
                 }
             }
@@ -120,6 +122,7 @@ public class BasicUpdateProductService {
                     udiRelevanceEntity.setModifyTime(new Date());
                     udiRelevanceEntity.setUuid(udiProductEntity.getUuid());
                     udiRelevanceEntity.setIsDisable(false);
+                    udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
                     List<UdiRelevanceEntity> udiRelevanceEntities = udiRelevanceService.selectByUuid(udiProductEntity.getUuid());
                     if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) {
                         boolean isAdd = false;

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

@@ -1,5 +1,6 @@
 package com.glxp.api.service.basic;
 
+import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
@@ -171,10 +172,19 @@ public class UdiContrastService {
         udiRelevanceEntity.setSupName(udiCombineRequest.getSupName());
         udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
         udiRelevanceEntity.setIsDisable(false);
+
+        UdiProductEntity udiProductEntity = getDiProduct(udiInfoEntities);
+        udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
         udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         insertUdiInfos(udiInfoEntities);
     }
 
+    public UdiProductEntity getDiProduct(List<UdiProductEntity> udiInfoEntities) {
+        return udiInfoEntities.stream()
+                .filter(udiProductEntity -> IntUtil.value(udiProductEntity.getDiType()) == 1)
+                .findFirst()
+                .orElse(null);
+    }
 
     public void createOnlyMainId(String mainId) {
         FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
@@ -189,7 +199,7 @@ public class UdiContrastService {
         udiRelevanceEntity.setSupName(thrProductsEntity.getSupName());
         udiRelevanceEntity.setId(gennerOrderUtils.getRelId());
         udiRelevanceEntity.setIsDisable(false);
-        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+
         UdiProductEntity udiProductEntity = new UdiProductEntity();
         BeanUtils.copyProperties(thrProductsEntity, udiProductEntity);
         udiProductEntity.setNameCode(thrProductsEntity.getCode());
@@ -210,6 +220,9 @@ public class UdiContrastService {
         }
         udiProductEntity = UdiInfoUtil.initUdiInfoEntity(udiProductEntity);
         udiProductService.insertUdiInfo(udiProductEntity);
+        udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
+
+        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
     }
 
 
@@ -225,8 +238,10 @@ public class UdiContrastService {
         Long relId = gennerOrderUtils.getRelId();
         udiRelevanceEntity.setId(relId);
         udiRelevanceEntity.setIsDisable(false);
-        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
+        UdiProductEntity udiProductEntity = udiRelevanceService.getDiProduct(udiInfoEntities);
+        udiRelevanceEntity = udiRelevanceService.insertDefaultLevel(udiRelevanceEntity, udiProductEntity);
         insertUdiInfos(udiInfoEntities);
+        udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
         return relId;
     }
 

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

@@ -331,7 +331,7 @@ public class UdiProductService {
 //                    BeanUtils.copyProperties(updateLevelDrugRequest, udiProductEntity);
                     BeanUtils.copyProperties(addProductRequest, udiProductEntity);
                     udiProductEntity.setNameCode(updateLevelDrugRequest.getNameCode());
-                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
+                    udiProductEntity.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
                     udiProductEntity.setPackUnit(updateLevelDrugRequest.getPackUnit());
                     udiProductEntity.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                     udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc());
@@ -369,7 +369,7 @@ public class UdiProductService {
      */
     public void updateLevelCount(UdiRelevanceEntity udiRelevanceEntity) {
         List<UdiProductEntity> udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid());
-        Integer curLevel = udiRelevanceEntity.getDistributeLevelCount();
+        Integer curLevel = udiRelevanceEntity.getDistributeLevel();
         //更新各个层级流通时包含计量单元数量
         if (CollUtil.isNotEmpty(udiProductEntities)) {
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
@@ -380,16 +380,16 @@ public class UdiProductService {
                         if (nextLevelProduct2 != null && IntUtil.value(nextLevelProduct2.getPackLevel()) > IntUtil.value(curLevel)) {
                             UdiProductEntity nextLevelProduct3 = getNextLevelProduct(nextLevelProduct2, udiProductEntities);
                             if (nextLevelProduct3 != null && IntUtil.value(nextLevelProduct3.getPackLevel()) == IntUtil.value(curLevel)) {
-                                udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(nextLevelProduct2.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getDistributeLevelCount()));
+                                udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()));
                             } else {
-                                udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(nextLevelProduct2.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getDistributeLevelCount()));
+                                udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()));
                             }
                         } else {
-                            udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getDistributeLevelCount()));
+                            udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()));
                         }
                     } else {
                         if (nextLevelProduct1 != null && IntUtil.value(nextLevelProduct1.getPackLevel()) == IntUtil.value(curLevel)) {
-                            udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getDistributeLevelCount()));
+                            udiProductEntity.setBhltcjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()));
                         }
                     }
                 } else {
@@ -400,7 +400,7 @@ public class UdiProductService {
             }
         }
 
-
+        curLevel = udiRelevanceEntity.getUseLevel();
         //更新各个层级使用时包含计量单元数量
         if (CollUtil.isNotEmpty(udiProductEntities)) {
             for (UdiProductEntity udiProductEntity : udiProductEntities) {
@@ -411,16 +411,16 @@ public class UdiProductService {
                         if (nextLevelProduct2 != null && IntUtil.value(nextLevelProduct2.getPackLevel()) > IntUtil.value(curLevel)) {
                             UdiProductEntity nextLevelProduct3 = getNextLevelProduct(nextLevelProduct2, udiProductEntities);
                             if (nextLevelProduct3 != null && IntUtil.value(nextLevelProduct3.getPackLevel()) == IntUtil.value(curLevel)) {
-                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(nextLevelProduct2.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getUseLeverCount()));
+                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()) );
                             } else {
-                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(nextLevelProduct2.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getUseLeverCount()));
+                                udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) * IntUtil.value(nextLevelProduct2.getMyBhxjsl()) );
                             }
                         } else {
-                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(nextLevelProduct1.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getUseLeverCount()));
+                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) * IntUtil.value(nextLevelProduct1.getMyBhxjsl()) );
                         }
                     } else {
                         if (nextLevelProduct1 != null && IntUtil.value(nextLevelProduct1.getPackLevel()) == IntUtil.value(curLevel)) {
-                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getBhxjsl()) * IntUtil.value(udiRelevanceEntity.getUseLeverCount()));
+                            udiProductEntity.setBhsycjsl(IntUtil.value(udiProductEntity.getMyBhxjsl()) );
                         }
                     }
                 } else {
@@ -461,7 +461,7 @@ public class UdiProductService {
                 udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
                 udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                 udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
+                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
                 udiProductDao.updateById(udiProductEntity1);
             } else {
                 //新增
@@ -471,7 +471,7 @@ public class UdiProductService {
                 udiProductEntity1.setPackUnit(updateLevelDrugRequest.getPackUnit());
                 udiProductEntity1.setSjcpbm(updateLevelDrugRequest.getSjcpbm());
                 udiProductEntity1.setBhxjcpbm(updateLevelDrugRequest.getBhxjcpbm());
-                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getBhxjsl());
+                udiProductEntity1.setBhxjsl(updateLevelDrugRequest.getMyBhxjsl());
                 udiProductEntity1.setUuid(udiRelevanceEntity.getUuid());
                 udiProductEntity1.setId(IdUtil.getSnowflakeNextId());
                 udiProductDao.insert(udiProductEntity1);
@@ -511,7 +511,7 @@ public class UdiProductService {
 
     public UdiProductEntity findUltimateEntity(UdiProductEntity udiProductEntity, List<UdiProductEntity> udiProductEntities, CountWrapper xjCountWrapper) {
         if (StrUtil.isEmpty(udiProductEntity.getBhxjcpbm())) {
-            xjCountWrapper.addCount(IntUtil.value(udiProductEntity.getBhxjsl()));
+            xjCountWrapper.addCount(IntUtil.value(udiProductEntity.getMyBhxjsl()));
             return udiProductEntity;
         }
 
@@ -519,7 +519,7 @@ public class UdiProductService {
                 .filter(item -> item.getNameCode().equals(udiProductEntity.getBhxjcpbm()))
                 .findFirst();
 
-        nextEntityOptional.ifPresent(entity -> xjCountWrapper.addCount(IntUtil.value(udiProductEntity.getBhxjsl())));
+        nextEntityOptional.ifPresent(entity -> xjCountWrapper.addCount(IntUtil.value(udiProductEntity.getMyBhxjsl())));
 
         return nextEntityOptional
                 .map(entity -> findUltimateEntity(entity, udiProductEntities, xjCountWrapper))

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

@@ -9,6 +9,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.basic.UdiRelevanceDao;
 import com.glxp.api.entity.basic.BasicProductsEntity;
 import com.glxp.api.entity.basic.UdiEntity;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
@@ -389,6 +390,28 @@ public class UdiRelevanceService extends ServiceImpl<UdiRelevanceDao, UdiRelevan
         return data;
     }
 
+    public UdiProductEntity getDiProduct(List<UdiProductEntity> udiInfoEntities) {
+        return udiInfoEntities.stream()
+                .filter(udiProductEntity -> IntUtil.value(udiProductEntity.getDiType()) == 1)
+                .findFirst()
+                .orElse(null);
+    }
+
+    public UdiRelevanceEntity insertDefaultLevel(UdiRelevanceEntity udiRelevanceEntity, UdiProductEntity udiProductEntity) {
+        if (udiProductEntity != null) {
+            udiRelevanceEntity.setDistributeLevel(IntUtil.value(udiProductEntity.getPackLevel()));
+            udiRelevanceEntity.setDistributeLevelDi(udiProductEntity.getNameCode());
+            udiRelevanceEntity.setDistributeLevelUnit(udiProductEntity.getPackUnit());
+            udiRelevanceEntity.setDistributeLevelCount(IntUtil.value(udiProductEntity.getBhxjsl()));
+
+            udiRelevanceEntity.setUseLevel(IntUtil.value(udiProductEntity.getPackLevel()));
+            udiRelevanceEntity.setUseLevelDi(udiProductEntity.getNameCode());
+            udiRelevanceEntity.setUseLevelUnit(udiProductEntity.getPackUnit());
+            udiRelevanceEntity.setUseLeverCount(IntUtil.value(udiProductEntity.getBhxjsl()));
+        }
+
+        return udiRelevanceEntity;
+    }
 
     public boolean insertUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
         return udiRelevanceDao.insertUdiRelevance(udiRelevanceEntity);

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -1245,7 +1245,7 @@ public class IoCheckInoutService {
                             }
                             if (ioSplitFifoCodeEntity != null) {
                                 ioSplitFifoCodeEntity.setScanCount(IntUtil.value(ioSplitFifoCodeEntity.getScanCount()) + IntUtil.value(codeEntity.getCount()));
-                                ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getScanCount() * udiCalCountUtil.getSplitActCount(codeEntity.getRelId()));
+                                ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
                                 ioSplitFifoCodeEntity.setUpdateTime(new Date());
                                 splitFifoCodeService.updateById(ioSplitFifoCodeEntity);
                             } else {
@@ -1253,7 +1253,7 @@ public class IoCheckInoutService {
                                 BeanUtils.copyProperties(codeEntity, splitCodeEntity);
                                 splitCodeEntity.setInBactchNo(codeEntity.getInBatchNo());
                                 splitCodeEntity.setScanCount(codeEntity.getCount());
-                                splitCodeEntity.setTotalCount(splitCodeEntity.getScanCount() * udiCalCountUtil.getSplitActCount(codeEntity.getRelId()));
+                                ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
                                 splitCodeEntity.setSupId(Long.parseLong(codeEntity.getSupId()));
                                 splitCodeEntity.setWorkPlaceCode(orderEntity.getWorkPlaceCode());
                                 splitCodeEntity.setFifoSplit(codeEntity.getFifoSplit());
@@ -1273,7 +1273,7 @@ public class IoCheckInoutService {
                             if (StrUtil.isEmpty(codeEntity.getSerialNo())) {
                                 if (ioSplitFifoCodeEntity != null) {
                                     ioSplitFifoCodeEntity.setScanCount(IntUtil.value(ioSplitFifoCodeEntity.getScanCount()) - IntUtil.value(codeEntity.getCount()));
-                                    ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getScanCount() * udiCalCountUtil.getSplitActCount(codeEntity.getRelId()));
+                                    ioSplitFifoCodeEntity.setTotalCount(ioSplitFifoCodeEntity.getTotalCount() + codeEntity.getReCount());
                                     ioSplitFifoCodeEntity.setUpdateTime(new Date());
                                     splitFifoCodeService.updateById(ioSplitFifoCodeEntity);
                                 }

src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java

@@ -99,7 +99,7 @@ public class UdiCalCountUtil {
         }
     }
 
-    public int getSplitActCount(Long relId) {
+    public int getSplitActCount1(Long relId) {
         return getSplitActCount(udiRelevanceService.selectGroupById(relId));
     }
 
@@ -108,8 +108,10 @@ public class UdiCalCountUtil {
      *
      * @return
      */
-    public int getCirActCount() {
+    public int getCirActCount(UdiRelevanceResponse udiRelevanceResponse) {
-        return 0;
+        if (udiRelevanceResponse.getBhltcjsl() == null || udiRelevanceResponse.getBhltcjsl() == 0)
+            return 1;
+        else return udiRelevanceResponse.getBhltcjsl();
     }
 
     /**
@@ -117,8 +119,10 @@ public class UdiCalCountUtil {
      *
      * @return
      */
-    public int getUseActCount() {
+    public int getUseActCount(UdiRelevanceResponse udiRelevanceResponse) {
-        return 0;
+        if (udiRelevanceResponse.getBhsycjsl() == null || udiRelevanceResponse.getBhsycjsl() == 0)
+            return 1;
+        else return udiRelevanceResponse.getBhsycjsl();
     }
 
 

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

@@ -1279,8 +1279,11 @@
                  updateTime, modifyTime,
                  createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy, needCert, isStack,distributeLevelDi,distributeLevelUnit,distributeLevelCount,useLevelDi,useLevelUnit,useLeverCount)
+                 remark, useExpireTime, `dispatch`,
-        values (#{id},
+                 groupBuy, needCert, isStack,distributeLevelDi,
+                 distributeLevelUnit,distributeLevelCount,useLevelDi,useLevelUnit,useLeverCount,useLevel,distributeLevel)
+        values (
+                #{id},
                 #{uuid},
                 #{mainId},
                 #{thirdId},
@@ -1293,7 +1296,10 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
+                #{isAdavence},
+                #{purType},
+                #{attributeType},
+                #{hcType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1302,8 +1308,22 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack},#{distributeLevelDi},#{distributeLevelUnit},#{distributeLevelCount},#{useLevelDi}
+                #{remark},
-                   ,#{useLevelUnit},#{useLeverCount})
+                #{useExpireTime},
+                #{dispatch},
+                #{groupBuy},
+                #{needCert},
+                #{isStack},
+                #{distributeLevelDi},
+                #{distributeLevelUnit},
+                #{distributeLevelCount},
+                #{useLevelDi}
+                ,
+                #{useLevelUnit},
+                #{useLeverCount},
+                #{useLevel},
+                #{distributeLevel}
+                )
     </insert>
 
     <insert id="insertUdiRelevanceignore"
@@ -1318,7 +1338,8 @@
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert, isStack)
-        values (#{id},
+        values (
+                #{id},
                 #{uuid},
                 #{mainId},
                 #{thirdId},
@@ -1331,7 +1352,10 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType}, #{attributeType}, #{hcType},
+                #{isAdavence},
+                #{purType},
+                #{attributeType},
+                #{hcType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1340,7 +1364,13 @@
                 #{modifyTime},
                 #{createUser},
                 #{updateUser},
-                #{remark}, #{useExpireTime}, #{dispatch}, #{groupBuy}, #{needCert}, #{isStack})
+                #{remark},
+                #{useExpireTime},
+                #{dispatch},
+                #{groupBuy},
+                #{needCert},
+                #{isStack}
+                )
     </insert>
 
     <delete id="deleteById" parameterType="Map">
@@ -1495,7 +1525,6 @@
             <if test="useLeverCount != null">
                 useLeverCount=#{useLeverCount},
             </if>
-
         </trim>
         WHERE id = #{id}
     </update>
@@ -1618,7 +1647,7 @@
         basic_products.sfwwjbz,
         basic_products.syqsfxyjxmj,
         basic_products.mjfs,
-               basic_products.categoryName
+        basic_products.categoryName, basic_products.bhltcjsl, basic_products.bhsycjsl
         FROM basic_udirel
         INNER JOIN basic_products
         on basic_udirel.uuid = basic_products.uuid
@@ -1969,7 +1998,8 @@
 
 
     <select id="getProductsEntitiesByNameCode" resultType="com.glxp.api.res.basic.UdiRelevanceResponse">
-        select bu.id,bu.purType,
+        select bu.id,
+               bu.purType,
                basic_products.originUuid,
                basic_products.nameCode,
                basic_products.deviceRecordKey,