运营端-基础档案管理-合同查询

订单详情新增详情参数

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/vo/OrderDetailVO.java

@@ -230,4 +230,10 @@ public class OrderDetailVO {
      */
     private String signingWayLabel;
 
+    /**
+     * 待分配量(amount-subcontract_amount-entrust_amount)
+     */
+    private BigDecimal waitDistributionAmount;
+
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/ManagementLogisticsOrderService.java

@@ -193,7 +193,7 @@ public class ManagementLogisticsOrderService {
                             }
                         }
                     }
-                } catch (NumberFormatException e) {
+                } catch (Exception e) {
                     System.out.println("查询贸易订单失败!" + tOrderId + ";" + e.getMessage());
                 }
             }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/TransportCommonService.java

@@ -264,6 +264,9 @@ public class TransportCommonService {
             orderDetailVO.setPriceLabel(sysDictResDto == null ? null : sysDictResDto.getLabel());
         }
         orderDetailVO.setRemark(logisticsOrder.getRemark());
+        orderDetailVO.setWaitDistributionAmount(logisticsOrder.getAmount()
+                .subtract(logisticsOrder.getSubcontractAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getSubcontractAmount())
+                .subtract(logisticsOrder.getEntrustAmount() == null ? new BigDecimal("0.00") : logisticsOrder.getEntrustAmount()));
         /**亏吨量/吨->装货量-卸货量
          * 合理损耗值=装货量*合理损耗
          扣亏量/吨->亏吨量-合理损耗值
@@ -516,8 +519,8 @@ public class TransportCommonService {
         }
         ids = ids.stream().distinct().collect(Collectors.toList());
         logisticsOrderParam.setPage((logisticsOrderParam.getPage() - 1) * logisticsOrderParam.getPageSize());
-        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(),ids);
-        Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(),ids);
+        List<LogisticsOrderVO> list = logisticsOrderMapper.selectLogisticOrderData(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(), ids);
+        Long count = logisticsOrderMapper.selectLogisticOrderCount(logisticsOrderParam, dictValue, LoginUserHolder.getEntId(), ids);
         /**计量单位*/
         Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**运价方式*/