承运订单托运订单列表增加单位处理

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

@@ -292,6 +292,16 @@ public class AcceptCarriageOrderVO /*extends PageRequest*/ {
      */
     private BigDecimal unloadAmount;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 单位翻译
+     */
+    private String unitLabel;
+
     /**
      * 卸货量
      */

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

@@ -284,10 +284,19 @@ public class ConsignOrderVO /*extends PageRequest*/ {
      */
     private BigDecimal entrustAmount;
 
-
     /**
      * 卸货量
      */
     private BigDecimal unloadAmount;
 
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 单位翻译
+     */
+    private String unitLabel;
+
 }

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

@@ -826,7 +826,7 @@ public class KwtAcceptCarriageOrderService {
                             param.setUpdateByName(LoginUserHolder.getUserName());
                             HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                             List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, false);
-                            HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
+                            HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), logisticsOrder.getTOrderId(), goodsLoading);
                             if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                                 log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                                 throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!");
@@ -1556,7 +1556,7 @@ public class KwtAcceptCarriageOrderService {
                     HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrder(param);*/
                     List<GoodsLoadingParam> goodsLoading = logisticsOrderGoodsService.goodsLoadingParams(logisticsOrder, true);
 //                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(logisticsOrder.getTOrderId(), goodsLoading);
-                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(),LoginUserHolder.getUserName(),logisticsOrder.getTOrderId(), goodsLoading);
+                    HttpResult result1 = tradeOrderInfoService.createOrCancelLogisticsOrderV1(LoginUserHolder.getUserId(), LoginUserHolder.getUserName(), logisticsOrder.getTOrderId(), goodsLoading);
                     if (result1.getCode() != HttpStatus.SUCCESS_CODE) {
                         log.info("{}拒绝接单->贸易订单失败!,返回信息:{}", "id:" + logisticsOrder.getTOrderId() + "orderNo" + logisticsOrder.getTOrderNo(), JSONObject.toJSONString(result1));
                         throw new BusinessException("{" + logisticsOrder.getTOrderNo() + "} 拒绝接单->贸易订单失败!" + result1.getMsg());
@@ -2484,6 +2484,7 @@ public class KwtAcceptCarriageOrderService {
             vo.setLoadAddress(vo.getLoadCityName() + vo.getLoadAddress());
             vo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
             vo.setLoadCityName(vo.getLoadName());
+            vo.setUnitLabel(unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit())));
             vo.setUnloadCityName(vo.getUnloadName());
             if (vo.getTOrderId() != null) {
 //                try {
@@ -2696,6 +2697,8 @@ public class KwtAcceptCarriageOrderService {
         longs.add(LoginUserHolder.getUserId());
         List<Long> longList = longs.stream().distinct().collect(Collectors.toList());
         List<AcceptCarriageOrderVO> list = logisticsOrderMapper.selectLogisticsOrderListByAcceptCarriage(query, orderList, type, entId, longList, longList, idsList);
+        /**计量单位*/
+        Map<String, String> unitTypeDictData = getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**计费方式*/
         Map<String, String> chargingDictData = getDictData(DictTypeEnum.CHARGING_TYPE.getType());
         /**结算周期*/
@@ -2732,6 +2735,10 @@ public class KwtAcceptCarriageOrderService {
             carriageOrderExcelVo.setLoadAddress(vo.getLoadName());
             carriageOrderExcelVo.setUnloadAddress(vo.getUnloadName());
             carriageOrderExcelVo.setOrderSourceLabel(orderSource == null ? null : orderSource.get(vo.getOrderSource()));
+            String unitLabel = unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit()));
+            carriageOrderExcelVo.setLoadAmount(carriageOrderExcelVo.getLoadAmount() + unitLabel);
+            carriageOrderExcelVo.setUnloadAmount(carriageOrderExcelVo.getUnloadAmount() + unitLabel);
+
 //            if (vo.getTOrderId() != null) {
 //                try {
 //                    OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));

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

@@ -1825,6 +1825,7 @@ public class KwtConsignOrderService {
             vo.setLoadCityName(vo.getLoadName());
             vo.setUnloadCityName(vo.getUnloadName());
             vo.setPriceLabel(vo.getPriceType() == null ? null : priceDictData.get(vo.getPriceType()));
+            vo.setUnitLabel(unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit())));
 //            if (vo.getTOrderId() != null) {
 //                try {
 //                    OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
@@ -2009,6 +2010,8 @@ public class KwtConsignOrderService {
 //        List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectConsignLogisticsOrderList(query, orderList, type, entId, longList, longList,idsList);
         List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectConsignLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList, idsList);
 //        List<ConsignOrderVO> list = kwtLogisticsOrderMapper.selectLogisticsOrderListByConsign(query, orderList, type, entId, longList, longList,idsList);
+        /**计量单位*/
+        Map<String, String> unitTypeDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
         /**计费方式*/
         Map<String, String> chargingDictData = commonService.getDictData(DictTypeEnum.CHARGING_TYPE.getType());
         /**结算周期*/
@@ -2045,6 +2048,10 @@ public class KwtConsignOrderService {
             consignOrderExcelVo.setUnloadAddress(vo.getUnloadCityName() + vo.getUnloadAddress());
             consignOrderExcelVo.setLoadName(vo.getLoadName());
             consignOrderExcelVo.setUnloadName(vo.getUnloadName());
+            String unitLabel = unitTypeDictData == null ? vo.getUnit() : (unitTypeDictData.get(vo.getUnit()) == null ? vo.getUnit() : unitTypeDictData.get(vo.getUnit()));
+            consignOrderExcelVo.setLoadAmount(consignOrderExcelVo.getLoadAmount() + unitLabel);
+            consignOrderExcelVo.setUnloadAmount(consignOrderExcelVo.getUnloadAmount() + unitLabel);
+
 //            if (vo.getTOrderId() != null) {
 //                OrderDetailRes orderDetailRes = tradeOrderInfoService.getOrderDetailById(Long.valueOf(vo.getTOrderId()));
 //                if (orderDetailRes != null) {