修改扫码减一删除，修改扫码数量，以及PDA扫码时流通时，使用时数量计算

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

@@ -2055,7 +2055,11 @@ public class IoCodeTempController extends BaseController {
 
         if (codeTempEntity.getMyCount() > 1) {
             codeTempEntity.setCount(codeTempEntity.getMyCount() - 1);
-            codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses));
+            if (bussinessTypeEntity.isUse()) {
+                codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getUseActCount(udiRelevanceResponses));
+            } else {
+                codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getCirActCount(udiRelevanceResponses));
+            }
             codeTempService.updateById(codeTempEntity);
         } else {
             codeTempService.deleteById(id);
@@ -2069,7 +2073,16 @@ public class IoCodeTempController extends BaseController {
             int orderReCount = IntUtil.value(orderDetailCodeEntity.getReCount());
             if (orderCount > 1) {
                 orderDetailCodeEntity.setCount(orderCount - 1);
-                orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getActCount(bussinessTypeEntity, udiRelevanceResponses));
+
+
+                if (bussinessTypeEntity.isUse()) {
+                    orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getUseActCount(udiRelevanceResponses));
+//                    codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getUseActCount(udiRelevanceResponses);
+                } else {
+                    orderDetailCodeEntity.setReCount(orderReCount - udiCalCountUtil.getCirActCount(udiRelevanceResponses));
+//                    codeTempEntity.setReCount(codeTempEntity.getMyReCount() - udiCalCountUtil.getCirActCount(udiRelevanceResponses);
+                }
+
                 ioOrderDetailCodeService.update(orderDetailCodeEntity);
             } else {
                 ioOrderDetailCodeService.deleteById(orderDetailCodeEntity.getId());
@@ -2133,9 +2146,16 @@ public class IoCodeTempController extends BaseController {
         }
 
         IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
-        codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+//        codeTempEntity.setReCount(codeTempEntity.getReCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+        List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.selectGroupByNameCode(codeTempEntity.getNameCode(), null);
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction());
+        if (bussinessTypeEntity.isUse()) {
+            codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+        } else {
+            codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+        }
+
         codeTempService.updateById(codeTempEntity);
-        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction());
         BaseResponse invRes = null;
         if (bussinessTypeEntity.isScanPreIn() && checkDiAttribute(bussinessTypeEntity, codeTempEntity.getRelId(), 2)) {    //校验预验收库存
             invRes = checkInvService.checkPreInInv(bussinessTypeEntity, codeTempEntity, true);
@@ -2420,11 +2440,20 @@ public class IoCodeTempController extends BaseController {
 
                 BeanUtils.copyProperties(exitLocalEntity, genDetaiEntity);
                 genDetaiEntity.setCount(1);
-                genDetaiEntity.setReCount(udiCalCountUtil.getActCount(udiRelevanceResponses.get(0)));
 
-                exitLocalEntity.setCount(exitLocalEntity.getMyCount() + 1);
-                exitLocalEntity.setReCount(exitLocalEntity.getMyCount() * udiCalCountUtil.getActCount(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.getActCount(udiRelevanceResponses.get(0)));
+                if (bussinessTypeEntity.isUse()) {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    exitLocalEntity.setReCount(exitLocalEntity.getMyReCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
 
                 if (!StringUtils.isBlank(exitLocalEntity.getSerialNo())) {
                     return ResultVOUtils.error(500, "重复扫码！");
@@ -2517,7 +2546,12 @@ public class IoCodeTempController extends BaseController {
 //                    return ResultVOUtils.error(500, "当前上货只允许录入拆零产品！");
 //                }
                 //计算实际数量
-                codeEnttity.setReCount(IntUtil.value(codeEnttity.getMyReCount()) + udiCalCountUtil.getActCount(udiRelevanceResponse));
+                if (bussinessTypeEntity.isUse()) {
+                    codeEnttity.setReCount(codeEnttity.getMyReCount() * udiCalCountUtil.getUseActCount(udiRelevanceResponses.get(0)));
+                } else {
+                    codeEnttity.setReCount(codeEnttity.getMyReCount() * udiCalCountUtil.getCirActCount(udiRelevanceResponses.get(0)));
+                }
+
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");