diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
index 8edf27c3e..e0d4f4148 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
@@ -43,6 +43,7 @@ import com.glxp.api.util.*;
 import com.glxp.api.util.udi.FilterUdiUtils;
 import com.glxp.api.util.udi.UdiCalCountUtil;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.regexp.RE;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -585,11 +586,11 @@ public class IoCodeTempController extends BaseController {
 
                 BaseResponse invRes = null;
                 if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
                 } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
                 } else {
-                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                 }
                 if (invRes != null) {
                     return invRes;
@@ -741,19 +742,19 @@ public class IoCodeTempController extends BaseController {
 
 
             if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else {
-                BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
@@ -782,8 +783,78 @@ public class IoCodeTempController extends BaseController {
         return ResultVOUtils.success(addCodeResult);
     }
 
+    public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity, boolean isEdit) {
+        if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
+            int count = 0;
+            if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
+//                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
+//                    count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null, codeTempEntity.getCode());
+//                } else
+                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
+            } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
+//                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
+//                    count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
+//                } else
+                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
+            } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
+                //按指定货位出库
+                if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) {
+                    List<InvPlaceDetailResponse> invProductDetailEntities = invProductDetailService.findByGroupCode(codeTempEntity.getInvCode(), codeTempEntity.getCode(), true);
+                    if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) {
+                        BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位，请指定当前货位！");
+                        baseResponse.setData(invProductDetailEntities);
+                        return baseResponse;
+                    } else if (invProductDetailEntities.size() == 1) {
+                        InvPlaceDetailResponse invPlaceDetailResponse = invProductDetailEntities.get(0);
+                        count = invPlaceDetailResponse.getReCount();
+                    } else {
+                        return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
+                    }
+                } else {
+//                    if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
+//                        count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
+//                    } else
+                    count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
+                }
+            }
+            if (count <= 0) {
+                return ResultVOUtils.error(500, "当前库存不足");
+            } else {
+
+                //查询此单据已扫描的条码数量
+                if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
+                    int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getCode()));
+                    if (isEdit) {
+                        if (exitCount > count) {
+                            return ResultVOUtils.error(500, "当前库存不足");
+                        }
+                    } else {
+                        if ((codeTempEntity.getMyReCount() + exitCount) > count) {
+                            return ResultVOUtils.error(500, "当前库存不足");
+                        }
+                    }
+
+                } else {
+                    int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId()));
+                    if (isEdit) {
+                        if (exitCount > count) {
+                            return ResultVOUtils.error(500, "当前库存不足");
+                        }
+                    } else {
+                        if ((codeTempEntity.getMyReCount() + exitCount) > count) {
+                            return ResultVOUtils.error(500, "当前库存不足");
+                        }
+                    }
+
+                }
+
+            }
+        }
+        return null;
+    }
+
     //    校验寄售库存
-    public BaseResponse checkPreInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity) {
+    public BaseResponse checkPreInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity, boolean isEdit) {
 
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_ADVANCE);
         int count = 0;
@@ -814,15 +885,23 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(500, "寄售库存数量不足！");
         } else {
             int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId()));
-            if ((codeTempEntity.getMyReCount() + exitCount) > count) {
-                return ResultVOUtils.error(500, "寄售库存数量不足");
+            if (isEdit) {
+                if (exitCount > count) {
+                    return ResultVOUtils.error(500, "寄售库存数量不足");
+                }
+            } else {
+
+                if ((codeTempEntity.getMyReCount() + exitCount) > count) {
+                    return ResultVOUtils.error(500, "寄售库存数量不足");
+                }
             }
+
         }
         return null;
     }
 
     //     校验预验收库存
-    public BaseResponse checkPreInInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity) {
+    public BaseResponse checkPreInInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity, boolean isEdit) {
 
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByOne(ConstantStatus.ACTION_TYPE_PREIN);
 
@@ -873,8 +952,14 @@ public class IoCodeTempController extends BaseController {
                     //无序列号，则可能存在多个预验收入库单
                     IoCodeTempEntity tempEntity = codeTempService.findByUnique(codeTempEntity.getOrderId(), codeTempEntity.getCode());
                     if (tempEntity != null) {
-                        if (count < (tempEntity.getMyCount() + 1)) {
-                            return ResultVOUtils.error(500, "超出预验收存数量");
+                        if (isEdit) {
+                            if (count < (tempEntity.getMyCount())) {
+                                return ResultVOUtils.error(500, "超出预验收存数量");
+                            }
+                        } else {
+                            if (count < (tempEntity.getMyCount() + 1)) {
+                                return ResultVOUtils.error(500, "超出预验收存数量");
+                            }
                         }
                     }
                 } else {
@@ -1027,61 +1112,6 @@ public class IoCodeTempController extends BaseController {
         return null;
     }
 
-    public BaseResponse checkInv(BasicBussinessTypeEntity bussinessTypeEntity, IoCodeTempEntity codeTempEntity) {
-        if (bussinessTypeEntity.isVailInv() && bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT)) {
-            int count = 0;
-            if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_NULL) {
-//                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                    count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null, codeTempEntity.getCode());
-//                } else
-                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), null);
-            } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_SET) {
-//                if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                    count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
-//                } else
-                count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
-            } else if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE) {
-                //按指定货位出库
-                if (StrUtil.isEmpty(codeTempEntity.getWarehouseCode())) {
-                    List<InvPlaceDetailResponse> invProductDetailEntities = invProductDetailService.findByGroupCode(codeTempEntity.getInvCode(), codeTempEntity.getCode(),true);
-                    if (CollUtil.isNotEmpty(invProductDetailEntities) && invProductDetailEntities.size() > 1) {
-                        BaseResponse baseResponse = ResultVOUtils.error(511, "存在多个货位，请指定当前货位！");
-                        baseResponse.setData(invProductDetailEntities);
-                        return baseResponse;
-                    } else if (invProductDetailEntities.size() == 1) {
-                        InvPlaceDetailResponse invPlaceDetailResponse = invProductDetailEntities.get(0);
-                        count = invPlaceDetailResponse.getReCount();
-                    } else {
-                        return ResultVOUtils.error(500, "添加失败，该产品未上架货位!");
-                    }
-                } else {
-//                    if (StrUtil.isNotEmpty(codeTempEntity.getSerialNo())) {
-//                        count = invProductDetailService.vailStockCountByCode(codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode(), codeTempEntity.getCode());
-//                    } else
-                    count = invProductDetailService.vailStockCount(codeTempEntity.getRelId(), codeTempEntity.getBatchNo(), codeTempEntity.getSupId(), codeTempEntity.getDeptCode(), codeTempEntity.getInvCode(), codeTempEntity.getWarehouseCode());
-                }
-            }
-            if (count <= 0) {
-                return ResultVOUtils.error(500, "当前库存不足");
-            } else {
-                //查询此单据已扫描的条码数量
-                if (bussinessTypeEntity.getSpaceOut() == ConstantStatus.SPACE_OUT_CODE){
-                    int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getCode()));
-                    if ((codeTempEntity.getMyReCount() + exitCount) > count) {
-                        return ResultVOUtils.error(500, "当前库存不足");
-                    }
-                }else{
-                    int exitCount = IntUtil.value(codeTempService.selectExitCount(codeTempEntity.getOrderId(), codeTempEntity.getBatchNo(), codeTempEntity.getRelId(), codeTempEntity.getSupId()));
-                    if ((codeTempEntity.getMyReCount() + exitCount) > count) {
-                        return ResultVOUtils.error(500, "当前库存不足");
-                    }
-                }
-
-            }
-        }
-        return null;
-    }
-
 
     @AuthRuleAnnotation("")
     @GetMapping("admin/warehouse/inout/findErrorByOrderId")
@@ -1245,16 +1275,18 @@ public class IoCodeTempController extends BaseController {
 
         IoCodeTempEntity tempEntity = codeTempService.selectById(codeTempEntity.getId());
         codeTempEntity.setReCount(codeTempEntity.getMyCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+        codeTempService.updateById(codeTempEntity);
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(tempEntity.getAction());
         BaseResponse invRes = null;
         if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-            invRes = checkPreInInv(bussinessTypeEntity, codeTempEntity);
+            invRes = checkPreInInv(bussinessTypeEntity, codeTempEntity, true);
         } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-            invRes = checkPreInv(bussinessTypeEntity, codeTempEntity);
+            invRes = checkPreInv(bussinessTypeEntity, codeTempEntity, true);
         } else {
-            invRes = checkInv(bussinessTypeEntity, codeTempEntity);
+            invRes = checkInv(bussinessTypeEntity, codeTempEntity, true);
         }
         if (invRes != null) {
+            codeTempService.updateById(tempEntity);
             return invRes;
         }
 
@@ -1267,7 +1299,9 @@ public class IoCodeTempController extends BaseController {
             //扫码数量-1
             int orderCount = orderDetailCodeEntity.getCount();
             orderDetailCodeEntity.setCount(orderCount - count);
-            orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()));
+
+            int reCount = count * udiCalCountUtil.getActCount(codeTempEntity.getNameCode());
+            orderDetailCodeEntity.setReCount(IntUtil.value(orderDetailCodeEntity.getReCount()) - reCount);
             ioOrderDetailCodeService.update(orderDetailCodeEntity);
         }
         int b = codeTempService.updateById(codeTempEntity);
@@ -1539,11 +1573,11 @@ public class IoCodeTempController extends BaseController {
 
                 BaseResponse invRes = null;
                 if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkPreInInv(bussinessTypeEntity, genDetaiEntity,false);
                 } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkPreInv(bussinessTypeEntity, genDetaiEntity,false);
                 } else {
-                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity);
+                    invRes = checkInv(bussinessTypeEntity, genDetaiEntity, false);
                 }
                 if (invRes != null) {
                     return invRes;
@@ -1694,19 +1728,19 @@ public class IoCodeTempController extends BaseController {
 
 
             if (bussinessTypeEntity.isScanPreIn()) {    //校验预验收库存
-                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkPreInInv(bussinessTypeEntity, codeEnttity,false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else if (bussinessTypeEntity.isAdvancePreIn()) {  //校验寄售库存
-                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkPreInv(bussinessTypeEntity, codeEnttity,false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
                 }
             } else {
-                BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
+                BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity, false);
                 if (invRes != null) {
                     deleteEmptyBillNo(orderEntity);
                     return invRes;
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
index 24c1caa35..78a2a6a43 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java
@@ -44,6 +44,7 @@ import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.lucene.queryparser.flexible.core.processors.NoChildOptimizationQueryNodeProcessor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
@@ -194,6 +195,7 @@ public class IoOrderController extends BaseController {
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);
     }
+
     //切换单据清空单据信息
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/delmitBiz")
@@ -348,7 +350,7 @@ public class IoOrderController extends BaseController {
 
         IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo());
         //补充备注
-        if(addOrderRequest.getRemark()!=null){
+        if (addOrderRequest.getRemark() != null) {
             orderEntity.setRemark(addOrderRequest.getRemark());
         }
         BaseResponse tempResponse = checkSubmitEnable(orderEntity);
@@ -463,11 +465,17 @@ public class IoOrderController extends BaseController {
         }
 
         List<IoCodeResponse> codeTempEntities = getCheckRusultCode(addOrderRequest.getBillNo(), codeEntities);
+        boolean isFull = false;
         for (IoCodeResponse codeTempEntity : codeTempEntities) {
             if (IntUtil.value(codeTempEntity.getCheckStatus()) == 2) {
                 return ResultVOUtils.error(501, "存在多余条码，请先剔除后重新提交！");
+            } else if (IntUtil.value(codeTempEntity.getCheckStatus()) == 0) {
+                isFull = true;
             }
         }
+        if (!isFull) {
+            return ResultVOUtils.error(502, "校验结果不正确，无法提交！");
+        }
         codeTempService.deleteByBillNo(addOrderRequest.getBillNo());
         for (IoCodeResponse codeResponse : codeTempEntities) {
             if (IntUtil.value(codeResponse.getCheckStatus()) == 0) {
diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java
index 0059a4de8..ff3b15305 100644
--- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java
+++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailCodeDao.java
@@ -26,5 +26,5 @@ public interface IoOrderDetailCodeDao extends BaseMapperPlus<IoOrderDetailCodeDa
     void updateCount(IoOrderDetailCodeEntity orderDetailCodeEntity);
 
 
-    Integer findByRelIdCount(@Param("orderId") String orderId, @Param("relId") Long relId);
+    Integer findByRelIdCount(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("batchNo") String batchNo);
 }
diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
index 2e489e972..0f1b1c7cf 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java
@@ -160,14 +160,14 @@ public class UdiRelevanceEntity {
     @TableField(value = "useExpireTime")
     private Integer useExpireTime;
     @TableField(value = "dispatch")
-    private boolean dispatch;
+    private Boolean dispatch;
     @TableField(value = "groupBuy")        //是否可配送
-    private boolean groupBuy;
+    private Boolean groupBuy;
     //是否集采产品
     @TableField(value = "isDateBy")
     private Integer isDateBy;
     @TableField(value = "needCert")
-    private boolean needCert;           //是否需要资质材料
+    private Boolean needCert;           //是否需要资质材料
 
     @TableField(value = "certIdFk")
     private String certIdFk;
diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
index 9230bba9d..e0b6bc66b 100644
--- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java
@@ -22,7 +22,7 @@ public class UdiRelevanceSaveRequest {
     private Boolean isLock;
     private Integer lockStatus;
     private Boolean isAdavence;
-    private boolean useMuti;
+    private Boolean useMuti;
     private Integer useNum;
     private String supName;
     private Date createTime;
@@ -96,9 +96,9 @@ public class UdiRelevanceSaveRequest {
     private Boolean relSubmit;
 
 
-    private boolean dispatch;           //是否可配送
-    private boolean groupBuy;           //是否集采产品
-    private boolean needCert;           //是否需要资质材料
+    private Boolean dispatch;           //是否可配送
+    private Boolean groupBuy;           //是否集采产品
+    private Boolean needCert;           //是否需要资质材料
     private String certIdFk;
     private Integer zdcfsycs;
 }
diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
index 2ec8f500c..6262567b5 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -199,12 +199,12 @@ public class IoCheckInoutService {
             orderService.update(orderEntity);
             return;
         }
+        //删除之前的单据结果
+        if (null != orderDetailCodeEntities.get(0).getOrderIdFk() && !"".equals(orderDetailCodeEntities.get(0).getOrderIdFk())) {
+            orderDetailResultService.deleteByOrderId(orderDetailCodeEntities.get(0).getOrderIdFk());
+        }
         orderDetailCodeEntities.forEach(orderDetailCodeEntity ->
         {
-            //删除之前的单据结果
-            if (null != orderDetailCodeEntity.getOrderIdFk() && !"".equals(orderDetailCodeEntity.getOrderIdFk())) {
-                orderDetailResultService.deleteByOrderId(orderDetailCodeEntity.getOrderIdFk());
-            }
             //生成单据结果
             IoOrderDetailResultEntity orderDetailResultEntity = new IoOrderDetailResultEntity();
             BeanUtils.copyProperties(orderDetailCodeEntity, orderDetailResultEntity);
@@ -214,6 +214,9 @@ public class IoCheckInoutService {
             orderDetailResultService.insert(orderDetailResultEntity);
 
         });
+
+        //生成多出来的
+
         List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
         for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
             IoCodeEntity codeEnttity = new IoCodeEntity();
@@ -337,7 +340,7 @@ public class IoCheckInoutService {
         if (bizEntity == null) {
             return "非此单产品!";
         }
-        Integer detailCount = orderDetailCodeService.findByRelIdCount(codeTempEntity.getOrderId(), codeTempEntity.getRelId());
+        Integer detailCount = orderDetailCodeService.findByRelIdCount(codeTempEntity.getOrderId(), codeTempEntity.getRelId(), bizEntity.getBatchNo());
         int curCount = 0;
         if (detailCount != null) {
             curCount = detailCount + codeTempEntity.getMyReCount();
@@ -538,7 +541,7 @@ public class IoCheckInoutService {
         }
         for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
             String msg = "";
-            Integer count = orderDetailCodeService.findByRelIdCount(orderEntity.getBillNo(), bizEntity.getBindRlFk());
+            Integer count = orderDetailCodeService.findByRelIdCount(orderEntity.getBillNo(), bizEntity.getBindRlFk(), bizEntity.getBatchNo());
             if (bizEntity.getCount() == count) {
                 bizEntity.setCheckSuccess(true);
                 bizEntity.setScanCount(count);
diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
index 6a4539205..7f158a2dd 100644
--- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java
@@ -13,7 +13,7 @@ public interface IoOrderDetailCodeService {
     IoOrderDetailCodeEntity findByUnique(String orderId, Long relId, String bacthNo);
 
 
-    int findByRelIdCount(String orderId, Long relId);
+    int findByRelIdCount(String orderId, Long relId, String batchNo);
 
     int insert(IoOrderDetailCodeEntity orderDetailCodeEntity);
 
diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
index 0c5b22013..fc9906982 100644
--- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailCodeServiceImpl.java
@@ -50,8 +50,8 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     }
 
     @Override
-    public int findByRelIdCount(String orderId, Long relId) {
-        Integer count = ioOrderDetailCodeDao.findByRelIdCount(orderId, relId);
+    public int findByRelIdCount(String orderId, Long relId, String batchNo) {
+        Integer count = ioOrderDetailCodeDao.findByRelIdCount(orderId, relId, batchNo);
         if (count == null)
             return 0;
         return count;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 3ec5dc035..86bb3fdf0 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -52,6 +52,6 @@ UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test
 SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs
 
 back_file_path: D:/share/udisps/back/
-API_KEY: 1102
-API_SECRET: oIHZqfbtoUNehgJ5MOp5GBlxBIwIo15d
+API_KEY: 1101
+API_SECRET: zBITspLNvuoEd4FaamlSoqxRHmNsmQ6L
 WEB_TITLE: 平潭协和医院
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 80e18f1ee..390b02b7c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -34,6 +34,6 @@ server:
   tomcat:
     max-http-form-post-size: 100MB
     max-http-post-size: 100MB
-  max-http-header-size: 100MB
+    max-http-header-size: 100MB
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml
index 5512df08f..92f35ad28 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailCodeDao.xml
@@ -32,8 +32,8 @@
 
     <update id="updateCount">
         update io_order_detail_code
-        set count   = #{count},
-            reCount = #{reCount},
+        set count      = #{count},
+            reCount    = #{reCount},
             updateTime = #{updateTime}
         where id = #{id}
     </update>
@@ -42,8 +42,13 @@
             resultType="java.lang.Integer">
         select sum(reCount)
         from io_order_detail_code
-        where orderIdFk = #{orderId}
-          and bindRlFk = #{relId}
+        <where>
+            orderIdFk = #{orderId}
+                    and bindRlFk = #{relId}
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+        </where>
         group by bindRlFk
     </select>
 </mapper>