装箱单成衣模糊查询

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

@@ -100,18 +100,27 @@ public class SyPackingListTailoringController {
 								   String stratDate,
 								   String endDate,
 								   HttpServletRequest req) {
-		String orderNumber=syPackingListTailoringVo.getOrderNumber();//获取订单号
-		String garmentFactory=syPackingListTailoringVo.getGarmentFactory();//获取成衣工厂
-		syPackingListTailoringVo.setOrderNumber(null);//获取订单号
-		syPackingListTailoringVo.setGarmentFactory(null);//获取成衣工厂
 		QueryWrapper<SyPackingListTailoringVo> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListTailoringVo, req.getParameterMap());
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
-		if(oConvertUtils.isNotEmpty(orderNumber)){
-			queryWrapper.like("a.order_number",orderNumber);//查询订单号
+		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
+			queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
 		}
-		if(oConvertUtils.isNotEmpty(garmentFactory)){
-			queryWrapper.like("b.garment_Factory",garmentFactory);//查询成衣工厂
+		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);//起始日期