成衣excel导入增加字段

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

@@ -759,6 +759,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                                         String stratDate,
                                                         String endDate,
                                                         String status) {
+        status="1";
         SyPreAssembledPackingList syPreAssembledPackingList=new SyPreAssembledPackingList();
         QueryWrapper<SyPreAssembledPackingListVo> queryWrapper =new QueryWrapper<>();//初始化
         queryWrapper.eq("a.del_flag","0");//默认查询未删除

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

@@ -710,7 +710,6 @@ public class SyPackingListTailoringController {
 					 	//System.out.print(cell.getStringCellValue()+"\t");
 					 }
 				 }
-				 x=x<2?++x:x;//跨行
 				 if(x>3){
 					 SyPackingListTailoringItem item=new SyPackingListTailoringItem(
 							 		str.substring(0,str.length()-1).split(","),
@@ -720,6 +719,7 @@ public class SyPackingListTailoringController {
 				 }else if(x==1){
 					 main=new SyPackingListTailoring(strMain.substring(0,strMain.length()-1).split(","));
 				 }
+				 x=x<2?++x:x;//跨行
 
 			 }
 			 main.setSyPackingListTailoringItemList(items);

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

@@ -218,5 +218,11 @@ public class SyPackingListTailoring implements Serializable {
 		//createTime=params[8];
 		elementsId=params[9];
 		syPreAssembledPackingListId=params[10];
+		//款号	30650	订单号	SYJ140-马菲羊	预托书号	预托书	集装箱号	集装箱2
+		itemNumber=params[11];
+		orderNumber=params[12];
+		depositaryReceiptNo=params[13];
+		containerNumber=params[14];
+		containerCode=params[15];
 	}
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -300,11 +300,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			for (SyPackingListTailoringItem item : items){
 				//循环子表获得尺码组
 				item.setSizeTables(sort(syPreAssembledPackingListItemMapper.querySize2(item.getGroupId(),item.getSyPreAssembledPackingListId())));
-				/*String planSize="";
+				String planSize="";
 				for (SizeTable size:item.getSizeTables()){
 					planSize+=size.getSize()+":"+size.getQuantity()+"+";
 				}
-				item.setPlanSize(planSize.substring(0,planSize.length()-1));*///截取最后一位+号
+				item.setPlanSize(planSize.substring(0,planSize.length()-1));//截取最后一位+号
 			}
 			syPackingListTailoring.setSyPackingListTailoringItemList(items);
 		}