Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

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

@@ -115,47 +115,47 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         long startTime = System.currentTimeMillis();
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+            queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.eq("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            queryWrapper.eq("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+            queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+            queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+            queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+            queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+            queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus().trim());
         }
         // 小po 分销点
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.likeRight("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+            queryWrapper.likeRight("b.small_Po",syPreAssembledPackingListVo.getSmallPo().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-            queryWrapper.eq("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+            queryWrapper.eq("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo().trim());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
             if(syPreAssembledPackingListVo.getIsReference().equals(0)){
@@ -202,26 +202,26 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             queryWrapper.like("t.documentNo", documentNo);//单据号
         }
         if(oConvertUtils.isNotEmpty(clientAbbreviation)){//客户
-            queryWrapper.like("t.customerAbbreviation",clientAbbreviation);
+            queryWrapper.like("t.customerAbbreviation",clientAbbreviation.trim());
         }
         if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-            queryWrapper.like("t.distributionPoint",distributionPoint);
+            queryWrapper.like("t.distributionPoint",distributionPoint.trim());
         }
         if(oConvertUtils.isNotEmpty(smallPo)){//小po
-            queryWrapper.like("t.smallPo",smallPo);
+            queryWrapper.like("t.smallPo",smallPo.trim());
         }
         if(oConvertUtils.isNotEmpty(salesman)){//业务员
-            queryWrapper.like("t.salesman",salesman);
+            queryWrapper.like("t.salesman",salesman.trim());
         }
         if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
-            queryWrapper.like("t.garmentFactory",garmentFactory);
+            queryWrapper.like("t.garmentFactory",garmentFactory.trim());
         }
         //预发货日期
         if(oConvertUtils.isNotEmpty(startDate)){//起始
-            queryWrapper.ge("t.preDeliveryDate",startDate);
+            queryWrapper.ge("t.preDeliveryDate",startDate.trim());
         }
         if(oConvertUtils.isNotEmpty(endDate)){//结束
-            queryWrapper.le("t.preDeliveryDate",endDate);
+            queryWrapper.le("t.preDeliveryDate",endDate.trim());
         }
         if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
             if(status.equals("n")){
@@ -848,47 +848,47 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
         if(selectAll.equals("1")){
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName().trim());
             }
             // 小po 分销点
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
                 if(syPreAssembledPackingListVo.getIsReference().equals(0)){
@@ -957,44 +957,44 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         queryWrapper.eq("a.del_flag","0");//默认查询未删除
         if(selectAll.equals("1")){
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo().trim());
             }
             // 小po 分销点
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus().trim());
             }
             //预发货日期
             if(oConvertUtils.isNotEmpty(stratDate)){//起始
@@ -1004,7 +1004,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 queryWrapper.le("b.hod",endDate);
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
                 if(syPreAssembledPackingListVo.getIsReference().equals(0)){
@@ -1100,44 +1100,44 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 
         if(selectAll.equals("1")){
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getId())){//查询id
-                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
+                queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){//客户简称
-                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());
+                queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+                queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+                queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+                queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+                queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
+                queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateBy())){//创建人
-                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy());
+                queryWrapper.like("a.create_by",syPreAssembledPackingListVo.getCreateBy().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCreateTime())){//创建时间
-                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime());
+                queryWrapper.like("a.create_time",syPreAssembledPackingListVo.getCreateTime().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){//预托书号
-                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());
+                queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo().trim());
             }
             // 小po 分销点
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+                queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+                queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getStatus())){//状态
-                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus());
+                queryWrapper.like("a.status",syPreAssembledPackingListVo.getStatus().trim());
             }
             //预发货日期
             if(oConvertUtils.isNotEmpty(stratDate)){//起始
@@ -1147,7 +1147,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                 queryWrapper.le("b.hod",endDate);
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getAcSetNo())){//账套号
-                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo());
+                queryWrapper.like("b.ac_Set_No",syPreAssembledPackingListVo.getAcSetNo().trim());
             }
             if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getIsReference())){//是否被参照
                 if(syPreAssembledPackingListVo.getIsReference().equals(0)){

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

@@ -102,35 +102,35 @@ public class SyPackingListFabricController implements Job {
 		Result<IPage<SyPackingListFabric>> result= new Result();
 		QueryWrapper<SyPackingListFabric> queryWrapper = new QueryWrapper<>();
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
-			queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
+			queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber().trim());//订单号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
-			queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
+			queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber().trim());//集装箱号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
-			queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
+			queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo().trim());//单据号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getPushState())){//推送状态
-			queryWrapper.like("a.push_State",syPackingListFabric.getPushState());//推送状态
+			queryWrapper.like("a.push_State",syPackingListFabric.getPushState().trim());//推送状态
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
-			queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
+			queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo().trim());//外销发票号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
-			queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
+			queryWrapper.like("a.status",syPackingListFabric.getStatus().trim());//外销发票号
 		}
 
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
-			queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
+			queryWrapper.like("b.salesman",syPackingListFabric.getSalesman().trim());//业务员
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
-			queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
+			queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber().trim());//计划单号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
-			queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
+			queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy().trim());//制单人
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
-			queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
+			queryWrapper.like("a.account",syPackingListFabric.getAccount().trim());//账套号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
 			if(syPackingListFabric.getIsReference().equals(0)){
@@ -171,32 +171,32 @@ public class SyPackingListFabricController implements Job {
 		 String token = req.getHeader("X-Access-Token");//获取token
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		 if(oConvertUtils.isNotEmpty(documentNo)) {//单据号
-			 queryWrapper.like("t.documentNo", documentNo);//单据号
+			 queryWrapper.like("t.documentNo", documentNo.trim());//单据号
 		 }
 		 if(oConvertUtils.isNotEmpty(orderNumber)){//订单号
-			 queryWrapper.like("t.orderNumber", orderNumber);//订单号
+			 queryWrapper.like("t.orderNumber", orderNumber.trim());//订单号
 		 }
 		 if(oConvertUtils.isNotEmpty(createBy)){//制单人
-			 queryWrapper.like("t.createBy", createBy);//制单人
+			 queryWrapper.like("t.createBy", createBy.trim());//制单人
 		 }
 		 if(oConvertUtils.isNotEmpty(customer)){//客户
-			 queryWrapper.like("t.customer",customer);//客户
+			 queryWrapper.like("t.customer",customer.trim());//客户
 		 }
 		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-			 queryWrapper.like("t.distributionPoint",distributionPoint);//分销点
+			 queryWrapper.like("t.distributionPoint",distributionPoint.trim());//分销点
 		 }
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
-			 queryWrapper.like("t.smallPo",smallPo);//小po
+			 queryWrapper.like("t.smallPo",smallPo.trim());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
-			 queryWrapper.like("t.garmentFactory",garmentFactory);//成衣工厂
+			 queryWrapper.like("t.garmentFactory",garmentFactory.trim());//成衣工厂
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始
-			 queryWrapper.ge("t.preDeliveryDate",startDate);
+			 queryWrapper.ge("t.preDeliveryDate",startDate.trim());
 		 }
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
-			 queryWrapper.le("t.preDeliveryDate",endDate);
+			 queryWrapper.le("t.preDeliveryDate",endDate.trim());
 		 }
 		 if(oConvertUtils.isNotEmpty(status)){//选择正常或者超发状态
 			 if(status.equals("n")){
@@ -1032,35 +1032,35 @@ public class SyPackingListFabricController implements Job {
 			 queryWrapper.eq("a.del_flag","0");
 			 if(selectAll.equals("1")){
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
-					 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
+					 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber().trim());//订单号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPushState())){//推送状态
-					 queryWrapper.like("a.push_State",syPackingListFabric.getPushState());//推送状态
+					 queryWrapper.like("a.push_State",syPackingListFabric.getPushState().trim());//推送状态
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
-					 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
+					 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber().trim());//集装箱号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
-					 queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
+					 queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo().trim());//单据号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
-					 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
+					 queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo().trim());//外销发票号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getStatus())){
-					 queryWrapper.like("a.status",syPackingListFabric.getStatus());//外销发票号
+					 queryWrapper.like("a.status",syPackingListFabric.getStatus().trim());//外销发票号
 				 }
 
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getSalesman())){
-					 queryWrapper.like("b.salesman",syPackingListFabric.getSalesman());//业务员
+					 queryWrapper.like("b.salesman",syPackingListFabric.getSalesman().trim());//业务员
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPlanLotNumber())){
-					 queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber());//计划单号
+					 queryWrapper.like("b.plan_Lot_Number",syPackingListFabric.getPlanLotNumber().trim());//计划单号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getCreateBy())){
-					 queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy());//制单人
+					 queryWrapper.like("a.create_by",syPackingListFabric.getCreateBy().trim());//制单人
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getAccount())){
-					 queryWrapper.like("a.account",syPackingListFabric.getAccount());//账套号
+					 queryWrapper.like("a.account",syPackingListFabric.getAccount().trim());//账套号
 				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getIsReference())){
 					 if(syPackingListFabric.getIsReference().equals(0)){

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

@@ -128,32 +128,32 @@ public class SyPackingListTailoringController implements Job {
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
-			queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
+			queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber().trim());//查询订单号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
-			queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
+			queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory().trim());//查询成衣工厂
 		}
 		//款号	分销点	小po	预托书号
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
-			queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
+			queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber().trim());//款号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
-			queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+			queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState().trim());//推送状态
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
-			queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
+			queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint().trim());//分销点
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-			queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+			queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo().trim());//小po
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
-			queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
+			queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo().trim());//预托书号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
-			queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+			queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber().trim());//托书号
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
-			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//状态
+			queryWrapper.like("a.status",syPackingListTailoringVo.getStatus().trim());//状态
 		}
 		if(oConvertUtils.isNotEmpty(stratDate)){
 			queryWrapper.ge("b.hod",stratDate);//起始日期
@@ -162,7 +162,7 @@ public class SyPackingListTailoringController implements Job {
 			queryWrapper.le("b.hod",endDate);//结束日期
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getAcSetNo())){
-			queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo());//账套
+			queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo().trim());//账套
 		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getIsReference())){
 			if(syPackingListTailoringVo.getIsReference().equals(0)){
@@ -257,35 +257,35 @@ public class SyPackingListTailoringController implements Job {
 		 queryWrapper.eq("a.status","1");//查询已提交数据
 		 //queryWrapper.eq("a.is_Reference","1");//查询已提交数据
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
-			 queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
+			 queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation().trim());//客户简称
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
-			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
+			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint().trim());//分销点
 		 }
 /*		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getPreDeliveryDate())){
 			 queryWrapper.eq("b.hod",syPreAssembledPackingListVo.getPreDeliveryDate());//预发货日期
 		 }*/
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){
-			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
+			 queryWrapper.eq("b.small_po",syPreAssembledPackingListVo.getSmallPo().trim());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
-			 queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
+			 queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber().trim());//订单号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){
-			 queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());//款号
+			 queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber().trim());//款号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){
-			 queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
+			 queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName().trim());//品名
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDepositaryReceiptNo())){
-			 queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo());//预托书号
+			 queryWrapper.like("a.depositary_Receipt_No",syPreAssembledPackingListVo.getDepositaryReceiptNo().trim());//预托书号
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(stratDate)){//起始
-			 queryWrapper.ge("b.hod",stratDate);
+			 queryWrapper.ge("b.hod",stratDate.trim());
 		 }
 		 if(oConvertUtils.isNotEmpty(endDate)){//结束
-			 queryWrapper.le("b.hod",endDate);
+			 queryWrapper.le("b.hod",endDate.trim());
 		 }
 		/* if(oConvertUtils.isNotEmpty(orderStatus)){//选择正常或者超发状态
 			 if(orderStatus.equals("n")){
@@ -567,29 +567,29 @@ public class SyPackingListTailoringController implements Job {
 		 queryWrapper.eq("a.del_flag","0");
 		 if(selectAll.equals("1")){
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
-				 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
+				 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber().trim());//查询订单号
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
-				 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
+				 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory().trim());//查询成衣工厂
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
-				 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+				 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState().trim());//推送状态
 			 }
 			 //款号	分销点	小po	预托书号
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
-				 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
+				 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber().trim());//款号
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
-				 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
+				 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint().trim());//分销点
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-				 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+				 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo().trim());//小po
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
-				 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
+				 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo().trim());//预托书号
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
-				 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+				 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber().trim());//托书号
 			 }
 			 if(oConvertUtils.isNotEmpty(stratDate)){
 				 queryWrapper.ge("b.hod",stratDate);//起始日期
@@ -598,10 +598,10 @@ public class SyPackingListTailoringController implements Job {
 				 queryWrapper.le("b.hod",endDate);//结束日期
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
-				 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//款号
+				 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus().trim());//款号
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getAcSetNo())){
-				 queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo());//账套
+				 queryWrapper.like("b.ac_set_no",syPackingListTailoringVo.getAcSetNo().trim());//账套
 			 }
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getIsReference())){
 				 if(syPackingListTailoringVo.getIsReference().equals(0)){
@@ -775,29 +775,29 @@ public class SyPackingListTailoringController implements Job {
 		 QueryWrapper queryWrapper = new QueryWrapper<>();
 		 queryWrapper.eq("a.del_flag","0");
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getOrderNumber())){
-			 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber());//查询订单号
+			 queryWrapper.like("a.order_number",syPackingListTailoringVo.getOrderNumber().trim());//查询订单号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
-			 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
+			 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory().trim());//查询成衣工厂
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
-			 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+			 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState().trim());//推送状态
 		 }
 		 //款号	分销点	小po	预托书号
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
-			 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
+			 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber().trim());//款号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
-			 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
+			 queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint().trim());//分销点
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getShippingOrderNumber())){
-			 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber());//托书号
+			 queryWrapper.like("a.shipping_Order_Number",syPackingListTailoringVo.getShippingOrderNumber().trim());//托书号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getSmallPo())){
-			 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo());//小po
+			 queryWrapper.eq("b.small_po",syPackingListTailoringVo.getSmallPo().trim());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDepositaryReceiptNo())){
-			 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo());//预托书号
+			 queryWrapper.like("a.depositary_Receipt_No",syPackingListTailoringVo.getDepositaryReceiptNo().trim());//预托书号
 		 }
 		 if(oConvertUtils.isNotEmpty(stratDate)){
 			 queryWrapper.ge("b.hod",stratDate);//起始日期
@@ -806,7 +806,7 @@ public class SyPackingListTailoringController implements Job {
 			 queryWrapper.le("b.hod",endDate);//结束日期
 		 }
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getStatus())){
-			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus());//状态
+			 queryWrapper.like("a.status",syPackingListTailoringVo.getStatus().trim());//状态
 		 }
 		 Result result=new Result();
 		 try{