预装箱单、装箱单查询增加字段

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

@@ -160,6 +160,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());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -119,10 +119,8 @@ public class SyPreAssembledPackingListVo {
 	private String createBy;
 	/**创建日期*/
 	@ApiModelProperty(value = "创建日期")
-  	@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
-  	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
+  	@Excel(name = "创建日期", width = 20)
+	private String createTime;
 	/**更新人*/
 	@ApiModelProperty(value = "更新人")
   	@Excel(name = "更新人", width = 15)

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

@@ -237,6 +237,9 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){
 			 queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
 		 }
+		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){
+			 queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());//导入时间
+		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(stratDate)){//起始
 			 queryWrapper.ge("b.hod",stratDate);