Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-DAZHOU-BMSTRUCK-API

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -1392,6 +1392,9 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             //查询订单计量详情
             List<Map<String,Object>> batchIdList = bmstruckDetailsOrderMapper.getWeightBatchIds(orderId);
             for (Map<String, Object> map : batchIdList) {
+                if(null == map){
+                    continue;
+                }
                 BigDecimal weightBatchId = DataChange.dataToBigDecimal(map.get("weightBatchId"));
                 //根据计量实绩查找批次ID
                 BigDecimal netWeight = DataChange.dataToBigDecimal(map.get("netWeight"));