预装箱单导入改动

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

@@ -1549,7 +1549,10 @@ 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;
+                                }
                                 if(cell!=null){
                                     cell.setCellType(CellType.STRING);//获取的都转换成String
                                     if(cell.getStringCellValue().length()<1&&!nums.contains(i)){

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

@@ -331,15 +331,17 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			outerBoxLength=new BigDecimal(parsms[12]);
 			outerBoxWidth=new BigDecimal(parsms[13]);
 			outerBoxHeight=new BigDecimal(parsms[14]);
-			if(parsms[15]==null||parsms[15].length()==0){
+
+			/*if(parsms[15]==null||parsms[15].length()==0){
 				netWeightToo=new BigDecimal("0");
 			}else{
 				netWeightToo=new BigDecimal(parsms[15]);
-			}
-			withCode=parsms[17];//配码
+			}*/
+
+			withCode=parsms[16];//配码
 			//发运明细分组ID	发运明细主表ID	申报要素ID
-			groupId=parsms[17+5];//分组id
-			syDeclarationElementsId=parsms[18+5];
+			groupId=parsms[16+5];//分组id
+			syDeclarationElementsId=parsms[16+6];
 			sizeTables=new ArrayList<>();
 			String planSize="";
 			int piecesBox=0;
@@ -369,9 +371,8 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	}
 
 	public static boolean isNumeric(String str) {
-		String bigStr;
 		try {
-			bigStr = new BigDecimal(str).toString();
+			new BigDecimal(str).toString();
 		} catch (Exception e) {
 			return false;//异常 说明包含非数字。
 		}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListItemMapper.xml

@@ -70,6 +70,7 @@
 		SELECT *
 		FROM  sy_pre_assembled_packing_list_item
 		WHERE sy_pre_assembled_packing_list_id = #{value}
+		and del_flag=0
 	</select>
 
 	<select id="selectSyShippingDetailsItemData" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingListItem">

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

@@ -949,7 +949,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			map5.put("CMAKER",createBy);//制单人
 
 			JSONObject map6=new JSONObject();//销售发票
-			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch","dcreatesystime")));//发票号
+			map6.put("CVOUCHCODE",org.jeecg.modules.system.util.oConvertUtils.addOne(purchaseWarehousingMapper.getMaxCode("cSBVCode","SaleBillVouch","cSBVCode")));//发票号
 			map6.put("DDATE",createDate);//发票日期（yyyy-MM-dd）
 			map6.put("CTYPE","普通");//发票类型（普通，专用）
 			map6.put("CMAKER",createBy);//制单人名称