预装箱单导入bug

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

@@ -1401,7 +1401,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                                 sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
                     }
                     cell.setCellType(CellType.STRING);//获取的都转换成String
-                    if(cell.getStringCellValue().length()<1&&x>0&&!nums.contains(i)){
+                    if(cell.getStringCellValue().length()<1&&!nums.contains(sheet.getRow(0).getCell(i).getStringCellValue())){
                         throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
                                 sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
                     }
@@ -1488,6 +1488,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             list.add("PREACKSKU");
             list.add("净净重");
             for (int x=0;x<=sheet.getLastRowNum();x++){
+                //System.out.println("sheet.getLastRowNum()\t"+sheet.getLastRowNum());
                 Row row=sheet.getRow(x);//列
                 Cell cell2=row.getCell(0);
                 if(cell2==null){//如果这一列为空就退出
@@ -1523,6 +1524,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         }
                     }
                 }
+                //System.out.println("strs2\t"+strs2);
                 if(x>0){
                     SyPreAssembledPackingListItem item=
                             new SyPreAssembledPackingListItem(strs.toArray(new String[strs.size()]),
@@ -1535,6 +1537,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             main.setSyPreAssembledPackingListItemList(items);//获取集合
             mains.add(main);
         }
+        System.out.println("mains\t"+mains);
         return syPreAssembledPackingListService.test(mains);
     }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -337,11 +337,14 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			sizeTables=new ArrayList<>();
 			String planSize="";
 			int piecesBox=0;
+			//System.out.println("params3.size\t"+parsms3.length);
 			for (int i=0;i<parsms3.length-1;i++){
 				SizeTable sizeTable=new SizeTable();
 				sizeTable.setSize(parsms3[i]);//尺码
-				piecesBox+=Integer.parseInt(parsms2[i]);
-				sizeTable.setProportion(Integer.parseInt(parsms2[i]));//比例
+		//		System.out.println("params2\t"+parsms2[i]);
+				int box=Integer.parseInt(parsms2[i]);
+				piecesBox+=box;
+				sizeTable.setProportion(box);//比例
 				planSize+=parsms3[i]+":"+(boxNumber.intValue()*sizeTable.getProportion())+"+";
 				sizeTable.setItemId(parsms2[parsms2.length-1].split(",")[i]);//发运明细子表id
 				sizeTables.add(sizeTable);
@@ -349,12 +352,13 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			this.planSize=planSize.substring(0,planSize.length()-1);
 			this.piecesBox=new BigDecimal(piecesBox);//每箱件数
 			this.total=this.boxNumber.multiply(this.piecesBox);//数量
+		//	System.out.println("数量\t"+total);
 			this.totalNetWeight=this.boxNumber.multiply(this.netWeight);
 			this.totalGrossWeight=this.boxNumber.multiply(this.grossWeight);
 			this.totalVolume=this.boxNumber.multiply(this.outerBoxLength).multiply(this.outerBoxWidth).multiply(this.outerBoxHeight).divide(new BigDecimal(1000000));
 		}catch (Exception e){
 			e.printStackTrace();
-			System.out.println(e.getMessage());
+			//System.out.println(e.getMessage());
 		}
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -636,7 +636,10 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
+			System.out.println("mains.size\t"+mains.size());
+			System.out.println("size\t"+main.getSyPreAssembledPackingListItemList().size());
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
+				System.out.println("total\t"+item.getTotal());
 				total3=total3.add(item.getTotal());
 				String ids="";
 				for (SizeTable size : item.getSizeTables()){
@@ -651,7 +654,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					if(syshippings!=null){
 						total1=syshippings.getShipmentQuantity();
 					}else{
-						throw new JeecgBootException("该单据在上游未找到");
+						//throw new JeecgBootException("该单据在上游未找到");
 					}
 					queryWrapper=new QueryWrapper();
 					queryWrapper.in("sy_declaration_elements_item_id", Arrays.asList(ids.split(",")));

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

@@ -145,7 +145,8 @@
 		AND elements_Id !=''
 		AND sy_order_data_item_id
 		NOT IN
-		(SELECT DISTINCT isosid FROM `sy_packing_list_fabric_item` WHERE isosid!='')
+		(SELECT DISTINCT isosid FROM `sy_packing_list_fabric_item` WHERE isosid!=''
+		 )
 	</select>
 
 	<!--