面辅料获取门幅

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

@@ -113,7 +113,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setDistributionPoint(detailsItem.getDistributionPoint());//分销点
 			entity.setPurOrSubOrder(detailsItem.getPurOrSubOrder());//采购委外订单号
 			entity.setFactoryUnitPrice(detailsItem.getFactoryUnitPrice());//工厂单价
-			if(entity.getMasterMetering().equals("KG")){//当单位为KG时
+			if(entity!=null&&entity.getMasterMetering().equals("KG")){//当单位为KG时
 				entity.setTotalPrice(entity.getNetWeight().subtract(entity.getPrice()));//净重*单价
 			}else{
 				entity.setTotalPrice(entity.getActualDeclaredQuantity().subtract(entity.getPrice()));//实际报关数量*单价
@@ -150,7 +150,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				//此次入库数量-剩余数量=超发数量
 				s1.setExcessQuantity(entity.getInventoryQuantity().subtract(s1.getSurplusQuantity()));
 				syShippingDetailsItemMapper.updateById(s1);*/
-				if(entity.getMasterMetering().equals("KG")){//当单位为KG时
+				if(entity!=null&&entity.getMasterMetering().equals("KG")){//当单位为KG时
 					entity.setTotalPrice(entity.getNetWeight().subtract(entity.getPrice()));//净重*单价
 				}else{
 					entity.setTotalPrice(entity.getActualDeclaredQuantity().subtract(entity.getPrice()));//实际报关数量*单价

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

@@ -514,6 +514,7 @@ public class SyPackingListTailoringController {
 			 result.setMessage("导出成功！");
 			 result.setSuccess(true);
 		 }catch (Exception e){
+		 	e.printStackTrace();
 			 System.err.println("message\t"+e.getMessage());
 			 result.setResult(null);
 			 result.setMessage(e.getMessage());
@@ -594,6 +595,7 @@ public class SyPackingListTailoringController {
 				 }
 			 }
 		 }catch (Exception e){
+		 	e.printStackTrace();
 			 System.err.println(e.getMessage());
 		 }