计费详单修改

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

@@ -1390,6 +1390,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"));
@@ -1414,6 +1417,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
                     //获取详单ID
                     BigDecimal detailsId = bmstruckDetailsOrderMapper.getDetailsIdByBatchId(weightBatchId);
                     BmstruckDetailsOrder bmstruckDetailsOrder = bmstruckDetailsOrderMapper.selectByPrimaryKey(detailsId);
+                    bmstruckDetailsOrder.setOrderId(orderId);
                     bmstruckDetailsOrder.setDetailsId(detailsId);
                     bmstruckDetailsOrder.setDetailsAmount(detailsAmount);
                    result += bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);