diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
index 40b9f775..106ffd1c 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java
@@ -798,6 +798,19 @@ public class WareHouseController {
                 } else if (udiRelevanceResponse.getIsUseDy() == 0 && udiRelevanceResponse.getDiType() == ConstantStatus.DITYPE_SYDY) {
                     return ResultVOUtils.error(500, "该产品不允许以使用单元入库！");
                 }
+
+                //计算实际数量
+                int actCount = 0;
+                if (udiRelevanceResponse.getIsUseDy() == 1 && udiRelevanceResponse.getDiType() != 2) {
+                    if (udiRelevanceResponse.getBhzxxsbzsl() == 0) {
+                        actCount = udiRelevanceResponse.getZxxsbzbhsydysl();
+                    } else {
+                        actCount = udiRelevanceResponse.getBhzxxsbzsl() * udiRelevanceResponse.getBhzxxsbzsl();
+                    }
+                } else {
+                    actCount = udiRelevanceResponse.getBhzxxsbzsl();
+                }
+                warehouseEntity.setReCount(warehouseEntity.getCount() * actCount);
             } else if (udiRelevanceResponses.size() == 0) {
                 if (unitFk == null)
                     return ResultVOUtils.error(500, "耗材字典不存在此产品！");
diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
index 01d9f9b0..3f8df0e7 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSubWarehouseController.java
@@ -17,6 +17,7 @@ import com.glxp.api.admin.res.inventory.InvSubWarehouseResponse;
 import com.glxp.api.admin.res.inventory.InvWarehouseThirdSysResponse;
 import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
+import com.glxp.api.admin.service.inout.WarehouseUserService;
 import com.glxp.api.admin.service.inventory.InvProductService;
 import com.glxp.api.admin.service.inventory.InvSubWarehouseService;
 import com.glxp.api.admin.service.inventory.InvWarehouseService;
@@ -47,6 +48,8 @@ public class InvSubWarehouseController {
     WarehouseBussinessTypeService warehouseBussinessTypeService;
     @Resource
     private InvProductService invProductService;
+    @Resource
+    private WarehouseUserService warehouseUserService;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/sub/inv/warehouse/filter")
@@ -143,11 +146,9 @@ public class InvSubWarehouseController {
 
         InvSubWarehouseEntity invSubWarehouseEntity = invSubWarehouseService.findById(deleteRequest.getId());
 
-        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
-        filterInvWarehouseRequest.setCode(invSubWarehouseEntity.getParentId());
-        List<InvWarehouseEntity> warehouseEntities = invWarehouseService.filterAllByUser(filterInvWarehouseRequest);
-        if (!warehouseEntities.isEmpty()) {
-            return ResultVOUtils.error(500, "请先移除该仓库关联用户和单据类型！");
+        Integer userCount = warehouseUserService.countUserBySubInvCode(invSubWarehouseEntity.getCode());
+        if (userCount > 0) {
+            return ResultVOUtils.error(500, "请先移除该仓库关联用户！");
         }
 
         List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.getListByCode(invSubWarehouseEntity.getCode());
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java
index 69ec30f8..15d346f9 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessTypeDao.java
@@ -61,4 +61,12 @@ public interface BussinessTypeDao {
      * @return
      */
     String selectInoutTypebByLocalAction(@Param("localAction") String localAction);
+
+    /**
+     * 根据业务单据号查询补单类型
+     *
+     * @param stockOrderBillNo
+     * @return
+     */
+    String selectSupplementTypeByBillNo(@Param("stockOrderBillNo") String stockOrderBillNo);
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java
new file mode 100644
index 00000000..5b8ad38f
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderRemakDao.java
@@ -0,0 +1,17 @@
+package com.glxp.api.admin.dao.business;
+
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface StockOrderRemakDao {
+
+    List<StockOrderRemakEntity> findByOrderIdFk(@Param("id") String id);
+
+    boolean insertOrderRemaks(@Param("orderRemakEntities") List<StockOrderRemakEntity> OrderRemakEntitys);
+
+    boolean deleteByOrderIdFk(@Param("id") String id);
+}
diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java
index 5d3f395a..7720be50 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inout/WarehouseUserDao.java
@@ -52,4 +52,12 @@ public interface WarehouseUserDao {
      * @param isDirector
      */
     void updateDirectorById(@Param("id") Integer id, @Param("isDirector") int isDirector);
+
+    /**
+     * 根据分仓编码统计绑定的用户数
+     *
+     * @param code
+     * @return
+     */
+    Integer countByCode(@Param("code") String code);
 }
\ No newline at end of file
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
index 647c2719..cc55a7bb 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java
@@ -27,6 +27,7 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
 
     private BigDecimal totalPrice;
     private String locInv;
+    private String subInv;
 
     public BigDecimal getPrice() {
 //        if (price == null)
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java
new file mode 100644
index 00000000..7d92f3d3
--- /dev/null
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderRemakEntity.java
@@ -0,0 +1,21 @@
+package com.glxp.api.admin.entity.business;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class StockOrderRemakEntity {
+    private Integer id;
+    private String orderIdFk;
+    private String relId;
+    private String batchNo;
+    private BigDecimal price;
+    private String secSalesListNo;
+    private String firstSalesInvNo;
+    private String secSalesInvNo;
+    private String invoiceDate;
+    private String remark;
+
+
+}
diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java
index 6175c1f3..21f9c711 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java
@@ -18,7 +18,8 @@ public class WarehouseEntity {
     private String produceDate;
     private String expireDate;
     private String serialNo;
-    private Integer count;
+    private Integer count; //扫码数量
+    private Integer reCount; //实际数量
     private String packageLevel;
     private String warehouseCode;
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java
index 1881083a..ff42b243 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/SpGetHttpClient.java
@@ -92,6 +92,7 @@ public class SpGetHttpClient {
     public BaseResponse<List<BasicExportStatusEntity>> getBasicStatus(String type) {
         Map<String, String> paramMap = new HashMap<>(16);
         paramMap.put("type", type);
+        paramMap.put("status", "3");
         String response = okHttpCli.doGet(getIpUrl() + "/spssync/basic/udiinfo/getStatus", paramMap);
         try {
             BaseResponse<List<BasicExportStatusEntity>> data =
@@ -149,7 +150,6 @@ public class SpGetHttpClient {
         basicExportStatusRequest.setType(type);
         String json = JSONUtil.toJsonStr(basicExportStatusRequest);
         String result = okHttpCli.doPostJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", json);
-//        String result = UHttpClient.postJson(getIpUrl() + "/spssync/basic/udiinfo/downloadByStatus", basicExportStatusRequest);
         return result;
     }
 
diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java
index 0265da7e..64fba687 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/SpsSyncOrderResponse.java
@@ -1,5 +1,6 @@
 package com.glxp.api.admin.res.basic;
 
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.inout.ErpOrderEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
@@ -15,4 +16,8 @@ public class SpsSyncOrderResponse {
     List<OrderEntity> orderEntities;
     List<ErpOrderEntity> orderDetailEntityList;
     List<WarehouseEntity> warehouseEntityList;
+
+
+    List<StockOrderRemakEntity> stockOrderRemakEntities;
+
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
index cbdc55db..b378b361 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/res/inout/WarehouseResponse.java
@@ -16,6 +16,7 @@ public class WarehouseResponse {
     private long id;
     private String fromCorp;
     private Integer count;
+    private String orderId;
     private String batchNo;
     private String produceDate;
     private String expireDate;
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java
index 3c1d6035..42242e83 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/WarehouseUserService.java
@@ -57,4 +57,11 @@ public interface WarehouseUserService {
      */
     List<WarehouseUserEntity> getWarehouseUserList(FilterInvLinkDataRequest filterInvLinkDataRequest);
 
+    /**
+     * 根据分仓编码，统计用户数量
+     *
+     * @param subInvCode
+     * @return
+     */
+    Integer countUserBySubInvCode(String subInvCode);
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
index b4ffdb15..5c05ae22 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java
@@ -338,7 +338,7 @@ public class OrderServiceImpl implements OrderService {
         stockOrderEntityList.forEach(stockOrderEntity -> {
             StockOrderResponse response = new StockOrderResponse();
             BeanUtil.copyProperties(stockOrderEntity, response);
-            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER)) {
+            if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_DELIVER) && checkBusTypeSupplementOrder(stockOrderEntity.getBillNo())) {
                 response.setEnableSupplementOrder(true);
             }
             result.add(response);
@@ -346,6 +346,20 @@ public class OrderServiceImpl implements OrderService {
         return result;
     }
 
+    /**
+     * 校验扫码单据类型是否绑定了补单类型
+     *
+     * @param stockOrderBillNo 业务单据号
+     * @return
+     */
+    boolean checkBusTypeSupplementOrder(String stockOrderBillNo) {
+        String supplementOrderType = bussinessTypeDao.selectSupplementTypeByBillNo(stockOrderBillNo);
+        if (StrUtil.isNotBlank(supplementOrderType)) {
+            return true;
+        }
+        return false;
+    }
+
     @Override
     public List<StockOrderResponse> checkSubmitOrder(List<StockOrderResponse> orderResponseList) {
         if (CollUtil.isEmpty(orderResponseList)) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java
index 3b89d00c..8897bfc7 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/WarehouseUserServiceImpl.java
@@ -116,4 +116,9 @@ public class WarehouseUserServiceImpl implements WarehouseUserService {
         }
         return warehouseUserDao.selectListByCode(filterInvLinkDataRequest.getCode());
     }
+
+    @Override
+    public Integer countUserBySubInvCode(String subInvCode) {
+        return warehouseUserDao.countByCode(subInvCode);
+    }
 }
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
index ab12b80f..990cca2a 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java
@@ -7,6 +7,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.dao.auth.AuthAdminDao;
 import com.glxp.api.admin.dao.basic.*;
+import com.glxp.api.admin.dao.business.StockOrderRemakDao;
 import com.glxp.api.admin.dao.inout.CodesTempDao;
 import com.glxp.api.admin.dao.inout.OrderDao;
 import com.glxp.api.admin.dao.inout.WarehouseBussinessTypeDao;
@@ -18,6 +19,7 @@ import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.auth.DeptEntity;
 import com.glxp.api.admin.entity.basic.*;
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
@@ -99,7 +101,9 @@ public class DlBasicService {
     @Resource
     private BussinessTypeService bussinessTypeService;
     @Resource
-    private SystemParamConfigService systemParamConfigService;
+    private StockOrderRemakDao stockOrderRemakDao;
+
+
     private static final Logger logger = LoggerFactory.getLogger(DlBasicService.class);
 
 //------------------------------------------------------------
@@ -218,6 +222,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("往来单位：").append(syncDataResponse.getBasicUnitMaintainEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -232,6 +237,7 @@ public class DlBasicService {
                                 }
                                 batchSession.commit();
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -249,6 +255,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方产品信息：").append(syncDataResponse.getThrProductsEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -265,6 +272,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方往来单位信息：").append(syncDataResponse.getThrCorpEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -280,6 +288,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方业务单据：").append(syncDataResponse.getThrOrderEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -294,6 +303,7 @@ public class DlBasicService {
                                 batchSession.commit();
                                 remark.append("第三方业务单据详情：").append(syncDataResponse.getThrOrderDetailEntities().size()).append("条\n");
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
 
@@ -524,7 +534,10 @@ public class DlBasicService {
 
                                 }
                                 batchSession.commit();
-
+                                if (CollUtil.isNotEmpty(syncDataResponse.getStockOrderRemakEntities())) {
+                                    List<StockOrderRemakEntity> stockOrderRemakEntities = syncDataResponse.getStockOrderRemakEntities();
+                                    stockOrderRemakDao.insertOrderRemaks(stockOrderRemakEntities);
+                                }
                                 String logs = "";
                                 if (CollUtil.isNotEmpty(syncDataResponse.getOrderEntities()))
                                     logs = logs + "单据：" + syncDataResponse.getOrderEntities().size() + "条\n";
@@ -534,6 +547,7 @@ public class DlBasicService {
                                     logs = logs + "单据条码信息：" + syncDataResponse.getWarehouseEntityList().size() + "条\n";
                                 remark.append(logs);
                             } catch (Exception e) {
+                                e.printStackTrace();
                             }
                         }
                         batchSession.close();
diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
index 5fef8b2e..867881dd 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java
@@ -10,9 +10,11 @@ import com.glxp.api.admin.controller.inout.utils.CheckOrderUtils;
 import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil;
 import com.glxp.api.admin.controller.inout.utils.DataTransUtil;
 import com.glxp.api.admin.controller.inout.utils.InoutUtils;
+import com.glxp.api.admin.dao.business.StockOrderRemakDao;
 import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
+import com.glxp.api.admin.entity.business.StockOrderRemakEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inout.ErpOrderEntity;
@@ -77,14 +79,10 @@ public class IoTransInoutService {
     @Resource
     private OrderDetailService myErpOrderService;
 
-    @Resource
-    BussinessLocalTypeService bussinessLocalTypeService;
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
     private UdiInfoService udiInfoService;
-    @Value("${UDI_SERVER_URL}")
-    private String udiUrl;
 
     @Resource
     private CodesTempService codesTempService;
@@ -101,17 +99,15 @@ public class IoTransInoutService {
     @Resource
     CompanyProductRelevanceService companyProductRelevanceService;
     @Resource
-    CompanyService companyService;
-    @Resource
     InvWarehouseService invWarehouseService;
     @Resource
     InvProductService invProductService;
     @Resource
     InvPreProductService invPreProductService;
     @Resource
-    UdiDlHttpClient udiDlHttpClient;
-    @Resource
     GennerOrderUtils gennerOrderUtils;
+    @Resource
+    StockOrderRemakDao stockOrderRemakDao;
 
     @Async
     public void creatOrderAsycn(PostOrderRequest postOrderRequest, Integer fromType) {
@@ -823,7 +819,6 @@ public class IoTransInoutService {
                     stockOrderDetailEntity.setBatchNo(erpOrderEntity.getBatchNo());
                     stockOrderDetailEntity.setProductDate(erpOrderEntity.getProductDate());
                     stockOrderDetailEntity.setExpireDate(erpOrderEntity.getExpireDate());
-//                    stockOrderDetailEntity.setYlqxzcrbarmc(erpOrderEntity.get());
                     if (erpOrderEntity.getCount() != null) {
                         stockOrderDetailEntity.setSweepCount(erpOrderEntity.getCount());
                         stockOrderDetailEntity.setReCount(erpOrderEntity.getCount());
@@ -838,6 +833,25 @@ public class IoTransInoutService {
                         stockOrderDetailEntity.setCount(erpOrderEntity.getErpCount());
                     }
 
+                    if (orderEntity.getFromType().intValue() == ConstantStatus.FROM_UDISP) {
+
+                        List<StockOrderRemakEntity> stockOrderRemakEntities = stockOrderRemakDao.findByOrderIdFk(orderId);
+
+                        for (StockOrderRemakEntity stockOrderRemakEntity : stockOrderRemakEntities) {
+                            if (StrUtil.trimToEmpty(stockOrderRemakEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
+                                    &&
+                                    StrUtil.trimToEmpty(stockOrderRemakEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
+                            ) {
+                                stockOrderDetailEntity.setPrice(stockOrderRemakEntity.getPrice());
+                                stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo());
+                                stockOrderDetailEntity.setFirstSalesInvNo(stockOrderRemakEntity.getFirstSalesInvNo());
+                                stockOrderDetailEntity.setSecSalesInvNo(stockOrderRemakEntity.getSecSalesInvNo());
+                                stockOrderDetailEntity.setInvoiceDate(stockOrderRemakEntity.getInvoiceDate());
+                            }
+                        }
+                    }
+
+
                     stockOrderDetailEntities.add(stockOrderDetailEntity);
                 }
                 if (!isError) {
diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java
index 3c01f576..f1aace9d 100644
--- a/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java
+++ b/api-admin/src/main/java/com/glxp/api/admin/util/OkHttpCli.java
@@ -97,7 +97,7 @@ public class OkHttpCli {
             }
 
         }
-
+        log.info(sb.toString());
         Request request = builder.url(sb.toString()).build();
         log.info("do get request and url[{}]", sb.toString());
         return execute(request);
diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
index 613069e5..37736d88 100644
--- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml
@@ -400,4 +400,14 @@
         where localAction = #{localAction}
     </select>
 
+    <select id="selectSupplementTypeByBillNo" resultType="java.lang.String">
+        select supplementOrderType
+        from basic_bussiness_type
+        where action = (select action
+                        from io_order
+                        where id = (select orderIdFk
+                                    from stock_order
+                                    where billNo = #{stockOrderBillNo}))
+    </select>
+
 </mapper>
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
index bcab8796..fdc2ea6f 100644
--- a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml
@@ -317,11 +317,12 @@
         select io_codes.code udiCode,basic_udirel.id productId,basic_products.cpmctymc productName,basic_products.ggxh
         spec,io_codes.batchNo,io_codes.produceDate productDate,io_codes.expireDate ,io_codes.serialNo,io_codes.count,
         basic_products.ylqxzcrbarmc,basic_udirel.manufactory,basic_udirel.measname,basic_products.zczbhhzbapzbh,
-        inv_warehouse.name locInv,basic_products.spmc, basic_products.cpms
+        inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc, basic_products.cpms
         from io_codes
         INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
         INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
         LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
+        left join inv_warehouse_sub on io_codes.invWarehouseCode = inv_warehouse_sub.code
         <where>
             <if test="orderId != '' and orderId !=null">
                 and io_codes.orderId =#{orderId}
diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml
new file mode 100644
index 00000000..faee96f1
--- /dev/null
+++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderRemakDao.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.business.StockOrderRemakDao">
+
+    <select id="findByOrderIdFk" parameterType="Map"
+            resultType="com.glxp.api.admin.entity.business.StockOrderRemakEntity">
+        select stock_order_remak.*
+        from stock_order_remak
+        WHERE orderIdFk = #{id}
+    </select>
+
+
+    <insert id="insertOrderRemaks" keyProperty="id"
+            parameterType="com.glxp.api.admin.entity.business.StockOrderRemakEntity">
+        insert INTO stock_order_remak(
+        orderIdFk,batchNo,price,relId
+        ,firstSalesInvNo,secSalesInvNo,secSalesListNo,invoiceDate,remark)
+        values
+        <foreach collection="orderRemakEntities" item="item" index="index"
+                 separator=",">
+            (
+            #{item.orderIdFk},
+            #{item.batchNo},
+            #{item.price},#{item.relId},#{item.firstSalesInvNo},#{item.secSalesInvNo},
+            #{item.secSalesListNo},#{item.invoiceDate},#{item.remark}
+            )
+        </foreach>
+
+    </insert>
+
+    <delete id="deleteByOrderIdFk" parameterType="Map">
+        DELETE
+        FROM stock_order_remak
+        WHERE orderIdFk = #{id}
+    </delete>
+
+
+</mapper>
\ No newline at end of file
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
index c8f96225..2cd7392b 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesDao.xml
@@ -41,7 +41,7 @@
     <insert id="insertWarehouse" keyProperty="id" parameterType="com.glxp.api.admin.req.inout.WarehouseSaveRequest">
         INSERT INTO io_codes(`action`, mainAction, code, corpOrderId, actor, actDate,
                              fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate,
-                             serialNo, `count`, packageLevel, warehouseCode, nameCode, supId, relId, status,
+                             serialNo, `count`, reCount, packageLevel, warehouseCode, nameCode, supId, relId, status,
                              invStorageCode, invWarehouseCode, locStorageCode)
         values (#{action},
                 #{mainAction},
@@ -51,7 +51,7 @@
                 #{actDate},
                 #{fromCorpId},
                 #{fromCorp}, #{orderId}, #{batchNo}, #{produceDate}, #{expireDate}, #{serialNo}, #{count},
-                #{packageLevel}, #{warehouseCode},
+                #{reCount}, #{packageLevel}, #{warehouseCode},
                 #{nameCode}, #{supId}, #{relId}, #{status}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode})
     </insert>
 
@@ -64,7 +64,7 @@
         actor,
         actDate,
         fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,
-        serialNo,`count`,packageLevel,warehouseCode,nameCode,supId,
+        serialNo,`count`, reCount, packageLevel,warehouseCode,nameCode,supId,
         relId,status,invStorageCode,invWarehouseCode,locStorageCode)
         VALUES
         <foreach collection="io_codesEntities" item="item" index="index"
@@ -84,6 +84,7 @@
             ,#{item.expireDate}
             ,#{item.serialNo}
             ,#{item.count}
+            ,#{item.reCount}
             ,#{item.packageLevel} ,#{item.warehouseCode},#{item.nameCode},#{item.supId}
             ,#{item.relId},#{item.status},#{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode})
 
@@ -161,6 +162,7 @@
             <if test="fromCorp != null">fromCorp=#{fromCorp},</if>
             <if test="fromCorpId != null">fromCorpId=#{fromCorpId},</if>
             <if test="count != null">`count`=#{count},</if>
+            <if test="reCount != null">`reCount`=#{reCount},</if>
             <if test="status != null">status=#{status},</if>
             <if test="supId != null">supId=#{supId},</if>
             <if test="invStorageCode != null">invStorageCode=#{invStorageCode},</if>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml
index e318be9b..f3e86eb3 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/CodesTempDao.xml
@@ -15,7 +15,7 @@
         (`action`, mainAction,code, corpOrderId, actor,actDate,
         fromCorpId, fromCorp,
         orderId,batchNo,produceDate,expireDate,serialNo,
-        `count`,nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId)
+        `count`, reCount, nameCode,supId,invStorageCode,invWarehouseCode,locStorageCode,relId)
         VALUES
         <foreach collection="codes" item="item" index="index"
                  separator=",">
@@ -33,7 +33,9 @@
             ,#{item.produceDate}
             ,#{item.expireDate}
             ,#{item.serialNo}
-            ,#{item.count},#{item.nameCode},#{item.supId},
+            ,#{item.count}
+            ,#{item.reCount}
+            ,#{item.nameCode},#{item.supId},
             #{item.invStorageCode},#{item.invWarehouseCode},#{item.locStorageCode},#{item.relId}
             )
         </foreach>
@@ -43,7 +45,7 @@
     <insert id="insertCodesTempSingle" keyProperty="id" parameterType="com.glxp.api.admin.entity.inout.WarehouseEntity">
         INSERT INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate,
                                   fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
-                                  `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
+                                  `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
         values (#{action},
                 #{mainAction},
                 #{code},
@@ -57,7 +59,9 @@
                 #{produceDate},
                 #{expireDate},
                 #{serialNo},
-                #{count}, #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
+                #{count},
+                #{reCount},
+                #{nameCode}, #{supId}, #{invStorageCode}, #{invWarehouseCode}, #{locStorageCode}, #{relId})
     </insert>
 
 
@@ -67,7 +71,7 @@
         ignore
         INTO io_codes_temp(`action`, mainAction, code, corpOrderId, actor, actDate,
                                   fromCorpId, fromCorp, orderId, batchNo, produceDate, expireDate, serialNo,
-                                  `count`, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
+                                  `count`, reCount, nameCode, supId, invStorageCode, invWarehouseCode, locStorageCode, relId)
         values (
         #{action},
         #{mainAction},
@@ -83,6 +87,7 @@
         #{expireDate},
         #{serialNo},
         #{count},
+        #{reCount},
         #{nameCode},
         #{supId},
         #{invStorageCode},
@@ -131,6 +136,7 @@
         UPDATE io_codes_temp
         <set>
             <if test="count != null">`count`=#{count},</if>
+            <if test="reCount != null">`reCount`=#{reCount},</if>
             <if test="action != null">`action`=#{action},</if>
             <if test="mainAction != null">`mainAction`=#{mainAction},</if>
             <if test="fromCorpId != null">`fromCorpId`=#{fromCorpId},</if>
@@ -162,6 +168,7 @@
             <if test="serialNo != null">`serialNo`=#{serialNo},</if>
             <if test="relId != null">`relId`=#{relId},</if>
             <if test="count != null">`count`=#{count},</if>
+            <if test="reCount != null">`reCount`=#{reCount},</if>
         </set>
         WHERE id=#{id}
     </update>
diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
index 05bd9503..90b22a52 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inout/WarehouseUserDao.xml
@@ -273,6 +273,11 @@
         from inv_warehouse_user
         where userId = #{userId}
     </select>
+
+    <select id="countByCode" resultType="java.lang.Integer">
+        select count(*) from inv_warehouse_user where code = #{code}
+    </select>
+
     <delete id="deleteByCode">
         delete
         from inv_warehouse_user