Merge remote-tracking branch 'origin/dev' into dev

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

@@ -119,7 +119,7 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
     @JsonProperty("tOrderId")
     private String tOrderId;
     /**
-     *  贸易订单编号
+     * 贸易订单编号
      */
     @JsonProperty("tOrderNo")
     private String tOrderNo;
@@ -157,7 +157,7 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
     /**
      * 计划收货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate receiveGoodsDateTime;
     /**
      * 收货电话
@@ -174,7 +174,7 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
     /**
      * 计划发货时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private LocalDate shipmentsDateTime;
     /**
      * 发货电话
@@ -251,7 +251,7 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
     private BigDecimal loadAmount;
 
     /**
-     *总装货量
+     * 总装货量
      */
     private BigDecimal totalLoadAmount;
 
@@ -289,15 +289,30 @@ public class ManagementLogisticsOrderVO /*extends PageRequest*/ {
     /**
      * 订单主体企业id
      */
-    private  Long entId;
+    private Long entId;
 
     /**
      * 装货地点名称
      */
-    private  String loadName;
+    private String loadName;
 
     /**
      * 卸货地点名称
      */
-    private  String unloadName;
+    private String unloadName;
+
+    /**
+     * 税率
+     */
+    private BigDecimal taxRate;
+
+    /**
+     * 订单来源
+     */
+    private String orderSource;
+
+    /**
+     * 订单来源
+     */
+    private String orderSourceLabel;
 }

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

@@ -123,6 +123,19 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "运价")
     private String priceLabel;
 
+    /**
+     * 税率
+     */
+    @ExcelProperty(value = "税率")
+    private BigDecimal taxRate;
+
+
+    /**
+     * 订单来源
+     */
+    @ExcelProperty(value = "订单来源")
+    private String orderSourceLabel;
+
     /**
      * 收货联系人
      */
@@ -240,6 +253,8 @@ public class ManagementLogisticsOrderExcelVo implements Serializable {
     @ExcelProperty(value = "卸货量")
     private String unloadAmount;
 
+
+
 //    /**
 //     * 结算周期
 //     */

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

@@ -160,6 +160,8 @@ public class ManagementLogisticsOrderService {
         Map<String, String> signingWay = commonService.getDictData(DictTypeEnum.SIGNING_TYPE.getType());
         /**合理损耗*/
 //        Map<String, String> taxRateTypeDictData = getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
+        /**订单来源*/
+        Map<String, String> orderSource = commonService.getDictData(DictTypeEnum.ORDER_SOURCE.getType());
         Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(ManagementLogisticsOrderVO::getCreateBy).collect(Collectors.toList());
@@ -168,6 +170,7 @@ public class ManagementLogisticsOrderService {
             }
         }
         for (ManagementLogisticsOrderVO vo : list) {
+            vo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
             vo.setAccountsCycleLabel(settlementDictData.get(vo.getAccountsCycle()));
             vo.setAppointor(longUserMap.get(vo.getCreateBy()) == null ? null : longUserMap.get(vo.getCreateBy()).getName());
             vo.setBillingModeLabel(chargingDictData.get(vo.getBillingMode()));
@@ -302,6 +305,8 @@ public class ManagementLogisticsOrderService {
         Map<String, String> taxRate = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
         /**运价方式*/
         Map<String, String> priceType = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
+        /**订单来源*/
+        Map<String, String> orderSource = commonService.getDictData(DictTypeEnum.ORDER_SOURCE.getType());
         Map<Long, UserCacheResDto> longUserMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
         if (CollectionUtils.isNotEmpty(list)) {
             List<Long> collect = list.stream().map(ManagementLogisticsOrderVO::getCreateBy).collect(Collectors.toList());
@@ -313,6 +318,7 @@ public class ManagementLogisticsOrderService {
         for (ManagementLogisticsOrderVO vo : list) {
             ManagementLogisticsOrderExcelVo managementLogisticsOrderExcelVo = new ManagementLogisticsOrderExcelVo();
             BeanUtils.copyProperties(vo, managementLogisticsOrderExcelVo);
+            managementLogisticsOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
 //            managementLogisticsOrderExcelVo.setStatus(vo.getStatus().toString());
             managementLogisticsOrderExcelVo.setPriceLabel(vo.getPrice() == null ? null : vo.getPrice().toString() + priceType.get(vo.getPriceType()));
             managementLogisticsOrderExcelVo.setLossUnitLabel(vo.getLoss() == null ? null : vo.getLoss().toString() + taxRate.get(vo.getLossUnit()));
@@ -684,7 +690,7 @@ public class ManagementLogisticsOrderService {
 //        PageHelper.startPage(page, pageSize);
         List<Long> tradeOrderIds = StringUtils.splitStrToList(ids, Long.class);
         if (CollectionUtils.isEmpty(tradeOrderIds)) {
-           throw new BusinessException("贸易订单id不能为空");
+            throw new BusinessException("贸易订单id不能为空");
         }
         List<LogisticsOrderDTO> returnList = new ArrayList<>();
         tradeOrderIds = tradeOrderIds.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());

sckw-modules/sckw-transport/src/main/resources/mapper/KwtLogisticsOrderMapper.xml

@@ -968,7 +968,7 @@
         a.settlement_cycle AS settlementCycle,
         a.price AS price,
         a.price_type AS priceType,
-        a.type AS type,
+        a.type AS orderSource,
         a.unit AS unit,
         a.subcontract_amount AS subcontractAmount,
         a.entrust_amount AS entrustAmount,