面辅料导入、制单时间、拉取出库单调整

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

@@ -128,6 +128,9 @@ public class SyPackingListFabricController {
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getDocumentNo())){
 			queryWrapper.like("a.document_No",syPackingListFabric.getDocumentNo());//单据号
 		}
+		if(oConvertUtils.isNotEmpty(syPackingListFabric.getPushState())){//推送状态
+			queryWrapper.like("a.push_State",syPackingListFabric.getPushState());//推送状态
+		}
 		if(oConvertUtils.isNotEmpty(syPackingListFabric.getExportInvoiceNo())){
 			queryWrapper.like("a.export_Invoice_No",syPackingListFabric.getExportInvoiceNo());//外销发票号
 		}
@@ -620,7 +623,7 @@ public class SyPackingListFabricController {
 	 public Map<String,SyPackingListFabric>  refreshSheet(Workbook workbook1) throws ParseException {
 		 Map<String,SyPackingListFabric> maps=new HashMap<>();
 		 Iterator sheets=workbook1.sheetIterator();
-		 while (sheets.hasNext()){
+		 //while (sheets.hasNext()){
 			 Sheet sheet=(Sheet) sheets.next();
 			 SyPackingListFabric main =new SyPackingListFabric();
 			 List<SyPackingListFabricItem> items=new ArrayList<>();
@@ -664,7 +667,7 @@ public class SyPackingListFabricController {
 			 }else{
 				 maps.put(sheet.getSheetName(),main);
 			 }
-		 }
+		 //}
 		 return maps;
 	 }
 
@@ -672,7 +675,7 @@ public class SyPackingListFabricController {
 	 public Map<String,SyPackingListFabric>  refreshSheet2(Workbook workbook1) throws ParseException {
 		 Map<String,SyPackingListFabric> maps=new HashMap<>();
 		 Iterator sheets=workbook1.sheetIterator();
-		 while (sheets.hasNext()){
+		 //while (sheets.hasNext()){
 			 Sheet sheet=(Sheet) sheets.next();
 			 SyPackingListFabric main =new SyPackingListFabric();
 			 List<SyPackingListFabricItem> items=new ArrayList<>();
@@ -744,7 +747,7 @@ public class SyPackingListFabricController {
 					maps.put(item.getPlanLotNumber()+"-"+item.getDeclarationName(),main2);
 				}
 			 }
-		 }
+		// }
 		 return maps;
 	 }
 
@@ -855,6 +858,9 @@ public class SyPackingListFabricController {
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getOrderNumber())){
 					 queryWrapper.like("a.order_number",syPackingListFabric.getOrderNumber());//订单号
 				 }
+				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getPushState())){//推送状态
+					 queryWrapper.like("a.push_State",syPackingListFabric.getPushState());//推送状态
+				 }
 				 if(oConvertUtils.isNotEmpty(syPackingListFabric.getContainerNumber())){
 					 queryWrapper.like("a.container_Number",syPackingListFabric.getContainerNumber());//集装箱号
 				 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabric.java

@@ -245,12 +245,13 @@ public class SyPackingListFabric implements Serializable {
 			latestDateOfShipment=new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
 		}
 		exportInvoiceNo=strs[5];
+		preparedDate=new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
 		//createTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(strs[5]);
-		try{
+		/*try{
 			preparedDate=new SimpleDateFormat("yyyy-MM-dd").parse(strs[6]);
 		}catch (Exception e){
 			preparedDate=new SimpleDateFormat("yyyy-MM-dd").parse(new SimpleDateFormat("yyyy-MM-dd").format(System.currentTimeMillis()));
-		}
+		}*/
 
 		//createTime=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(strs[0]) ;
 		//documentNo=strs[0];

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

@@ -206,8 +206,8 @@
 	<select id="getDocumentNos"  resultType="java.lang.String">
 		SELECT DISTINCT Document_No
 		FROM `sy_packing_list_fabric`
-		WHERE  del_flag=0
-		and Document_No not like 'ML%'
+		WHERE /* del_flag=0 and*/
+		 Document_No not like 'ML%'
 	</select>
 
 <!--

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

@@ -113,7 +113,7 @@
 		and b.del_flag=0
 		${ew.customSqlSegment}
 		group by a.id
-		order by a.export_Invoice_No,a.garment_Factory,a.create_time desc
+		order by /*a.export_Invoice_No,a.garment_Factory,*/a.create_time desc
 	</select>
 
     <select id="queryMain2" resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">

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

@@ -132,6 +132,9 @@ public class SyPackingListTailoringController {
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
 			queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
 		}
+		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
+			queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+		}
 		if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getDistributionPoint())){
 			queryWrapper.like("b.distribution_point",syPackingListTailoringVo.getDistributionPoint());//分销点
 		}
@@ -168,7 +171,7 @@ public class SyPackingListTailoringController {
 	}
 
 	 /**
-	  * 分页列表查询
+	  *
 	  *
 	  * @param id
 	  * @return
@@ -190,7 +193,7 @@ public class SyPackingListTailoringController {
 	 }
 
 	 /**
-	  * 分页列表查询
+	  *
 	  *
 	  * @param ids
 	  * @return
@@ -224,7 +227,7 @@ public class SyPackingListTailoringController {
 	 }
 
 	 /**
-	  * 分页列表查询
+	  *
 	  *
 	  * @param syPreAssembledPackingListVo
 	  * @param pageNo
@@ -564,6 +567,9 @@ public class SyPackingListTailoringController {
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
 				 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
 			 }
+			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
+				 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+			 }
 			 //款号	分销点	小po	预托书号
 			 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
 				 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号
@@ -767,6 +773,9 @@ public class SyPackingListTailoringController {
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getGarmentFactory())){
 			 queryWrapper.like("b.garment_Factory",syPackingListTailoringVo.getGarmentFactory());//查询成衣工厂
 		 }
+		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getPushState())){//推送状态
+			 queryWrapper.like("a.push_State",syPackingListTailoringVo.getPushState());//推送状态
+		 }
 		 //款号	分销点	小po	预托书号
 		 if(oConvertUtils.isNotEmpty(syPackingListTailoringVo.getItemNumber())){
 			 queryWrapper.like("a.item_number",syPackingListTailoringVo.getItemNumber());//款号