预装箱单excel导入总价计算

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

@@ -327,7 +327,11 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			outerBoxLength=new BigDecimal(parsms[12]);
 			outerBoxWidth=new BigDecimal(parsms[13]);
 			outerBoxHeight=new BigDecimal(parsms[14]);
-			netWeightToo=new BigDecimal(parsms[15]);
+			if(parsms[15]==null||parsms[15].length()==0){
+				netWeightToo=new BigDecimal("0");
+			}else{
+				netWeightToo=new BigDecimal(parsms[15]);
+			}
 			syDeclarationElementsId=parsms[18];
 			groupId=parsms[17];//分组id
 			sizeTables=new ArrayList<>();

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

@@ -538,7 +538,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 							item1.setInventoryName(syItem.getInventoryName());//存货名称
 							item1.setAcSetNo(syItem.getAccount());//获取账套号
 							item1.setHod(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(syItem.getPreDeliveryDate()));//预发货日期
-							item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
+							item1.setTotalPrice(item1.getTotal().multiply(item1.getUnitPrice()));//获取总价		箱数*单价-->件数*单价
 							item1.setOrderNumber(syItem.getOrderNumber());//获取订单号
 							item1.setWithCode(syItem.getCodingRules());//配码规则
 							item1.setSpurOrSubOrder(syItem.getPurOrSubOrder());//获取采购委外订货号
@@ -552,6 +552,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 							item1.setOmpoIdItem(syItem.getOmpoIdItem());
 							syPreAssembledPackingList.setOrderNumber(syItem.getOrderNumber());
 							syPreAssembledPackingList.setItemNumber(syItem.getItemNumber());
+							syPreAssembledPackingList.setSpurOrSubOrder(syItem.getPurOrSubOrder());
 							//原剩余数量-预装箱单装箱数量=新剩余数量
 							syItem.setSurplusQuantity(syItem.getSurplusQuantity().subtract(item1.getTotal()));
 							//超发数量