diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java
index c38f4dfc8..92dda8f71 100644
--- a/src/main/java/com/glxp/api/controller/auth/DeptController.java
+++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java
@@ -46,7 +46,6 @@ public class DeptController {
     InvWarehouseService invWarehouseService;
 
 
-
     @AuthRuleAnnotation("")
     @GetMapping("spms/inv/warehouse/filter")
     public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
@@ -260,6 +259,7 @@ public class DeptController {
 
     @Resource
     DeptUserService deptUserService;
+
     @AuthRuleAnnotation("")
     @PostMapping("/spms/inv/warehouse/delete")
     public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
@@ -361,5 +361,4 @@ public class DeptController {
     }
 
 
-
 }
diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
index fdad7138e..c8c52b8e1 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
@@ -160,19 +160,11 @@ public class BasicCorpController {
         basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
         List<BasicCorpEntity> basicUnitMaintainEntities;
         basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
-
-        List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item ->
-        {
-            BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
-            BeanUtils.copyProperties(item, basicUnitMaintainResponse);
-            basicUnitMaintainResponse.setUnitId(item.getErpId());
-            return basicUnitMaintainResponse;
-        }).collect(Collectors.toList());
-        PageInfo<BasicUnitMaintainResponse> pageInfo;
-        pageInfo = new PageInfo<>(basicUnitMaintainResponses);
-        PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        PageInfo<BasicCorpEntity> pageInfo;
+        pageInfo = new PageInfo<>(basicUnitMaintainEntities);
+        PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(pageInfo.getTotal());
-        pageSimpleResponse.setList(basicUnitMaintainResponses);
+        pageSimpleResponse.setList(basicUnitMaintainEntities);
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
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 7d6c8858f..807aa1c76 100644
--- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
+++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
@@ -801,7 +801,6 @@ public class IoCheckInoutService {
             orderEntity.setUpdateTime(new Date());
             orderEntity.setAuditTime(new Date());
             orderService.update(orderEntity);
-            List<IoCodeEntity> codeEntities = codeService.findByOrderId(orderEntity.getBillNo());
             genInv(orderEntity, bussinessTypeEntity);
         }
     }
@@ -935,53 +934,58 @@ public class IoCheckInoutService {
     @Resource
     InvWarehouseService invWarehouseService;
 
-    public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> backCodeList) {
-        if (CollUtil.isEmpty(backCodeList))
+    public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> allCodeList) {
+        if (CollUtil.isEmpty(allCodeList))
             return;
-        BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
-        if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
-            IoOrderEntity outOrder = new IoOrderEntity();
-            IoCodeEntity codeEntity = backCodeList.get(0);
-            outOrder.setId(null);
-            outOrder.setMainAction(ConstantType.TYPE_OUT);
-            outOrder.setAction(basicBussinessTypeEntity.getPreInBackAction());
-            InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
-            outOrder.setInvCode(invWarehouseEntity.getCode());
-            outOrder.setDeptCode(invWarehouseEntity.getParentId());
-            outOrder.setFromCorp(codeEntity.getSupId());
-            outOrder.setOrderType(2);
-            outOrder.setCreateTime(new Date());
-            outOrder.setFromType(ConstantStatus.FROM_BACK);
-            String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd"));
-            outOrder.setBillNo(orderNo);
-            outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
-            outOrder.setCorpOrderId(CustomUtil.getId() + "x");
-            outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
-            orderEntity.setUllageSupNo(outOrder.getBillNo());
-            orderEntity.setUpdateTime(new Date());
-            orderService.update(orderEntity);
-            outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
-            outOrder.setCreateUser(null);
-            outOrder.setReviewUser(null);
-            orderService.insertOrder(outOrder);
-
-            //生成条码
-            List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
-            for (IoCodeEntity warehouseEntity : backCodeList) {
-                IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
-                BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
-                codeTempEntity.setId(null);
-                codeTempEntity.setOrderId(outOrder.getBillNo());
-                codeTempEntity.setAction(outOrder.getAction());
-                codeTempEntity.setMainAction(outOrder.getMainAction());
-                codeTempEntity.setCreateTime(new Date());
-                codeTempEntity.setUpdateTime(new Date());
-                codeTempEntities.add(codeTempEntity);
-            }
-            codeTempService.insertBatch(codeTempEntities);
-            addInoutService.dealProcess(outOrder);
-            if (!checkManual(outOrder.getBillNo())) {
-                check(outOrder.getBillNo());
+        Map<String, List<IoCodeEntity>> map = allCodeList.stream().collect(Collectors.groupingBy(t -> t.getSupId()));
+        for (Map.Entry<String, List<IoCodeEntity>> entry : map.entrySet()) {
+            List<IoCodeEntity> backCodeList = entry.getValue();
+            BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
+            if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
+                IoOrderEntity outOrder = new IoOrderEntity();
+                IoCodeEntity codeEntity = backCodeList.get(0);
+                outOrder.setId(null);
+                outOrder.setMainAction(ConstantType.TYPE_OUT);
+                outOrder.setAction(basicBussinessTypeEntity.getPreInBackAction());
+                InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
+                outOrder.setInvCode(invWarehouseEntity.getCode());
+                outOrder.setDeptCode(invWarehouseEntity.getParentId());
+                outOrder.setFromCorp(codeEntity.getSupId());
+                outOrder.setOrderType(2);
+                outOrder.setCreateTime(new Date());
+                outOrder.setFromType(ConstantStatus.FROM_BACK);
+                String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd"));
+                outOrder.setBillNo(orderNo);
+                outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
+                outOrder.setCorpOrderId(CustomUtil.getId() + "x");
+                outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
+                orderEntity.setUllageSupNo(outOrder.getBillNo());
+                orderEntity.setUpdateTime(new Date());
+                orderService.update(orderEntity);
+                outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
+                outOrder.setCreateUser(null);
+                outOrder.setReviewUser(null);
+                orderService.insertOrder(outOrder);
+
+                //生成条码
+                List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
+                for (IoCodeEntity warehouseEntity : backCodeList) {
+                    IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+                    BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
+                    codeTempEntity.setId(null);
+                    codeTempEntity.setOrderId(outOrder.getBillNo());
+                    codeTempEntity.setAction(outOrder.getAction());
+                    codeTempEntity.setMainAction(outOrder.getMainAction());
+                    codeTempEntity.setCreateTime(new Date());
+                    codeTempEntity.setUpdateTime(new Date());
+                    codeTempEntities.add(codeTempEntity);
+                }
+                codeTempService.insertBatch(codeTempEntities);
+                addInoutService.dealProcess(outOrder);
+                if (!checkManual(outOrder.getBillNo())) {
+                    check(outOrder.getBillNo());
+                }
+
             }
 
         }
diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java
index 2259f7782..2c2cd1669 100644
--- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java
+++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java
@@ -110,6 +110,7 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
                     InvCountCodesEntity codesEntity = codesMap.get(code);
                     if (null == codesEntity) {
                         //构造条码信息
+                        codesEntity = new InvCountCodesEntity();
                         codesEntity.setCode(code);
                         codesEntity.setOrderIdFk(orderId);
                         codesEntity.setCount(1);
diff --git a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
index fcb2f570c..9644c13e2 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
@@ -24,9 +24,6 @@
             <if test="id != '' and id != null">
                 AND id = #{id}
             </if>
-            <if test="unitId != '' and unitId != null">
-                AND unitId = #{unitId}
-            </if>
             <if test="erpId != '' and erpId != null">
                 AND erpId = #{erpId}
             </if>