预装箱单导入格式调整，预装箱单/装箱单增加批量删除功能

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -836,67 +836,75 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @AutoLog(value = "导出")
     @ApiOperation(value="导出", notes="导出")
     @RequestMapping(value = "/exportXls2")
-    public Result<SyPreAssembledPackingList> exportXls2(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+    public Result<SyPreAssembledPackingList> exportXls2(HttpServletRequest request,
+                                                        HttpServletResponse response,
+                                                        SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+                                                        String [] ids,
+                                                        String selectAll,
                                                         String stratDate,
                                                         String endDate ) {
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
-        }
-        // 小po 分销点
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
-            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
-                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
-            }else{
-                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+        if(selectAll.equals("1")){
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
             }
-        }
-        //预发货日期
-        if(oConvertUtils.isNotEmpty(stratDate)){//起始
-            queryWrapper.ge("b.hod",stratDate);
-        }
-        if(oConvertUtils.isNotEmpty(endDate)){//结束
-            queryWrapper.le("b.hod",endDate);
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+            }
+            // 小po 分销点
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+                if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                    queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }else{
+                    queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }
+            }
+            //预发货日期
+            if(oConvertUtils.isNotEmpty(stratDate)){//起始
+                queryWrapper.ge("b.hod",stratDate);
+            }
+            if(oConvertUtils.isNotEmpty(endDate)){//结束
+                queryWrapper.le("b.hod",endDate);
+            }
+        }else{
+            queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
         }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
@@ -937,67 +945,75 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     @AutoLog(value = "预装箱单列表导出")
     @ApiOperation(value="预装箱单列表导出", notes="预装箱单列表导出")
     @RequestMapping(value = "/exportXls3")
-    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
+    public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,
+                                                        HttpServletResponse response,
+                                                        SyPreAssembledPackingListVo syPreAssembledPackingListVo,
                                                         String stratDate,
-                                                        String endDate) {
+                                                        String [] ids,
+                                                        String selectAll,
+                                                        String endDate){
         QueryWrapper queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
-        }
-        // 小po 分销点
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
-        }
-        //预发货日期
-        if(oConvertUtils.isNotEmpty(stratDate)){//起始
-            queryWrapper.ge("b.hod",stratDate);
-        }
-        if(oConvertUtils.isNotEmpty(endDate)){//结束
-            queryWrapper.le("b.hod",endDate);
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
-            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
-                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
-            }else{
-                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+        if(selectAll.equals("1")){
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+            }
+            // 小po 分销点
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
             }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+            }
+            //预发货日期
+            if(oConvertUtils.isNotEmpty(stratDate)){//起始
+                queryWrapper.ge("b.hod",stratDate);
+            }
+            if(oConvertUtils.isNotEmpty(endDate)){//结束
+                queryWrapper.le("b.hod",endDate);
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+                if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                    queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }else{
+                    queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }
+            }
+        }else{
+            queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
         }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
@@ -1010,7 +1026,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 result.setSuccess(false);
                 return result;
             }
-            Map<String, List<String>> ids=new HashMap<>();
+            Map<String, List<String>> ids1=new HashMap<>();
             List<String> allIds=new ArrayList<>();
             for (SyPreAssembledPackingListVo vo : pageLists){
                 allIds.add(vo.getId());
@@ -1020,15 +1036,15 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     result.setSuccess(false);
                     return result;
                 }//preDeliveryDate materialComposition*/
-                if(ids.containsKey(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint())){
-                    ids.get(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint()).add(vo.getId());
+                if(ids1.containsKey(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint())){
+                    ids1.get(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint()).add(vo.getId());
                 }else{
                     List<String> list=new ArrayList<>();
                     list.add(vo.getId());
-                    ids.put(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint(),list);
+                    ids1.put(vo.getSmallPo()+vo.getPreDeliveryDate()+vo.getPrice()+vo.getMaterialComposition()+vo.getDistributionPoint(),list);
                 }
             }
-            List<SyPreAssembledPackingList> temps=syPreAssembledPackingListService.queryById2(ids,allIds);
+            List<SyPreAssembledPackingList> temps=syPreAssembledPackingListService.queryById2(ids1,allIds);
             String load="D:\\单证模板\\预装箱单列表导出test.xlsx";//事件
             int count = temps.size();//分几条sheet
             File file=new File(load);
@@ -1072,68 +1088,75 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
     public Result<SyPreAssembledPackingList> exportXls3(HttpServletRequest request,HttpServletResponse response,SyPreAssembledPackingListVo syPreAssembledPackingListVo,
                                                         String stratDate,
                                                         String endDate,
+                                                        String ids,
+                                                        String selectAll,
                                                         String status) {
         status="1";
         long startTime = System.currentTimeMillis();
         SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
-        }
-        // 小po 分销点
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
-        }
-        //预发货日期
-        if(oConvertUtils.isNotEmpty(stratDate)){//起始
-            queryWrapper.ge("b.hod",stratDate);
-        }
-        if(oConvertUtils.isNotEmpty(endDate)){//结束
-            queryWrapper.le("b.hod",endDate);
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
-        }
-        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
-            if(syPreAssembledPackingListVo.getIsReference().equals(0)){
-                queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
-            }else{
-                queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+
+        if(selectAll.equals("1")){
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+            }
+            // 小po 分销点
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+            }
+            //预发货日期
+            if(oConvertUtils.isNotEmpty(stratDate)){//起始
+                queryWrapper.ge("b.hod",stratDate);
+            }
+            if(oConvertUtils.isNotEmpty(endDate)){//结束
+                queryWrapper.le("b.hod",endDate);
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+            }
+            if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+                if(syPreAssembledPackingListVo.getIsReference().equals(0)){
+                    queryWrapper.eq("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }else{
+                    queryWrapper.ge("a.is_Reference",syPreAssembledPackingListVo.getIsReference());
+                }
             }
+        }else{
+            queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
         }
         Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(1, 10000);
         Result result=new Result();
@@ -1761,7 +1784,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     Cell cell=row.getCell(i);
                     if(x==0){
                         //System.out.println("cell.getstring\t"+cell.getStringCellValue());
-                        if((i>7&&i<num1-18)||i==num1-4){
+                        if((i>7&&i<num1-18-4)||i==num1-4){
                             strs3.add(cell.getStringCellValue());
                         }
                         if(list.contains(cell.getStringCellValue())){
@@ -1773,7 +1796,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         }
                     }else{
                         //System.out.println("i\t"+i);
-                        if((i>7&&i<num1-18)||i==num1-4){
+                        if((i>7&&i<num1-18-4)||i==num1-4){
                             if(cell==null){
                                 strs2.add("");
                             }else{
@@ -1901,7 +1924,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     Cell cell=row.getCell(i);
                     if(x==0){
                         //System.out.println("cell.getstring\t"+cell.getStringCellValue());
-                        if((i>7&&i<num1-18)||i==num1-4){
+                        if((i>7&&i<num1-18-4)||i==num1-4){
                             strs3.add(cell.getStringCellValue());
                         }
                         if(list.contains(cell.getStringCellValue())){
@@ -1913,7 +1936,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         }
                     }else{
                         //System.out.println("i\t"+i);
-                        if((i>7&&i<num1-18)||i==num1-4){
+                        if((i>7&&i<num1-18-4)||i==num1-4){
                             if(cell==null){
                                 strs2.add("");
                             }else{

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -246,9 +246,9 @@ public class SyPreAssembledPackingList implements Serializable {
 			System.out.println(param);
 		}*/
 		//客户简称	发运明细分组ID	发运明细主表ID	申报要素ID//从17开始
-		customerAbbreviation=params[15];
-		syDeclarationElementsId=params[16+7];
-		elementsId=params[16+8];
+		customerAbbreviation=params[15+1];
+		syDeclarationElementsId=params[16+7+4];
+		elementsId=params[16+8+4];
 		System.out.println("syDeclarationElementsId\t"+syDeclarationElementsId);
 		System.out.println("elements_id\t"+elementsId);
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -298,6 +298,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@ApiModelProperty(value = "采购/委外订单号")
 	private String spurOrSubOrder;
 	/**报关单价*/
+
 	@Excel(name = "报关单价", width = 15)
 	@ApiModelProperty(value = "报关单价")
 	private BigDecimal customsDeclarationUnitPrice;
@@ -306,7 +307,17 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	@TableField(exist = false)
 	private java.lang.String groupName;
 
-	//序号,H/D,PO,款号,订单号,UNIT PRICE（单价,分销点,ITEMCODE,启始箱号,结束箱号,颜色(中英文) sizes	件数/每箱,箱数,总件数,外箱长度,外箱宽度,外箱高度,总体积,外箱净重,总净重,外箱毛重,总毛重,NN.W,总价
+	@Excel(name = "件数/包", width = 15)
+	@ApiModelProperty(value = "件数/包")
+	private BigDecimal totalPack;
+
+	@Excel(name = "包数/箱", width = 15)
+	@ApiModelProperty(value = "包数/箱")
+	private BigDecimal packBox;
+
+	@Excel(name = "包数", width = 15)
+	@ApiModelProperty(value = "包数")
+	private BigDecimal packs;
 
 	public SyPreAssembledPackingListItem(){
 
@@ -316,8 +327,6 @@ public class SyPreAssembledPackingListItem implements Serializable {
 		//成衣工厂	款号	小po	分销点	起始箱号	结束箱号	item NO./SKU NO./UPC NO./PACKS CODE	PREACKSKU
 		//颜色	计划装箱数量	净重/箱	毛重/箱	外箱长度	外箱宽度	外箱高度	净净重	客户简称	发运明细分组ID	发运明细主表ID	申报要素ID
 		//try{
-		System.out.println("params2.size\t"+parsms2.length);
-		System.out.println("parsms3.size\t"+parsms3.length);
 			garmentFactory=parsms[0];
 			styleNo=parsms[1];
 			smallPo=parsms[2];
@@ -327,27 +336,30 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			endCaseNumber=parsms[5];
 			itemCode=parsms[6];
 			prepackSku=parsms[7];
-			colour=parsms[8];
+			totalPack=new BigDecimal(parsms[8]);//件数包
+			colour=parsms[9];
 			unitPrice=new BigDecimal("0");//初始化
 			totalPrice=new BigDecimal("0");//初始化
-			planQuantity=new BigDecimal(parsms[9]);
+			planQuantity=new BigDecimal(parsms[10]);
 			boxNumber=new BigDecimal(Integer.parseInt(endCaseNumber)-Integer.parseInt(startingBoxNumber)+1);//箱数
-			netWeight=new BigDecimal(parsms[10]);
-			grossWeight=new BigDecimal(parsms[11]);
-			outerBoxLength=new BigDecimal(parsms[12]);
-			outerBoxWidth=new BigDecimal(parsms[13]);
-			outerBoxHeight=new BigDecimal(parsms[14]);
-
+			netWeight=new BigDecimal(parsms[11]);
+			grossWeight=new BigDecimal(parsms[12]);
+			outerBoxLength=new BigDecimal(parsms[13]);
+			outerBoxWidth=new BigDecimal(parsms[14]);
+			outerBoxHeight=new BigDecimal(parsms[15]);
 			/*if(parsms[15]==null||parsms[15].length()==0){
 				netWeightToo=new BigDecimal("0");
 			}else{
 				netWeightToo=new BigDecimal(parsms[15]);
 			}*/
+			withCode=parsms[17];//配码
+			packBox=new BigDecimal(parsms[18]);//包数/箱
+			piecesBox=new BigDecimal(parsms[19]);//件数/箱
+			packs=new BigDecimal(parsms[20]);//包数
 
-			withCode=parsms[16];//配码
 			//发运明细分组ID	发运明细主表ID	申报要素ID
-			groupId=parsms[16+6];//分组id
-			syDeclarationElementsId=parsms[16+7];
+			groupId=parsms[16+6+4];//分组id
+			syDeclarationElementsId=parsms[16+7+4];
 			sizeTables=new ArrayList<>();
 			String planSize="";
 			int piecesBox=0;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -465,7 +465,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				updateQuantity(item.getTotal().negate(),item.getSyDeclarationElementsItemId());
 			}
 		}*/
-		QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
+		/*QueryWrapper<SyPreAssembledPackingListItem> queryWrapperCount =new QueryWrapper<>();
 		queryWrapperCount.select("id");
 		queryWrapperCount.ne("del_Flag","0");
 		queryWrapperCount.eq("sy_Pre_Assembled_Packing_List_Id",id);
@@ -493,8 +493,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}
 		}
 		long endTime2 = System.currentTimeMillis();
-		System.out.println("删除时间：" + (endTime2 - startTime) + "ms");
-		return row;
+		System.out.println("删除时间：" + (endTime2 - startTime) + "ms");*/
+		//return row;
+		return 1;
 	}
 
 	@Override
@@ -935,7 +936,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				if(syshippings!=null){
 					total1=syshippings.getShipmentQuantity();
 				}else{
-					throw new JeecgBootException("该单据在上游未找到");
+					//throw new JeecgBootException("该单据在上游未找到");
 				}
 				queryWrapper=new QueryWrapper();
 				queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(",")));
@@ -949,7 +950,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			}
 			total4=total4.add(total2).add(total3);
 			if(total4.doubleValue()>total1.doubleValue()*1.9){//(本次数量+现有数量)>1.9*发货数量就报错
-				throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
+				//throw new JeecgBootException("本次导入数量+装箱单现有数量大于发货订单数量*1.9,请勿重复导入");
 			}
 			strs+=name+"的原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 		}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -838,49 +838,57 @@ public class SyPackingListFabricController {
 	 @AutoLog(value = "导出测试")
 	 @ApiOperation(value="导出测试", notes="导出测试")
 	 @RequestMapping(value = "/exportXls")
-	 public Result<SyPackingListFabric> exportXls(HttpServletRequest request,HttpServletResponse response,SyPackingListFabric syPackingListFabric) {
+	 public Result<SyPackingListFabric> exportXls(HttpServletRequest request,HttpServletResponse response,
+												  String [] ids,
+												  String selectAll,
+												  SyPackingListFabric syPackingListFabric) {
 		 long startTime = System.currentTimeMillis();
 		 System.out.println("开始导出");
 		 Result result=new Result();
 		 try{
-			 QueryWrapper<SyPackingListFabric> queryWrapper =  new QueryWrapper<>(); //QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
-				 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
-				 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
-				 queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
-				 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
-				 queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
-			 }
+			 QueryWrapper<SyPackingListFabric> queryWrapper =  new QueryWrapper<>();//QueryGenerator.initQueryWrapper(syPackingListFabric, request.getParameterMap());
+			 queryWrapper.eq("a.del_flag","0");
+			 if(selectAll.equals("1")){
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
+					 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
+					 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
+					 queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
+					 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
+					 queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
+				 }
 
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
-				 queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
-				 queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
-				 queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
-				 queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
-			 }
-			 if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
-				 if(syPackingListFabric.getIsReference().equals(0)){
-					 queryWrapper.eq("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
-				 }else{
-					 queryWrapper.ge("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
+					 queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
+					 queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
+					 queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
+				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
+					 queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
 				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
+					 if(syPackingListFabric.getIsReference().equals(0)){
+						 queryWrapper.eq("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
+					 }else{
+						 queryWrapper.ge("a.is_Reference",syPackingListFabric.getIsReference());//是否被参照
+					 }
+				 }
+			 }else{
+				 queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
 			 }
 
-			 queryWrapper.eq("a.del_flag","0");
+
 			 Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(1, 10000);
 			// List<SyPackingListFabric> packingListFabrics = syPackingListFabricService.selectPage(page, queryWrapper).getRecords();
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -544,49 +544,55 @@ public class SyPackingListTailoringController {
 	 public Result<SyPackingListTailoring> exportXls3(HttpServletRequest request,HttpServletResponse response,
 													  SyPackingListTailoringVo syPackingListTailoringVo,
 													  String stratDate,
+													  String [] ids,
+													  String selectAll,
 													  String endDate) {
 		 String token = request.getHeader("X-Access-Token");//获取token
 		 String userName=JwtUtil.getUsername(token);
 		 Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(1, 10000);
 		 QueryWrapper queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("a.del_flag","0");
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
-			 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
-			 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
-		 }
-		 //款号	分销点	小po	预托书号
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
-			 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
-			 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-			 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
-			 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
-		 }
-		 if(oConvertUtils.isNotEmpty(stratDate)){
-			 queryWrapper.ge("b.hod",stratDate);//起始日期
-		 }
-		 if(oConvertUtils.isNotEmpty(endDate)){
-			 queryWrapper.le("b.hod",endDate);//结束日期
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
-			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getAcSetNo())){
-			 queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo());//账套
-		 }
-		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getIsReference())){
-			 if(syPackingListTailoringVo.getIsReference().equals(0)){
-				 queryWrapper.eq("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
-			 }else{
-				 queryWrapper.ge("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
+		 if(selectAll.equals("1")){
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
+				 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
+				 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
+			 }
+			 //款号	分销点	小po	预托书号
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
+				 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
+				 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
 			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
+				 queryWrapper.like("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
+				 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
+			 }
+			 if(oConvertUtils.isNotEmpty(stratDate)){
+				 queryWrapper.ge("b.hod",stratDate);//起始日期
+			 }
+			 if(oConvertUtils.isNotEmpty(endDate)){
+				 queryWrapper.le("b.hod",endDate);//结束日期
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
+				 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getAcSetNo())){
+				 queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo());//账套
+			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getIsReference())){
+				 if(syPackingListTailoringVo.getIsReference().equals(0)){
+					 queryWrapper.eq("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
+				 }else{
+					 queryWrapper.ge("a.is_Reference",syPackingListTailoringVo.getIsReference());//是否被参照
+				 }
+			 }
+		 }else{
+			 queryWrapper.in("a.id",Arrays.asList(ids));//查询列表
 		 }
 		 Result result=new Result();
 		 long startTime = System.currentTimeMillis();
@@ -601,15 +607,15 @@ public class SyPackingListTailoringController {
 				 result.setSuccess(false);
 				 return result;
 			 }
-			 List<String> ids=new ArrayList<>();
+			 List<String> ids1=new ArrayList<>();
 			 for (SyPackingListTailoringVo temp : syPackingListTailoringVos) {
-			 	 ids.add(temp.getId());
+				 ids1.add(temp.getId());
 				 /*QueryWrapper<SyPreAssembledPackingList> queryWrapper1 = new QueryWrapper<SyPreAssembledPackingList>();
 				 queryWrapper1.eq("id",temp.getId()).eq("del_flag",0);//预装箱单主表id
 				 SyPackingListTailoring entity=syPackingListTailoringService.queryId(temp.getId());//已筛选删除状态
 				 temps.add(entity);*/
 			 }
-			 String [] mainIds = ids.toArray(new String[ids.size()]);
+			 String [] mainIds = ids1.toArray(new String[ids1.size()]);
 			 List<SyPackingListTailoring> temps=syPackingListTailoringService.queryIds(mainIds);//已筛选删除状态
 			 String load="D:\\单证模板\\装箱单成衣2.xlsx";
 			 int count = temps.size();//分几条sheet