增加查询条件

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

@@ -148,6 +148,18 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
             queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
         }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
+            queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+        }
+        if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
+            System.out.println("string\t"+syPreAssembledPackingListVo.getIsReference());
+            System.out.println("boolean\t"+syPreAssembledPackingListVo.getIsReference().equals(0));
+            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);

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

@@ -183,6 +183,10 @@ public class SyPreAssembledPackingListVo {
 	@ApiModelProperty(value = "计量单位")
 	@Excel(name = "计量单位", width = 20)
 	private String masterMetering;
+	/**账套号*/
+	@ApiModelProperty(value = "账套号")
+	@Excel(name = "账套号", width = 20)
+	private String acSetNo;
 	//**数量（按合并规则累计）*//*
 //	@ApiModelProperty(value = "数量（按合并规则累计）")
 //	@Excel(name = "数量（按合并规则累计）", width = 20)

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

@@ -118,6 +118,18 @@ public class SyPackingListFabricController {
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
 			queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
 		}
+
+		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());//是否被参照
+			}
+		}
+
 		queryWrapper.eq("a.del_flag","0");
 		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
 		IPage<SyPackingListFabric> pageList = syPackingListFabricService.selectPage(page, queryWrapper);

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

@@ -141,6 +141,16 @@ public class SyPackingListTailoringController {
 		if(oConvertUtils.isNotEmpty(endDate)){
 			queryWrapper.le("b.hod",endDate);//结束日期
 		}
+		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());//是否被参照
+			}
+		}
 		IPage<SyPackingListTailoringVo> pageList = syPackingListTailoringService.selectList(page, queryWrapper);
 		return Result.OK(pageList);
 	}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/SyPackingListTailoring.java

@@ -210,6 +210,7 @@ public class SyPackingListTailoring implements Serializable {
 	@ApiModelProperty(value = "委外采购主表Id")
 	private String ompoId;
 
+
 	/**是否被参照(0:无,1:被预托书参照,2:被装箱单参照)*/
 	//@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
 	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/vo/SyPackingListTailoringVo.java

@@ -159,4 +159,9 @@ public class SyPackingListTailoringVo {
 	@ApiModelProperty(value = "工厂单价")
 	private java.math.BigDecimal factoryUnitPrice;
 
+	/**是否被参照(0:无,1:被预托书参照,2:被装箱单参照)*/
+	//@Excel(name = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)", width = 15)
+	@ApiModelProperty(value = "是否被参照(0:无,1:被预托书参照,2:被装箱单参照)")
+	private Integer isReference;
+
 }