采购订单-销售订单下方物流订单页面新增数据展示

修复运单管理运单详情数据取值问题-SAS-988

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/LogisticsOrderDTO.java

@@ -52,18 +52,34 @@ public class LogisticsOrderDTO {
      * 计划量
      */
     private BigDecimal amount;
+    private String unit;
+    private String unitLabel;
     /**
      * 运价
      */
     private String price;
+
+    /**
+     * 运价
+     */
+    private String priceType;
+
+    /**
+     * 运价
+     */
+    private String priceLabel;
     /**
      * 合理损耗
      */
     private String loss;
+    private String lossUnit;
+    private String lossUnitLabel;
     /**
      * 扣亏货值
      */
     private String goodsPrice;
+    private String goodsPriceUnit;
+    private String goodsPriceUnitLabel;
     /**
      * 联系人
      */

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

@@ -656,6 +656,12 @@ public class LogisticsConsignmentService {
             if (flag) {
                 /**数据展示*/
                 list = kwtLogisticsOrderMapper.selectOrderListNotPage(id, type);
+                /**计量单位*/
+                Map<String, String> unitTypeDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
+                /**运价方式*/
+                Map<String, String> priceDictData = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
+                /**合理损耗*/
+                Map<String, String> taxRateTypeDictData = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
                 if (CollectionUtils.isNotEmpty(list)) {
                     for (LogisticsOrderDTO logisticsOrderDTO : list) {
                         logisticsOrderDTO.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
@@ -663,6 +669,10 @@ public class LogisticsConsignmentService {
                                 (remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())) == null ? null :
                                         remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())).getName());
                         logisticsOrderDTO.setCreateName(createName);
+                        logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
+                        logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
+                        logisticsOrderDTO.setGoodsPriceUnitLabel(priceDictData.get(logisticsOrderDTO.getGoodsPriceUnit()));
+                        logisticsOrderDTO.setUnitLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
                     }
                     returnList.addAll(list);
                 }
@@ -756,6 +766,12 @@ public class LogisticsConsignmentService {
             if (flag) {
                 /**数据展示*/
                 list = kwtLogisticsOrderMapper.selectOrderListNotPage(id, type);
+                /**计量单位*/
+                Map<String, String> unitTypeDictData = commonService.getDictData(DictTypeEnum.UNIT_TYPE.getType());
+                /**运价方式*/
+                Map<String, String> priceDictData = commonService.getDictData(DictTypeEnum.PRICE_TYPE.getType());
+                /**合理损耗*/
+                Map<String, String> taxRateTypeDictData = commonService.getDictData(DictTypeEnum.TAX_RATE_TYPE.getType());
                 if (CollectionUtils.isNotEmpty(list)) {
                     for (LogisticsOrderDTO logisticsOrderDTO : list) {
                         logisticsOrderDTO.setStatusLabel(LogisticsOrderEnum.getDestination(logisticsOrderDTO.getStatus()));
@@ -763,6 +779,10 @@ public class LogisticsConsignmentService {
                                 (remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())) == null ? null :
                                         remoteSystemService.queryUserCacheById(Long.parseLong(logisticsOrderDTO.getCreateBy())).getName());
                         logisticsOrderDTO.setCreateName(createName);
+                        logisticsOrderDTO.setPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
+                        logisticsOrderDTO.setLossUnitLabel(taxRateTypeDictData.get(logisticsOrderDTO.getLossUnit()));
+                        logisticsOrderDTO.setGoodsPriceUnitLabel(priceDictData.get(logisticsOrderDTO.getGoodsPriceUnit()));
+                        logisticsOrderDTO.setUnitLabel(unitTypeDictData.get(logisticsOrderDTO.getUnit()));
                     }
                     returnList.addAll(list);
                 }
@@ -1236,7 +1256,7 @@ public class LogisticsConsignmentService {
         tradeOrder.setActualUnloadAmount(map.get("totalUnloadAmount"));
         tradeOrder.setUpdateBy(LoginUserHolder.getUserId());
         tradeOrder.setUpdateByName(LoginUserHolder.getUserName());
-        log.info("采购订单手动完结订单请求参数:{}",JSONObject.toJSONString(tradeOrder));
+        log.info("采购订单手动完结订单请求参数:{}", JSONObject.toJSONString(tradeOrder));
         HttpResult httpResult = tradeOrderInfoService.completeLogisticsOrder(tradeOrder);
         if (httpResult.getCode() != HttpStatus.SUCCESS_CODE) {
             log.info("贸易订单-采购订单/销售订单-手动完结订单异常,传递信息:{},返回信息:{}", JSONObject.toJSONString(tradeOrder), JSONObject.toJSONString(httpResult));

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

@@ -20,10 +20,7 @@ import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
 import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.system.api.model.dto.res.UserCacheResDto;
 import com.sckw.transport.dao.*;
-import com.sckw.transport.model.KwtLogisticsOrder;
-import com.sckw.transport.model.KwtLogisticsOrderCirculate;
-import com.sckw.transport.model.KwtWaybillOrder;
-import com.sckw.transport.model.KwtWaybillOrderTrack;
+import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.AddressDropListDTO;
 import com.sckw.transport.model.dto.WayBillDetailDTO;
 import com.sckw.transport.model.dto.WaybillListAppDTO;
@@ -154,16 +151,28 @@ public class WaybillManagementService {
             waybillCarVO.setDriverId(String.valueOf(info.getTruckId()));
             waybillCarVO.setTrailerNo(info.getTruckTrailerNo());
             // 票据
-            if (info.getLoadTime() != null) {
-                waybillTicketVO.setLoadTime(DateUtil.getDateTime(info.getLoadTime()));
-            }
-            waybillTicketVO.setLoadWeight(String.valueOf(info.getLoadAmount()));
-            waybillTicketVO.setLoadUrl(String.valueOf(info.getLoadUrls()));
-            if (info.getUnloadTime() != null) {
-                waybillTicketVO.setUnloadTime(DateUtil.getDateTime(info.getUnloadTime()));
+            List<KwtWaybillOrderTicket> waybillOrderTickets = kwtWaybillOrderTicketMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTicket>()
+                    .eq(KwtWaybillOrderTicket::getWOrderId, id)
+            );
+            if (!org.springframework.util.CollectionUtils.isEmpty(waybillOrderTickets)) {
+                for (KwtWaybillOrderTicket waybillOrderTicket : waybillOrderTickets) {
+                    //1装货单/2卸货单
+                    if (waybillOrderTicket.getType() == 1) {
+                        if (info.getLoadTime() != null) {
+                            waybillTicketVO.setLoadTime(waybillOrderTicket.getOperateTime() == null ? null : DateUtil.getDateTime(waybillOrderTicket.getOperateTime()));
+                        }
+                        waybillTicketVO.setLoadWeight(String.valueOf(info.getLoadAmount()));
+                        waybillTicketVO.setLoadUrl(String.valueOf(info.getLoadUrls()));
+                    }
+                    if (waybillOrderTicket.getType() == 2) {
+                        if (info.getUnloadTime() != null) {
+                            waybillTicketVO.setUnloadTime(waybillOrderTicket.getOperateTime() == null ? null : DateUtil.getDateTime(waybillOrderTicket.getOperateTime()));
+                        }
+                        waybillTicketVO.setUnloadWeight(String.valueOf(info.getUnloadAmount()));
+                        waybillTicketVO.setUnloadUrl(String.valueOf(info.getUnloadUrls()));
+                    }
+                }
             }
-            waybillTicketVO.setUnloadWeight(String.valueOf(info.getUnloadAmount()));
-            waybillTicketVO.setUnloadUrl(String.valueOf(info.getUnloadUrls()));
             waybillTicketVO.setDeficitAmount(String.valueOf(info.getDeficitAmount()));
             BigDecimal deficitLoss = info.getLoss() == null ? BigDecimal.valueOf(0) : info.getLoss();
             BigDecimal deficitAmount = info.getDeficitAmount() == null ? BigDecimal.valueOf(0) : info.getDeficitAmount();
@@ -602,7 +611,7 @@ public class WaybillManagementService {
                 allTotal += result.getTotal();
             }
         }
-       // allTotal= Math.toIntExact(results.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
+        // allTotal= Math.toIntExact(results.stream().filter(item -> ObjectUtil.isNotEmpty(item.getTotal())).collect(Collectors.summarizingInt(item -> item.getTotal())).getSum());
         listMap.get("all").setTotal(allTotal);
 
         /**数据状态整合做计算
@@ -619,7 +628,7 @@ public class WaybillManagementService {
             for (TableTops result : results) {
                 if (CarWaybillEnum.COMPLETION_UNLOADING.getStatus().equals(result.getValue())) {
                     result.setTotal(result.getTotal() + number);
-                    listMap.put(result.getValue(),result);
+                    listMap.put(result.getValue(), result);
                 }
             }
         }

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

@@ -77,21 +77,25 @@
     </select>
 
     <select id="selectOrderListNotPage" resultType="com.sckw.transport.model.dto.LogisticsOrderDTO">
-        SELECT a.id          as lOrderId,
-               a.l_order_no  as lOrderNo,
-               b.`status`    as `status`,
-               a.t_order_id  as tOrderId,
-               a.t_order_no  as tOrderNo,
-               a.payment     as payment,
+        SELECT a.id               as lOrderId,
+               a.l_order_no       as lOrderNo,
+               b.`status`         as `status`,
+               a.t_order_id       as tOrderId,
+               a.t_order_no       as tOrderNo,
+               a.payment          as payment,
                a.amount,
+               a.unit             as unit,
                a.price,
+               a.price_type       as priceType,
                a.loss,
-               a.goods_price as goodsPrice,
-               c.firm_name   as companyName,
+               a.loss_unit        AS lossUnit,
+               a.goods_price      as goodsPrice,
+               a.goods_price_unit as goodsPriceUnit,
+               c.firm_name        as companyName,
                c.contacts,
                c.phone,
-               a.create_by   as createBy,
-               a.create_time as createTime
+               a.create_by        as createBy,
+               a.create_time      as createTime
         FROM kwt_logistics_order a
                  LEFT JOIN kwt_logistics_order_track b ON a.id = b.l_order_id and a.`status` = b.`status`
                  LEFT JOIN kwt_logistics_order_unit c ON a.id = c.l_order_id AND c.unit_type = #{type}