面辅料拉取u8调整

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

@@ -1549,7 +1549,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                             if(cell==null&&!nums.contains(i)){
                                 throw new JeecgBootException("第"+num+"页的"+"第"+(x+1)+"行的"+
                                         sheet.getRow(0).getCell(i).getStringCellValue()+"未填值！");
-                            }else{ 
+                            }else{
                                 if(sheet.getRow(0).getCell(i).getStringCellValue().equals("净净重")||sheet.getRow(0).getCell(i).getStringCellValue().equals("总体积")){
                                     continue;
                                 }

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

@@ -589,7 +589,7 @@ public class SyPackingListFabricController {
 							 itemStrs.add(cell.toString());
 						 }
 					 }
-					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
+					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]),x+5);
 					 items.add(syPackingListFabricItem);
 				 }
 			 }
@@ -657,7 +657,7 @@ public class SyPackingListFabricController {
 
 						 }*/
 					 }
-					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]));
+					 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]),x+5);
 					 items.add(syPackingListFabricItem);
 				 }
 			 }

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

@@ -357,11 +357,17 @@ public class SyPackingListFabricItem implements Serializable {
 	@ApiModelProperty(value = "报关单价")
 	private java.math.BigDecimal customsDeclarationUnitPrice;
 
+	/**返回导入报错行要用的序号*/
+	@ApiModelProperty(value = "返回导入报错行要用的序号")
+	@TableField(exist = false)
+	private int num;
+
 	public SyPackingListFabricItem(){
 
 	}
 
-	public SyPackingListFabricItem(String [] strs){
+	public SyPackingListFabricItem(String [] strs,int num1){
+		this.num=num1;
 		for (int i=0;i<strs.length;i++){
 			//System.out.println(strs[i]+"\t"+i);
 		}

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

@@ -792,7 +792,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							total3=total3.add(item.getActualDeclaredQuantity());
 						}
 					}else{
-						throw new JeecgBootException("第"+num+"行找不到订单数据，获取不到单位");
+						System.out.println("净重\t"+item.getNetWeight());
+						throw new JeecgBootException("第"+item.getNum()+"行找不到订单数据，获取不到单位");
 					}
 					item.setInventoryCcode(syShippingDetailsItem.getInventoryCcode());//物料分类
 					item.setPrice(syShippingDetailsItem.getSalesUnitPrice());//价格
@@ -1549,8 +1550,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 * @return
 	 */
 	//@Override
-	//@Transactional
 	//@Scheduled(fixedRate=1000*60*3)
+	@Transactional
 	public String getU8Data (){
 		String massage="";
 		int num=0;