diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
index 2914678..9ae8a7d 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiInfoController.java
@@ -167,7 +167,7 @@ public class UdiInfoController {
             BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest);
 
             filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys());
-            filterThrProductsRequest.setCode(null);
+//            filterThrProductsRequest.setCode(null);
 
             List<ThrProductsEntity> thrCorpEntities
                     = thrProductsService.filterThrProductsRequest(filterThrProductsRequest);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
index 7316f6e..ea14c9e 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/basic/UdiRelevanceController.java
@@ -255,13 +255,13 @@ public class UdiRelevanceController {
                             }
                         }
                     }
-
-
+                    removeProducts(combineRequest);
                     udiRelevanceEntity.setId(combineRequest.getRelId());
                     udiRelevanceEntity.setUuid(key);
                     udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
                     udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
                 } else {
+
                     udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
                     udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
                     udiRelevanceEntity.setUuid(key);
@@ -290,10 +290,25 @@ public class UdiRelevanceController {
         udiRelevanceEntity.setId(combineRequest.getRelId());
         udiRelevanceEntity = setThird(combineRequest, udiRelevanceEntity);
         udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime());
+        removeProducts(combineRequest);
         udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         return ResultVOUtils.success("更新成功");
     }
 
+
+    public void removeProducts(CombineRequest combineRequest) {
+        UdiRelevanceEntity temp = udiRelevanceService.selectById(combineRequest.getRelId());
+        FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
+        filterUdiInfoRequest.setNameCode(combineRequest.getThirdId());
+        filterUdiInfoRequest.setUuid(temp.getUuid());
+        List<UdiInfoEntity> udiInfoEntities = udiInfoService.filterUdiInfo(filterUdiInfoRequest);
+        if (udiInfoEntities != null && udiInfoEntities.size() > 0) {
+            UdiInfoEntity udiInfoEntity = udiInfoEntities.get(0);
+            if (udiInfoEntity.getDeviceRecordKey() == null)
+                udiInfoService.deleteById(udiInfoEntities.get(0).getId() + "");
+        }
+    }
+
     //单独选入ERP产品
     @PostMapping("/udi/udirel/addErp")
     public BaseResponse addErp(@RequestBody CombineRequest combineRequest) {
@@ -309,29 +324,38 @@ public class UdiRelevanceController {
     //一键选入ERP产品
     @PostMapping("/udi/udirel/addAllErp")
     public BaseResponse addAllErp(@RequestBody CombineRequest combineRequest) {
-        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
-        if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
-            return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
-        String url = basicThirdSysDetailEntity.getValue();
-        BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
-        if (basicThirdSysDetailEntity.getFromType() == 0) {
 
 
-            if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {//是否关联库存
-                basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), true);
-            } else {
-                basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), null);
-            }
-
+        if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
+            basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, true);
         } else {
+            basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), null, null);
+        }
 
-            if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
-                basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), true);
-            } else {
-                basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), null);
-            }
 
-        }
+//        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys());
+//        if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null)
+//            return ResultVOUtils.error(500, "ERP产品信息接口地址未定义");
+//        String url = basicThirdSysDetailEntity.getValue();
+//        BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys());
+//        if (basicThirdSysDetailEntity.getFromType() == 0) {
+//
+//
+//            if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {//是否关联库存
+//                basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), true);
+//            } else {
+//                basicBackUpdateProductService.addAllProducts(combineRequest.getQuery(), basicThirdSysDetailEntity.getValue(), inQuery.getValue(), combineRequest.getThirdSys(), null);
+//            }
+//
+//        } else {
+//
+//            if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) {
+//                basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), true);
+//            } else {
+//                basicBackUpdateProductService.loadLocal(combineRequest.getQuery(), combineRequest.getThirdSys(), inQuery.getValue(), null);
+//            }
+//
+//        }
         return ResultVOUtils.success("后台正在添加，请稍后刷新查看！");
     }
 
@@ -600,6 +624,9 @@ public class UdiRelevanceController {
             udiRelevanceEntity.setThirdName4("");
         }
         try {
+            CombineRequest combineRequest = new CombineRequest();
+            combineRequest.setRelId(removeRelRequest.getRelId());
+            removeProducts(combineRequest);
             udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         } catch (Exception e) {
             e.printStackTrace();
@@ -633,6 +660,7 @@ public class UdiRelevanceController {
         return udiRelevanceEntity;
     }
 
+
     public BasicThirdSysEntity filterThirdSys(String thirdId, List<BasicThirdSysEntity> basicThirdSysEntities) {
         if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) {
             for (BasicThirdSysEntity basicThirdSysEntity : basicThirdSysEntities) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
index 0ab216f..2c32a61 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderController.java
@@ -358,8 +358,8 @@ public class StockOrderController {
         for (String id : stockOrderIdsRequest.getIds()) {
             stockOrderFilterRequest.setId(id);
             StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
+            stockPrintService.deleteByOrderId(stockOrderEntity.getId());
             if (stockOrderEntity == null) continue;
-
             StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest();
             stockOrderDetailFilterRequest.setLimit(100);
             stockOrderDetailFilterRequest.setPage(1);
@@ -367,10 +367,6 @@ public class StockOrderController {
             List<StockOrderDetailEntity> stockOrderDetailEntityList =
                     stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest);
 
-//            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
-//            Date date = new Date();
-//            String dateStr = simpleDateFormat.format(date);
-
             List<StockPrintEntity> stockPrintEntities = new ArrayList<>();
             for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) {
                 if (stockOrderIdsRequest.isFilterUDIType()) {
@@ -380,50 +376,22 @@ public class StockOrderController {
                         StockPrintEntity stockPrintEntity = new StockPrintEntity();
                         BeanUtils.copyProperties(udiInfoEntity, stockPrintEntity);
                         stockPrintEntity.setSOrderId(stockOrderEntity.getId());
+                        stockPrintEntity.setUpdateTime(new Date());
+                        stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate());
+                        stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate());
+                        stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo());
                         stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId());
                         stockPrintEntities.add(stockPrintEntity);
                     }
                 }
 
-//                Map<String, Object> reqMap = new HashMap<>();
-//                reqMap.put("thirdSys", stockOrderEntity.getThirdSysFk());
-//                reqMap.put("nameCode", stockOrderDetailEntity.getProductId());
-//
-//                String response = HttpClient.uCloudPost(stpUrl, reqMap);
-//                BaseResponse baseResponse =
-//                        JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
-//                        });
-//
-//                //http://139.159.187.130:8080/UDI_WMS_MC/udiwms/stockPrint/getFilter?genKey=61224093960&page=1&limit=10
-//                StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
-//                stockQRCodeTextEntity.setOrderId(id);
-//                stockQRCodeTextEntity.setDetailId(stockOrderDetailEntity.getId());
-//                stockQRCodeTextEntity.setStatus(101 + "");//生成完成
-//                stockQRCodeTextEntity.setText(String.valueOf(baseResponse.getData()));
-//                Date tDate = new Date();
-//                stockQRCodeTextEntity.setCreate_time(tDate);
-//                stockQRCodeTextEntity.setUpdate_time(tDate);
-//                stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
             }
 
             PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest();
-
             postStockPrintRequest.setThirdSys(stockOrderEntity.getThirdSysFk());
             postStockPrintRequest.setDatas(stockPrintEntities);
             if (stockPrintEntities.size() > 0) {
-                String genKey = generateQRCodeText(postStockPrintRequest);
-                System.out.print(genKey);
-
-//                StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity();
-//                stockQRCodeTextEntity.setOrderId(id);
-////                stockQRCodeTextEntity.setDetailId(stockOrderDetailEntity.getId());
-////                stockQRCodeTextEntity.setDetailId(String.valueOf(0));
-//                stockQRCodeTextEntity.setStatus(101 + "");//生成完成
-//                stockQRCodeTextEntity.setText(genKey);
-//                Date tDate = new Date();
-//                stockQRCodeTextEntity.setCreate_time(tDate);
-//                stockQRCodeTextEntity.setUpdate_time(tDate);
-//                stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
+                generateQRCodeText(postStockPrintRequest);
             }
         }
         return ResultVOUtils.success("操作成功，生成中。");
@@ -433,19 +401,19 @@ public class StockOrderController {
         String genKey = null;
         if (postStockPrintRequest != null) {
 
-            InCodeLogEntity inCodeLogEntity = new InCodeLogEntity();
-            inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS);
-            inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
-            if (postStockPrintRequest.getGenKey() == null) {
-                genKey = CustomUtil.getId();
-                inCodeLogEntity.setGenKey(genKey);
-            } else {
-                genKey = postStockPrintRequest.getGenKey();
-                inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey());
-            }
-            inCodeLogEntity.setStatus(IncodeStatus.PROCESS);
-            inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys());
-            inCodeLogService.insertInCodeLog(inCodeLogEntity);
+//            InCodeLogEntity inCodeLogEntity = new InCodeLogEntity();
+//            inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS);
+//            inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis()));
+//            if (postStockPrintRequest.getGenKey() == null) {
+//                genKey = CustomUtil.getId();
+//                inCodeLogEntity.setGenKey(genKey);
+//            } else {
+//                genKey = postStockPrintRequest.getGenKey();
+//                inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey());
+//            }
+//            inCodeLogEntity.setStatus(IncodeStatus.PROCESS);
+//            inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys());
+//            inCodeLogService.insertInCodeLog(inCodeLogEntity);
 
             List<StockPrintEntity> stockPrintEntities = postStockPrintRequest.getDatas();
             if (stockPrintEntities != null && stockPrintEntities.size() > 0) {
@@ -468,8 +436,8 @@ public class StockOrderController {
                     stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity);
                 }
             }
-            inCodeLogEntity.setStatus(IncodeStatus.FINISH);
-            inCodeLogService.updateInCodeLog(inCodeLogEntity);
+//            inCodeLogEntity.setStatus(IncodeStatus.FINISH);
+//            inCodeLogService.updateInCodeLog(inCodeLogEntity);
         }
         return genKey;
     }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java
index 278199e..acab847 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/inventory/InvPrintController.java
@@ -15,6 +15,7 @@ import com.glxp.sale.common.enums.ResultEnum;
 import com.glxp.sale.common.res.BaseResponse;
 import com.glxp.sale.common.util.ResultVOUtils;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -51,6 +52,25 @@ public class InvPrintController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @GetMapping("/spms/stockPrint/filter")
+    public BaseResponse filterSp( FilterStockprintRequest stockprintRequest,
+                                  BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+//        String thirdSys = systemParamConfigService.selectValueByParamKey("incode_thirdSys_fromType");
+//        stockprintRequest.setThirdSysFk(thirdSys);
+        List<StockPrintEntity> stockPrintEntities
+                = stockPrintService.filterStockPrint(stockprintRequest);
+        PageInfo<StockPrintEntity> pageInfo;
+        pageInfo = new PageInfo<>(stockPrintEntities);
+        PageSimpleResponse<StockPrintEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(stockPrintEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
 
     @PostMapping("udiwms/stockprint/post")
     public BaseResponse postInCode(@RequestBody PostStockPrintRequest postStockPrintRequest, BindingResult bindingResult) {
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvStockPrintDao.java b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvStockPrintDao.java
index 8bebdf1..bcdfcab 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvStockPrintDao.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/dao/inventory/InvStockPrintDao.java
@@ -23,8 +23,10 @@ public interface InvStockPrintDao {
     boolean updateStockPrint(StockPrintEntity udiInfoEntity);
 
     boolean deleteById(@Param("id") String id);
+
     boolean deleteByGenKey(@Param("genKey") String genKey);
 
+    boolean deleteByOrderId(@Param("sOrderId") String sOrderId);
 
     boolean updatePrintStatus(@Param("ids") List<String> ids);
 
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java
index 3f3dbad..308d0d6 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/StockPrintEntity.java
@@ -2,6 +2,8 @@ package com.glxp.sale.admin.entity.basic;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class StockPrintEntity {
     private int id;
@@ -30,4 +32,5 @@ public class StockPrintEntity {
 
     private String sOrderId;
     private String sDetailId;
+    private Date updateTime;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java
index c8d5b02..eff4fe0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/basic/FilterStockprintRequest.java
@@ -17,4 +17,6 @@ public class FilterStockprintRequest extends ListPageRequest {
     private String spaceCode;
     private String thirdSysFk;
     private String genKeyFk;
+    private String sOrderId;
+    private String sDetailId;
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java
index f0d7777..a1f1cae 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/basic/impl/UdiInfoServiceImpl.java
@@ -24,8 +24,11 @@ public class UdiInfoServiceImpl implements UdiInfoService {
         if (filterUdiInfoRequest == null) {
             return Collections.emptyList();
         }
-        int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
-        PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
+        if(filterUdiInfoRequest.getPage()!=null){
+            int offset = (filterUdiInfoRequest.getPage() - 1) * filterUdiInfoRequest.getLimit();
+            PageHelper.offsetPage(offset, filterUdiInfoRequest.getLimit());
+        }
+
         List<UdiInfoEntity> data = udiInfoDao.filterUdiInfo(filterUdiInfoRequest);
         return data;
     }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java
index 054e0ce..02937b0 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvStockPrintService.java
@@ -2,6 +2,7 @@ package com.glxp.sale.admin.service.inventory;
 
 import com.glxp.sale.admin.entity.basic.StockPrintEntity;
 import com.glxp.sale.admin.req.basic.FilterStockprintRequest;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,6 +24,9 @@ public interface InvStockPrintService {
 
     boolean deleteByGenKey(String genKey);
 
+    boolean deleteByOrderId(String sOrderId);
+
+
     boolean updatePrintStatus(List<String> ids);
 
 }
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java
index 5ca9572..4be5f46 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvStockPrintServiceImpl.java
@@ -65,6 +65,11 @@ public class InvStockPrintServiceImpl implements InvStockPrintService {
         return stockPrintDao.deleteByGenKey(genKey);
     }
 
+    @Override
+    public boolean deleteByOrderId(String sOrderId) {
+        return stockPrintDao.deleteByOrderId(sOrderId);
+    }
+
     @Override
     public boolean updatePrintStatus(List<String> ids) {
         return stockPrintDao.updatePrintStatus(ids);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsDlService.java
index 3a27357..24444da 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsDlService.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/thread/ThrProductsDlService.java
@@ -24,10 +24,7 @@ import com.glxp.sale.admin.service.thrsys.ThrProductsExportLogService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsImportDetailService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsImportLogService;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
-import com.glxp.sale.admin.util.Constant;
-import com.glxp.sale.admin.util.ExcelUtil;
-import com.glxp.sale.admin.util.HttpClient;
-import com.glxp.sale.admin.util.RedisUtil;
+import com.glxp.sale.admin.util.*;
 import com.glxp.sale.common.res.BaseResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
@@ -294,7 +291,17 @@ public class ThrProductsDlService {
                         return thrProductsImportDetailEntity;
                     }
             ).collect(Collectors.toList());
-            thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities);
+
+            if (thrProductsImportDetailEntities != null && thrProductsImportDetailEntities.size() > 0) {
+                List<List<ThrProductsImportDetailEntity>> splits = CustomUtil.splitList(thrProductsImportDetailEntities, 100);
+                for(List<ThrProductsImportDetailEntity>  temps :splits){
+                    thrProductsImportDetailService.insertProductsDetailImports(temps);
+                }
+            }
+//            for (ThrProductsImportDetailEntity thrProductsImportDetailEntity : thrProductsImportDetailEntities) {
+//                thrProductsImportDetailService.insertProductsDetailImport(thrProductsImportDetailEntity);
+//            }
+//            thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities);
 
             List<ThrProductsEntity> thrProductsEntities;
             thrProductsEntities = thrProductsImportDetailEntities.stream().map(
@@ -305,7 +312,13 @@ public class ThrProductsDlService {
                         return thrProductsEntity;
                     }
             ).collect(Collectors.toList());
-            thrProductsService.insertThrProductss(thrProductsEntities);
+
+            if (thrProductsEntities != null && thrProductsEntities.size() > 0) {
+                List<List<ThrProductsEntity>> splits = CustomUtil.splitList(thrProductsEntities, 100);
+                for(List<ThrProductsEntity>  temps :splits){
+                    thrProductsService.insertThrProductss(temps);
+                }
+            }
             thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
             thrProductsImportLogEntity.setUpdateTime(new Date());
             thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity);
diff --git a/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java
index 4f2c3d8..cf4e180 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/util/CustomUtil.java
@@ -1,7 +1,6 @@
 package com.glxp.sale.admin.util;
 
-import java.util.Random;
-import java.util.UUID;
+import java.util.*;
 
 public class CustomUtil {
 
@@ -17,4 +16,23 @@ public class CustomUtil {
         id = id+number;
         return id.substring(4);
     }
+
+    public static <T> List<List<T>> splitList(List<T> list, int len) {
+
+        if (list == null || list.isEmpty() || len < 1) {
+            return Collections.emptyList();
+        }
+
+        List<List<T>> result = new ArrayList<>();
+
+        int size = list.size();
+        int count = (size + len - 1) / len;
+
+        for (int i = 0; i < count; i++) {
+            List<T> subList = list.subList(i * len, ((i + 1) * len > size ? size : len * (i + 1)));
+            result.add(subList);
+        }
+
+        return result;
+    }
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml
index 4e62065..67f3ce0 100644
--- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml
@@ -7,7 +7,6 @@
             resultType="com.glxp.sale.admin.entity.basic.StockPrintEntity">
         SELECT * FROM inv_stockprint
         <where>
-
             <if test="nameCode != '' and nameCode != null">
                 AND nameCode = #{nameCode}
             </if>
@@ -32,6 +31,12 @@
             <if test="genKeyFk != '' and genKeyFk != null">
                 AND genKeyFk = #{genKeyFk}
             </if>
+            <if test="sDetailId != '' and sDetailId != null">
+                AND sDetailId = #{sDetailId}
+            </if>
+            <if test="sOrderId != '' and sOrderId != null">
+                AND sOrderId = #{sOrderId}
+            </if>
 
         </where>
 
@@ -55,6 +60,7 @@
         udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo,
         produceDate,expireDate,serialNo,codeType,thirdId,thirdName,
         ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk
+        ,sOrderId,sDetailId,updateTime
         )
         values
             (
@@ -73,7 +79,7 @@
             #{ylqxzcrbarmc},
             #{zczbhhzbapzbh},
             #{warehouseName},
-            #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk}
+            #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk},#{sOrderId},#{sDetailId},#{updateTime}
             )
     </insert>
 
@@ -83,6 +89,7 @@
         udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo,
         produceDate,expireDate,serialNo,codeType,thirdId,thirdName,
         ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk
+        ,sOrderId,sDetailId,updateTime
         )
         values
 
@@ -105,6 +112,7 @@
             #{item.zczbhhzbapzbh},
             #{item.warehouseName},
             #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk},#{item.thirdSysFk}
+            ,#{item.sOrderId},#{item.sDetailId},#{item.updateTime}
             )
         </foreach>
     </insert>
@@ -117,6 +125,10 @@
         DELETE FROM inv_stockprint  WHERE genKeyFk =  #{genKey}
     </delete>
 
+    <delete id="deleteByOrderId" parameterType="Map">
+        DELETE FROM inv_stockprint  WHERE sOrderId =  #{sOrderId}
+    </delete>
+
     <update id="updateStockPrint" parameterType="com.glxp.sale.admin.entity.basic.StockPrintEntity">
         UPDATE inv_stockprint
         <trim prefix="set" suffixOverrides=",">
@@ -140,6 +152,8 @@
             <if test="spaceCode != null">spaceCode=#{spaceCode},</if>
             <if test="spaceName != null">spaceName=#{spaceName},</if>
             <if test="genKeyFk != null">genKeyFk=#{genKeyFk},</if>
+            <if test="sOrderId != null">sOrderId=#{sOrderId},</if>
+            <if test="sDetailId != null">sDetailId=#{sDetailId},</if>
 
         </trim>
         WHERE id = #{id}
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
index 995e19d..4f9205d 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml
@@ -54,7 +54,7 @@
             #{registerNo},
             #{manufactory},
             #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm},
-            #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms}
+            #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms},
             #{thirdSysFk},#{updateTime}
             )
     </insert>
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
index 21d9296..5b19019 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportDetailDao.xml
@@ -26,7 +26,7 @@
 
     <insert id="insertProductsDetailImport" keyProperty="id"
             parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity">
-        insert INTO thr_products_import_detail
+     insert    INTO thr_products_import_detail
         (
         code,name,measname,spec,registerNo,manufactory,
         cplb,flbm,qxlb,ybbm,sptm,tyshxydm,zczbhhzbapzbh,ylqxzcrbarmc,ylqxzcrbarywmc,cpms,
@@ -40,7 +40,7 @@
             #{registerNo},
             #{manufactory},
             #{cplb}, #{flbm}, #{qxlb}, #{ybbm},#{sptm},
-            #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms}
+            #{tyshxydm}, #{zczbhhzbapzbh}, #{ylqxzcrbarmc}, #{ylqxzcrbarywmc},#{cpms},
             #{thirdSysFk},#{updateTime},#{genKeyFk}
                  )
     </insert>
@@ -63,7 +63,7 @@
             #{item.manufactory},
             #{item.cplb}, #{item.flbm}, #{item.qxlb}, #{item.ybbm},#{item.sptm},
             #{item.tyshxydm}, #{item.zczbhhzbapzbh}, #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc},#{item.cpms},
-            #{item.thirdSysFk}  ,#{item.updateTime},#{item.genKeyFk}          )
+            #{item.thirdSysFk} ,#{item.updateTime},#{item.genKeyFk} )
         </foreach>
     </insert>
     <delete id="deleteById" parameterType="Map">
@@ -73,7 +73,8 @@
         DELETE FROM thr_products_import_detail  WHERE genKeyFk =  #{genKey}
     </delete>
 
-    <update id="updateProductsDetailImport" parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity">
+    <update id="updateProductsDetailImport"
+            parameterType="com.glxp.sale.admin.entity.thrsys.ThrProductsImportDetailEntity">
         UPDATE thr_products_import_detail
         <trim prefix="set" suffixOverrides=",">
             <if test="code != null">code=#{code},</if>