Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineWaybillTrackMapper.xml

@@ -35,6 +35,7 @@
         from logpm_trunkline_waybill_track ltwt
         left join logpm_warehouse_waybill lww on lww.id = ltwt.waybill_id
         where 1=1
+        and ltwt.track_type = '888'
         <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
             and ltwt.warehouse_id in
             <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">

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

@@ -1215,6 +1215,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setPackageStatus("0");
 						if (!Objects.isNull(pacakgeDetailExcelDTO.getVolume())) {
 							advanceDetailModel.setVolume(new BigDecimal(pacakgeDetailExcelDTO.getVolume()));
+						}else{
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
 						}
 
 						String materialName = pacakgeDetailExcelDTO.getMaterialName();
@@ -1662,7 +1664,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setReturnNum(importStandardOuPaiDTO.getReturnNum());
 						advanceDetailModel.setSendDateStr(importStandardOuPaiDTO.getSendDateStr());
 						advanceDetailModel.setCarNumber(importStandardOuPaiDTO.getCarNumber());
+						String volume = importStandardOuPaiDTO.getVolume();
+						if(StringUtil.isBlank(volume)){
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
+						}else{
 							advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
+						}
 						advanceDetailModel.setTrainNumber(advanceEntity.getTrainNumber());
 						String firsts = importStandardOuPaiDTO.getFirstsName();
 						advanceDetailModel.setFirstPackName(firsts);