预装箱单导出bug修复

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

@@ -868,6 +868,15 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         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.getCreateTime())){//创建时间
+            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
+            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+        }
         //预发货日期
         if(oConvertUtils.isNotEmpty(stratDate)){//起始
             queryWrapper.ge("b.hod",stratDate);
@@ -923,6 +932,8 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         CellStyle cellStyle2 = workbook.createCellStyle();//设置单元格样式
         cellStyle2.setAlignment(HorizontalAlignment.CENTER);//左右居中
         cellStyle2.setWrapText(true);//自动换行
+        cellStyle2.setFillForegroundColor(IndexedColors.WHITE.getIndex());//设置前景色 现在是浅绿色
+        cellStyle2.setFillBackgroundColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex());//设置背景色 现在是浅绿色
         cellStyle2.setBorderBottom(BorderStyle.THIN);//边框
         cellStyle2.setBorderTop(BorderStyle.THIN);//边框
         cellStyle2.setBorderLeft(BorderStyle.THIN);//边框
@@ -1062,6 +1073,15 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         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());