Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -1975,7 +1975,18 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
 				advanceDetailModel.setMaterialCode(importOrderNoPackageExcelDTO.getMaterialCode());
 				advanceDetailModel.setMaterialName(importOrderNoPackageExcelDTO.getMaterialName());
-				advanceDetailModel.setVolume(new BigDecimal(importOrderNoPackageExcelDTO.getVolume()));
+				String volume = importOrderNoPackageExcelDTO.getVolume();
+				if (StringUtil.isBlank(volume)){
+					advanceDetailModel.setVolume(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setVolume(new BigDecimal(volume));
+				}
+				String weight = importOrderNoPackageExcelDTO.getWeight();
+				if (StringUtil.isBlank(weight)){
+					advanceDetailModel.setWeight(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setWeight(new BigDecimal(weight));
+				}
 				advanceDetailModel.setWeight(new BigDecimal(importOrderNoPackageExcelDTO.getWeight()));
 				advanceDetailModel.setPackageStatus("0");