分页和参照改成模糊查询

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

@@ -143,26 +143,26 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             queryWrapper.eq("a.id",syPreAssembledPackingListVo.getId());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){//订单号
-            queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
+            queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getGarmentFactory())){//成衣工厂
-            queryWrapper.eq("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
+            queryWrapper.like("b.garment_Factory",syPreAssembledPackingListVo.getGarmentFactory());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDocumentNo())){//单据号
-            queryWrapper.eq("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
+            queryWrapper.like("a.document_No",syPreAssembledPackingListVo.getDocumentNo());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){//款号
-            queryWrapper.eq("a.item_number",syPreAssembledPackingListVo.getItemNumber());
+            queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){//品名
-            queryWrapper.eq("a.product_Name",syPreAssembledPackingListVo.getProductName());
+            queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());
         }
         // 小po 分销点
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getSmallPo())){//小po
-            queryWrapper.eq("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
+            queryWrapper.like("b.small_Po",syPreAssembledPackingListVo.getSmallPo());
         }
         if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){//分销点
-            queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
+            queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());
         }
         //预发货日期
         if(oConvertUtils.isNotEmpty(stratDate)){//起始
@@ -197,22 +197,22 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
         Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
         QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
         if(oConvertUtils.isNotEmpty(documentNo)) {
-            queryWrapper.eq("t.documentNo", documentNo);//单据号
+            queryWrapper.like("t.documentNo", documentNo);//单据号
         }
         if(oConvertUtils.isNotEmpty(customer)){//客户
-            queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);
+            queryWrapper.like("t.customer",customer).or().like("t.customerAbbreviation",customer);
         }
         if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-            queryWrapper.eq("t.distributionPoint",distributionPoint);
+            queryWrapper.like("t.distributionPoint",distributionPoint);
         }
         if(oConvertUtils.isNotEmpty(smallPo)){//小po
-            queryWrapper.eq("t.smallPo",smallPo);
+            queryWrapper.like("t.smallPo",smallPo);
         }
-        if(oConvertUtils.isNotEmpty(salesman)){//小po
-            queryWrapper.eq("t.salesman",salesman);
+        if(oConvertUtils.isNotEmpty(salesman)){//业务员
+            queryWrapper.like("t.salesman",salesman);
         }
-        if(oConvertUtils.isNotEmpty(garmentFactory)){//小po
-            queryWrapper.eq("t.garmentFactory",garmentFactory);
+        if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
+            queryWrapper.like("t.garmentFactory",garmentFactory);
         }
         //预发货日期
         if(oConvertUtils.isNotEmpty(startDate)){//起始

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

@@ -93,18 +93,18 @@ public class SyPackingListFabricController {
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 		Result<IPage<SyPackingListFabric>> result= new Result();
-		String orderNumber=syPackingListFabric.getOrderNumber();//获取订单号
-		String containerNumber=syPackingListFabric.getContainerNumber();//获取集装箱号
-		syPackingListFabric.setOrderNumber(null);//设置为null
-		syPackingListFabric.setContainerNumber(null);//设置为null
-		LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-		System.out.println("sysUser的数据为:\t"+sysUser);
-		QueryWrapper<SyPackingListFabric> queryWrapper = QueryGenerator.initQueryWrapper(syPackingListFabric, req.getParameterMap());
-		if(oConvertUtils.isNotEmpty(orderNumber)){
-			queryWrapper.eq("a.order_number",orderNumber);
+		QueryWrapper<SyPackingListFabric> queryWrapper = new QueryWrapper<>();
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
+			queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
 		}
-		if(oConvertUtils.isNotEmpty(containerNumber)){
-			queryWrapper.eq("a.container_Number",containerNumber);
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
+			queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
+		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
+			queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
+		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
+			queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
 		}
 		queryWrapper.eq("a.del_flag","0");
 		Page<SyPackingListFabric> page = new Page<SyPackingListFabric>(pageNo, pageSize);
@@ -133,25 +133,25 @@ public class SyPackingListFabricController {
 		 Result<IPage<SyShippingDetailsVo>> result = new Result<IPage<SyShippingDetailsVo>>();
 		 QueryWrapper<SyShippingDetailsVo> queryWrapper = new QueryWrapper<>();
 		 if(oConvertUtils.isNotEmpty(documentNo)) {//单据号
-			 queryWrapper.eq("t.documentNo", documentNo);//单据号
+			 queryWrapper.like("t.documentNo", documentNo);//单据号
 		 }
 		 if(oConvertUtils.isNotEmpty(orderNumber)){//订单号
-			 queryWrapper.eq("t.orderNumber", orderNumber);//订单号
+			 queryWrapper.like("t.orderNumber", orderNumber);//订单号
 		 }
 		 if(oConvertUtils.isNotEmpty(createBy)){//制单人
-			 queryWrapper.eq("t.createBy", createBy);//制单人
+			 queryWrapper.like("t.createBy", createBy);//制单人
 		 }
 		 if(oConvertUtils.isNotEmpty(customer)){//客户
-			 queryWrapper.eq("t.customer",customer).or().eq("t.customerAbbreviation",customer);//客户
+			 queryWrapper.like("t.customer",customer).or().eq("t.customerAbbreviation",customer);//客户
 		 }
 		 if(oConvertUtils.isNotEmpty(distributionPoint)){//分销点
-			 queryWrapper.eq("t.distributionPoint",distributionPoint);//分销点
+			 queryWrapper.like("t.distributionPoint",distributionPoint);//分销点
 		 }
 		 if(oConvertUtils.isNotEmpty(smallPo)){//小po
-			 queryWrapper.eq("t.smallPo",smallPo);//小po
+			 queryWrapper.like("t.smallPo",smallPo);//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(garmentFactory)){//成衣工厂
-			 queryWrapper.eq("t.garmentFactory",garmentFactory);//成衣工厂
+			 queryWrapper.like("t.garmentFactory",garmentFactory);//成衣工厂
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(startDate)){//起始

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricItemMapper.xml

@@ -138,7 +138,7 @@
 	<!--<select id="getu8Data"  resultMap="genderIsosid">-->
 	<select id="getu8Data"  resultMap="genderIsosid">
 		SELECT
-		sy_order_data_item_id as isosid
+		sy_order_data_item_id AS isosid
 		FROM `sy_shipping_details_item`
 		WHERE inventory_Ccode NOT LIKE '19%'
 		AND inventory_Ccode NOT LIKE '01%'
@@ -149,7 +149,7 @@
 		AND elements_Id !=''
 		AND sy_order_data_item_id
 		NOT IN
-		(SELECT id FROM `sy_packing_list_fabric_item`)
+		(SELECT DISTINCT isosid FROM `sy_packing_list_fabric_item` WHERE isosid!='')
 	</select>
 
 	<resultMap id="genderIsosid" type="java.lang.String">

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -494,7 +494,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	}
 
 	@Override
-	@Transactional
+	//@Transactional
 	public boolean excelAdd(Map<String,SyPackingListFabric> maps) {
 		boolean bool=false;
 		try{
@@ -531,163 +531,165 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	}
 
 	//@Override
+	//@Transactional
+	@Scheduled(fixedRate=1000*60*300)
 	public void getU8Data(){
-		SimpleDateFormat sf= new SimpleDateFormat("yyMMdd");
-		String[] arrs=syPackingListFabricItemMapper.getu8Data();//获取发运明细已提交的辅料
-		Map<String,List<String>> maps=new HashMap<>();
-		Map<String,List<String>> maps2=new HashMap<>();//获取主表符号
-		Map<String,String> maps3=new HashMap<>();//获取主表符号
-		for (String arr : arrs){
-			String account=arr.substring(0,3);
-			String id=arr.substring(3);
-			if(maps.containsKey(account)){
-				maps.get(account).add(id);
-			}else{
-				maps.put(account,new ArrayList<>());
-				maps.get(account).add(id);
+		try {
+			SimpleDateFormat sf = new SimpleDateFormat("yyMMdd");
+			String[] arrs = syPackingListFabricItemMapper.getu8Data();//获取发运明细已提交的辅料
+			Map<String, List<String>> maps = new HashMap<>();
+			Map<String, List<String>> maps2 = new HashMap<>();//获取主表符号
+			Map<String, String> maps3 = new HashMap<>();//获取主表符号
+			for (String arr : arrs) {
+				String account = arr.substring(0, 3);
+				String id = arr.substring(3);
+				if (maps.containsKey(account)) {
+					maps.get(account).add(id);
+				} else {
+					maps.put(account, new ArrayList<>());
+					maps.get(account).add(id);
+				}
 			}
-		}
-		for (String account : maps.keySet()){
-			String sql2="select " +
-					"b.AutoID as u8id ,\n" +
-					"b.id as u8pid,\n" +
-					"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
-					"b.csocode as orderNumber,\n" +
-					account+" as account,\n"+
-					"0  as delflag,\n" +
-					"f.AutoID  as isosid,\n" +
-					"b.iQuantity  as inventoryQuantity,\n" +
-					"b.cbMemo as remarks,\n" +
-					"b.cbMemo as memo,\n" +
-					"f.iTaxUnitPrice as price,\n"+
-					"d.cPersonName as salesman,\n" +
-					"b.cDefine22 as itemNumber,\n" +
-					"b.cFree6 as gramWeight,\n" +
-					"b.cFree1 as colour,\n" +
-					"b.cInvCode as inventoryCode,\n" +
-					"c.cInvName as inventoryName,\n" +
-					"c.cInvName as composition,\n" +
-					"b.cFree2 as size ,\n" +
-					"f.cDefine35 as rolls,\n" +
-					"e.cComUnitName as masterMetering,\n" +
-					"b.cFree4 as width,\n" +
-					"c.cInvStd  as specificationAndModel\n" +
-					"from rdrecord32 a \n" +
-					"left JOIN rdrecords32 b\n" +
-					"on a.id=b.id \n" +
-					"left join Inventory c\n" +
-					"on b.cInvCode=c.cInvCode\n" +
-					"LEFT JOIN Person  d\n" +
-					"ON d.cPersonCode = a.cPersonCode\n" +
-					"left join ComputationUnit e\n" +
-					"on c.cComunitCode=e.cComunitCode\n" +
-					"left join SO_SODetails f\n" +
-					"on b.iorderdid=f.iSOsID\n" +
-					"where " +
-					/*" cInvCCode not like '01%'\n" +
+			for (String account : maps.keySet()) {
+				String sql2 = "select " +
+						"b.AutoID as u8id ,\n" +
+						"b.id as u8pid,\n" +
+						"b.id as syPackingListFabricId,\n" +
+						//"left(b.csocode,ISNULL(NULLIF(CHARINDEX('-',b.csocode)-1,-1),len(b.csocode))) as planLotNumber,\n" +
+						"b.csocode as orderNumber,\n" +
+						account + " as account,\n" +
+						"0  as delflag,\n" +
+						"f.AutoID  as isosid,\n" +
+						"b.iQuantity  as inventoryQuantity,\n" +
+						"b.cbMemo as remarks,\n" +
+						"b.cbMemo as memo,\n" +
+						"f.iTaxUnitPrice as price,\n" +
+						"d.cPersonName as salesman,\n" +
+						"b.cDefine22 as itemNumber,\n" +
+						"b.cFree6 as gramWeight,\n" +
+						"b.cFree1 as colour,\n" +
+						"b.cInvCode as inventoryCode,\n" +
+						"c.cInvName as inventoryName,\n" +
+						"c.cInvName as composition,\n" +
+						"b.cFree2 as size ,\n" +
+						"f.cDefine35 as rolls,\n" +
+						"e.cComUnitName as masterMetering,\n" +
+						"b.cFree4 as width,\n" +
+						"c.cInvStd  as specificationAndModel\n" +
+						"from rdrecord32 a \n" +
+						"left JOIN rdrecords32 b\n" +
+						"on a.id=b.id \n" +
+						"left join Inventory c\n" +
+						"on b.cInvCode=c.cInvCode\n" +
+						"LEFT JOIN Person  d\n" +
+						"ON d.cPersonCode = a.cPersonCode\n" +
+						"left join ComputationUnit e\n" +
+						"on c.cComunitCode=e.cComunitCode\n" +
+						"left join SO_SODetails f\n" +
+						"on b.iorderdid=f.iSOsID\n" +
+						"where " +
+					" cInvCCode not like '01%'\n" +
 					"and cInvCCode not like '02%'\n" +
 					"and cInvCCode not like '03%'\n" +
 					"and cInvCCode not like '04%'\n" +
 					"and cInvCCode not like '19%'\n" +
-					"and cCusCode='T020001' and\n" +*/
-					" f.AutoID in ("+maps.get(account).toString().substring(1,maps.get(account).toString().length()-1)+") ";
-			List<Map<String, Object>> list = new ArrayList<>();
-			//String groupId=oConvertUtils.getId();//获取id
-			if(account.equals("903")){
-				list = senYuDataSourceThree.queryForList(sql2);//903
-			}else{
-				list = senYuDataSourceTwo.queryForList(sql2);//902
-			}
-			List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
-			System.out.println("jianSon的长度\t"+jianSon.size());
-			for (JSONObject json1 :  jianSon){
-				SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
-				sy1.setU8Id(account+sy1.getU8Id());//获取账套号+id
-				sy1.setId(sy1.getU8Id());
-				sy1.setIsosid(sy1.getAccount()+sy1.getIsosid());//账套号+销售订单id
-				sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
-				sy1.setGroupId(sy1.getOrderNumber()+"-"+sy1.getInventoryCode()+"-"+sy1.getSize());
+					"and cCusCode='T020001' and\n" +
+						" f.AutoID in (" + maps.get(account).toString().substring(1, maps.get(account).toString().length() - 1) + ") ";
+				List<Map<String, Object>> list = new ArrayList<>();
+				if (account.equals("903")) {
+					list = senYuDataSourceThree.queryForList(sql2);//903
+				} else {
+					list = senYuDataSourceTwo.queryForList(sql2);//902
+				}
+				List<JSONObject> jianSon = JsonChangeUtils.toJSONObject(list);
+				System.out.println("jianSon的长度\t" + jianSon.size());
+				for (JSONObject json1 : jianSon) {
+					SyPackingListFabricItem sy1 = JSONObject.toJavaObject(json1, SyPackingListFabricItem.class);
+					sy1.setU8Id(account + sy1.getU8Id());//获取账套号+id
+					sy1.setSyPackingListFabricId(account + sy1.getSyPackingListFabricId());//账套号+主表id
+					sy1.setId(sy1.getU8Id());
+					sy1.setIsosid(sy1.getAccount() + sy1.getIsosid());//账套号+销售订单id
+					sy1.setActualDeclaredQuantity(sy1.getInventoryQuantity());//给报关数量赋值
+					sy1.setGroupId(sy1.getOrderNumber() + "-" + sy1.getInventoryCode() + "-" + sy1.getSize());
 
-				QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
-				queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
-				queryWrapper2.last("limit 1");
-				SyShippingDetailsItem syShippingDetailsItem=syShippingDetailsItemMapper.selectOne(queryWrapper2);
-				if(syShippingDetailsItem!=null){
-					String elementsId=syShippingDetailsItem.getElementsId();//申报要素id
-					if(oConvertUtils.isNotEmpty(elementsId)){
-						SyDeclarationElements syDeclarationElements=syDeclarationElementsMapper.selectById(elementsId);
-						if(syDeclarationElements!=null){
-							sy1.setDeclarationName(syDeclarationElements.getDeclarationName());//获取报关品名
+					QueryWrapper<SyShippingDetailsItem> queryWrapper2 = new QueryWrapper<>();
+					queryWrapper2.eq("sy_order_data_item_id", sy1.getIsosid());
+					queryWrapper2.last("limit 1");
+					SyShippingDetailsItem syShippingDetailsItem = syShippingDetailsItemMapper.selectOne(queryWrapper2);
+					if (syShippingDetailsItem != null) {
+						String elementsId = syShippingDetailsItem.getElementsId();//申报要素id
+						if (oConvertUtils.isNotEmpty(elementsId)) {
+							SyDeclarationElements syDeclarationElements = syDeclarationElementsMapper.selectById(elementsId);
+							if (syDeclarationElements != null) {
+								sy1.setDeclarationName(syDeclarationElements.getDeclarationName());//获取报关品名
+							}
 						}
+						//sy1.setPrice(syShippingDetailsItem.getSalesUnitPrice());//销售单价
+						sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商编码
+						sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商
+						sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
+						sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
+						sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
+						sy1.setSyShippingDetailsItemId(syShippingDetailsItem.getId());//出运明细子表id
+						sy1.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
+						sy1.setManualYarnFlag(syShippingDetailsItem.getManualYarnFlag());//是否手册纱
+						sy1.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比
+						maps3.put(sy1.getSyPackingListFabricId(), syShippingDetailsItem.getGarmentFactory());//成衣工厂
+					}
+					if(sy1.getPrice()!=null&&sy1.getActualDeclaredQuantity()!=null){
+						sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
+					}
+					if (maps2.containsKey(account)) {
+						maps2.get(account).add(sy1.getU8Pid());//获取主表id
+					} else {
+						maps2.put(account, new ArrayList<>());//初始化
+						maps2.get(account).add(sy1.getU8Pid());//获取主表id
 					}
-					sy1.setPrice(syShippingDetailsItem.getSalesUnitPrice());//销售单价
-					sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商编码
-					sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplierCode());//染厂供应商
-					sy1.setSupplier(syShippingDetailsItem.getSupplier());//供应商编码
-					sy1.setSupplierCode(syShippingDetailsItem.getSupplierCode());//供应商
-					sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
-					sy1.setSyShippingDetailsItemId(syShippingDetailsItem.getId());//出运明细子表id
-					sy1.setManualYarnUnitPrice(syShippingDetailsItem.getManualYarnUnitPrice());//手册纱单价
-					sy1.setManualYarnFlag(syShippingDetailsItem.getManualYarnFlag());//是否手册纱
-					sy1.setManualYarnProportion(syShippingDetailsItem.getManualYarnProportion());//手册纱占比
-					maps3.put(syShippingDetailsItem.getId(),syShippingDetailsItem.getGarmentFactory());//成衣工厂
+					syPackingListFabricItemMapper.insert(sy1);//插入新数据
 				}
-				if(sy1.getMasterMetering()!=null&&!sy1.getMasterMetering().equals("KG")){//当单位不为KG时
-					sy1.setTotalPrice(sy1.getActualDeclaredQuantity().multiply(sy1.getPrice()));//实际报关数量*单价
-				}else{
-					//单位为kg的物料需要填写净重才能计算
+			}
+			for (String account : maps2.keySet()) {
+				//先插主表数据，然后根据主表id查询子表数据再添加
+				String sql = "select     \n" +
+						"a.id u8Id,      \n" +
+						"'1' as is_U8_Data,    \n" +
+						"a.cMemo memo,    \n" +
+						"0 as delflag,    \n" +
+						"0 as status,    \n" +
+						"a.cMaker createby,    \n" +
+						"a.cMaker preparedBy,    \n" +
+						"a.cDefine10  exportInvoiceNo,    \n" +
+						"a.dnmaketime  preparedDate    \n" +
+						"from rdrecord32 a    \n" +
+						"where id in (" + maps2.get(account).toString().substring(1, maps2.get(account).toString().length() - 1) + ")";//根据最后一次拉去时间
+				List<Map<String, Object>> listMain = new ArrayList<>();
+				if (account.equals("903")) {
+					listMain = senYuDataSourceThree.queryForList(sql);//903
+				} else {
+					listMain = senYuDataSourceTwo.queryForList(sql);//902
 				}
-				if(maps2.containsKey(account)){
-					maps2.get(account).add(sy1.getU8Pid());//获取主表id
-				}else {
-					maps2.put(account,new ArrayList<>());//初始化
-					maps2.get(account).add(sy1.getU8Pid());//获取主表id
+				if (listMain.size() == 0) {
+					continue;//退出本次循环
+				}
+				List<JSONObject> jsonObjects = JsonChangeUtils.toJSONObject(listMain);
+				System.out.println("jsonObjects的长度\t" + jsonObjects.size());
+				//String time=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis());//获取现在时间
+				for (JSONObject json : jsonObjects) {
+					SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);
+					QueryWrapper<SyPackingListFabric> queryWrapperCount = new QueryWrapper<>();
+					queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));//获取今天时间
+					queryWrapperCount.eq("is_U8_Data", "1");//判断为辅料的数据
+					queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
+					String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成单据号
+					sy.setDocumentNo(dateNo);//单据号
+					sy.setU8Id(account + sy.getU8Id());
+					sy.setId(sy.getU8Id());
+					sy.setGarmentFactory(maps3.get(sy.getId()));//获取成衣工厂
+					syPackingListFabricMapper.insert(sy);//添加数据
 				}
-				//syPackingListFabricItemMapper.insert(sy1);//插入新数据
-			}
-		}
-		System.out.println("maps2\t"+maps2);
-		System.out.println("maps3\t"+maps3);
-		for (String account : maps2.keySet()) {
-			//先插主表数据，然后根据主表id查询子表数据再添加
-			String sql = "select     \n" +
-					"a.id u8Id,      \n" +
-					"'1' as is_U8_Data,    \n" +
-					"a.cMemo memo,    \n" +
-					"0 as delflag,    \n" +
-					"0 as status,    \n" +
-					"a.cMaker createby,    \n" +
-					"a.cMaker preparedBy,    \n" +
-					"a.cDefine10  exportInvoiceNo,    \n" +
-					"a.dnmaketime  preparedDate    \n" +
-					"from rdrecord32 a    \n" +
-					"where id in ("+maps2.get(account).toString().substring(1,maps2.get(account).toString().length()-1)+")";//根据最后一次拉去时间
-			List<Map<String, Object>> listMain = new ArrayList<>();
-			if (account.equals("903")) {
-				listMain = senYuDataSourceThree.queryForList(sql);//903
-			} else {
-				listMain = senYuDataSourceTwo.queryForList(sql);//902
-			}
-			if (listMain.size() == 0) {
-				continue;//退出本次循环
-			}
-			List<JSONObject> jsonObjects = JsonChangeUtils.toJSONObject(listMain);
-			System.out.println("jsonObjects的长度\t"+jsonObjects.size());
-			//String time=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(System.currentTimeMillis());//获取现在时间
-			for (JSONObject json : jsonObjects) {
-				SyPackingListFabric sy = JSONObject.toJavaObject(json, SyPackingListFabric.class);
-				QueryWrapper<SyPackingListFabric> queryWrapperCount = new QueryWrapper<>();
-				queryWrapperCount.like("create_time", new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));//获取今天时间
-				queryWrapperCount.eq("is_U8_Data", "1");//判断为辅料的数据
-				queryWrapperCount.select("lpad(count(0)+1,6,0) as id");
-				String dateNo = "FL" + sf.format(System.currentTimeMillis()) + getOne(queryWrapperCount).getId();//生成单据号
-				sy.setDocumentNo(dateNo);//单据号
-				sy.setU8Id(account + sy.getU8Id());
-				sy.setId(sy.getU8Id());
-				String pname = "";//成衣工厂
-				System.out.println("sy\t"+sy);
-				//syPackingListFabricMapper.insert(sy);//添加数据
 			}
+		}catch (Exception e){
+			e.printStackTrace();
 		}
 	}
 }

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

@@ -108,10 +108,10 @@ public class SyPackingListTailoringController {
 		Page<SyPackingListTailoringVo> page = new Page<SyPackingListTailoringVo>(pageNo, pageSize);
 		queryWrapper.eq("a.del_flag","0");
 		if(oConvertUtils.isNotEmpty(orderNumber)){
-			queryWrapper.eq("a.order_number",orderNumber);//查询订单号
+			queryWrapper.like("a.order_number",orderNumber);//查询订单号
 		}
 		if(oConvertUtils.isNotEmpty(garmentFactory)){
-			queryWrapper.eq("b.garment_Factory",garmentFactory);//查询成衣工厂
+			queryWrapper.like("b.garment_Factory",garmentFactory);//查询成衣工厂
 		}
 		if(oConvertUtils.isNotEmpty(stratDate)){
 			queryWrapper.ge("b.hod",stratDate);//起始日期
@@ -171,25 +171,25 @@ public class SyPackingListTailoringController {
 		 queryWrapper.eq("a.status","1");//查询已提交数据
 		 //queryWrapper.eq("a.is_Reference","1");//查询已提交数据
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getCustomerAbbreviation())){
-			 queryWrapper.eq("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
+			 queryWrapper.like("a.customer_Abbreviation",syPreAssembledPackingListVo.getCustomerAbbreviation());//客户简称
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getDistributionPoint())){
-			 queryWrapper.eq("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
+			 queryWrapper.like("b.distribution_Point",syPreAssembledPackingListVo.getDistributionPoint());//分销点
 		 }
 /*		 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.like("b.small_po",syPreAssembledPackingListVo.getSmallPo());//小po
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getOrderNumber())){
-			 queryWrapper.eq("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
+			 queryWrapper.like("a.order_number",syPreAssembledPackingListVo.getOrderNumber());//订单号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getItemNumber())){
-			 queryWrapper.eq("a.item_number",syPreAssembledPackingListVo.getItemNumber());//款号
+			 queryWrapper.like("a.item_number",syPreAssembledPackingListVo.getItemNumber());//款号
 		 }
 		 if(oConvertUtils.isNotEmpty(syPreAssembledPackingListVo.getProductName())){
-			 queryWrapper.eq("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
+			 queryWrapper.like("a.product_Name",syPreAssembledPackingListVo.getProductName());//品名
 		 }
 		 //预发货日期
 		 if(oConvertUtils.isNotEmpty(stratDate)){//起始