新增返参

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -528,7 +528,6 @@ public class KwsEnterpriseService {
 
         //子公司不用新建机构、角色等，直接返回
         Map<String, Object> map = CollectionUtils.createHashMap();
-        ;
         map.put("entName", kwsEnterprise.getFirmName());
         map.put("createByName", kwsEnterprise.getContacts());
         if (Objects.nonNull(reqVo.getEntPid())) {

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

@@ -260,7 +260,7 @@ public class OrderDetailVO {
      */
     private String taxRateLabel;
 
-    private List<String> lineFreightNameList;
+    private List<LineFreightRateVo> lineFreightRate;
 
 
 }

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

@@ -52,4 +52,13 @@ public class OrderFinishVO {
      * 卸货数量
      */
     private List<LineFreightRateVo> lineFreightRate;
+
+    /**
+     * 計費方式
+     */
+    private String chargingType;
+    /**
+     * 計費方式
+     */
+    private String chargingTypeName;
 }

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

@@ -117,6 +117,11 @@ public class WaybillOrderSelectVo implements Serializable {
      */
     private List<String> loadAddress;
 
+    /**
+     * 装货时间
+     */
+    private List<Date> loadTime;
+
     /**
      * 卸货地点点名称
      */
@@ -127,6 +132,11 @@ public class WaybillOrderSelectVo implements Serializable {
      */
     private List<String> unloadAddress;
 
+    /**
+     * 卸货时间
+     */
+    private List<Date> unloadTime;
+
     /**
      * 实装量/吨
      */

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

@@ -183,4 +183,21 @@ public class WaybillSubtaskSelectVo {
     public String getWaybillType() {
         return type == NumberConstant.ONE ? "趟次" : "循环";
     }
+
+    private BigDecimal goodsPrice;
+
+    /**
+     * 派车量
+     */
+    public BigDecimal sendCarWeigh;
+
+    /**
+     * 亏吨量
+     */
+    public BigDecimal defectiveWeigh;
+
+    /**
+     * 扣亏量
+     */
+    public BigDecimal deduct;
 }

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

@@ -1297,7 +1297,9 @@ public class KwtConsignOrderService {
         List<OrderGoodsLoadingVo> assistUnit = new ArrayList<>();
         //单位
         Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(List.of(DictTypeEnum.UNIT_TYPE.getType()));
+        Map<String, Map<String, String>> chargingType = remoteSystemService.queryDictByType(List.of(DictTypeEnum.CHARGING_TYPE.getType()));
         Map<String, String> unitMap = dict != null ? dict.get(DictTypeEnum.UNIT_TYPE.getType()) : null;
+        Map<String, String> chargingTypeMap = chargingType != null ? dict.get(DictTypeEnum.CHARGING_TYPE.getType()) : null;
         //物流订单
         KwtLogisticsOrder logisticsOrder = kwtLogisticsOrderMapper.selectById(orderId);
         //物流订单辅助单位信息
@@ -1324,6 +1326,8 @@ public class KwtConsignOrderService {
         orderFinishVO.setUnloadAmount(logisticsOrder.getTotalUnloadAmount());
         orderFinishVO.setAssistUnit(assistUnit);
         orderFinishVO.setLineFreightRate(lineFreightRateMapper.selectListByOrderId(Long.parseLong(orderId)));
+        orderFinishVO.setChargingType(logisticsOrder.getBillingMode());
+        orderFinishVO.setChargingTypeName(chargingTypeMap != null ? chargingTypeMap.get(logisticsOrder.getBillingMode()) : "");
         return HttpResult.ok(orderFinishVO);
     }
 

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

@@ -253,9 +253,9 @@ public class KwtTransportCommonService {
             vo.setLoadAddressDetail(loadAddress.getDetailAddress());
             KwtLogisticsOrderAmount orderAmount = logisticsOrderAmountMapper.selectOne(
                     new LambdaQueryWrapper<KwtLogisticsOrderAmount>()
-                    .eq(KwtLogisticsOrderAmount::getLOrderId, loadAddress.getLOrderId())
-                    .eq(KwtLogisticsOrderAmount::getLAddressId, loadAddress.getId())
-                    .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
+                            .eq(KwtLogisticsOrderAmount::getLOrderId, loadAddress.getLOrderId())
+                            .eq(KwtLogisticsOrderAmount::getLAddressId, loadAddress.getId())
+                            .eq(KwtLogisticsOrderAmount::getDelFlag, 0)
             );
             vo.setLoadAmount(orderAmount != null ? orderAmount.getAmount() : new BigDecimal("0.00"));
             loadAddressList.add(vo);
@@ -406,9 +406,7 @@ public class KwtTransportCommonService {
 
 
         List<LineFreightRateVo> lineFreightRateVos = kwtLogisticsOrderLineFreightRateMapper.selectListByOrderId(Long.parseLong(dto.getId()));
-        if (CollectionUtils.isNotEmpty(lineFreightRateVos)) {
-            orderDetailVO.setLineFreightNameList(lineFreightRateVos.stream().map(LineFreightRateVo::getLineFreightName).collect(Collectors.toList()));
-        }
+        orderDetailVO.setLineFreightRate(lineFreightRateVos);
 
         return orderDetailVO;
     }
@@ -615,9 +613,9 @@ public class KwtTransportCommonService {
                 String key = String.valueOf(lOrderId) + "-" + String.valueOf(tOrderAddressId);
                 if (currentOrderMap.get(key) != null) {
                     logisticsOrderCancelAmountVo.setAmount(logisticsOrderCancelAmountVo.getAmount().subtract(currentOrderMap.get(key)));
-                    logisticsOrderAmountMapper.update(null,new LambdaUpdateWrapper<KwtLogisticsOrderAmount>()
-                            .set(KwtLogisticsOrderAmount::getEntrustAmount,logisticsOrderCancelAmountVo.getAmount())
-                            .eq(KwtLogisticsOrderAmount::getId,logisticsOrderCancelAmountVo.getAmountId())
+                    logisticsOrderAmountMapper.update(null, new LambdaUpdateWrapper<KwtLogisticsOrderAmount>()
+                            .set(KwtLogisticsOrderAmount::getEntrustAmount, logisticsOrderCancelAmountVo.getAmount())
+                            .eq(KwtLogisticsOrderAmount::getId, logisticsOrderCancelAmountVo.getAmountId())
                     );
                 }
             }
@@ -728,14 +726,14 @@ public class KwtTransportCommonService {
                 KwtLogisticsOrderUnit carrierOrderUnit = logisticsOrderUnitMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderUnit>()
                         .eq(KwtLogisticsOrderUnit::getLOrderId, logisticsOrderDTO.getLOrderId())
                         .eq(KwtLogisticsOrderUnit::getUnitType, NumberConstant.TWO));
-                KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
-                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
-                );
-                KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
-                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
-                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
-                );
+//                KwtLogisticsOrderAddress loadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+//                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
+//                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.ONE)
+//                );
+//                KwtLogisticsOrderAddress unloadOrderAddress = logisticsOrderAddressMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderAddress>()
+//                        .eq(KwtLogisticsOrderAddress::getLOrderId, logisticsOrderDTO.getLOrderId())
+//                        .eq(KwtLogisticsOrderAddress::getAddressType, NumberConstant.TWO)
+//                );
                 KwtLogisticsOrderContract contract = logisticsOrderContractMapper.selectOne(new LambdaQueryWrapper<KwtLogisticsOrderContract>()
                         .eq(KwtLogisticsOrderContract::getLOrderId, logisticsOrderDTO.getLOrderId())
                 );
@@ -833,14 +831,14 @@ public class KwtTransportCommonService {
                 logisticsOrderDTO.setContractNo(contract.getContractNo());
                 logisticsOrderDTO.setGoodsPriceLabel(priceDictData.get(logisticsOrderDTO.getPriceType()));
                 logisticsOrderDTO.setCreateByName(remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()) == null ? null : remoteSystemService.queryUserCacheById(logisticsOrderDTO.getCreateBy()).getName());
-                logisticsOrderDTO.setLoadAddress(loadOrderAddress.getDetailAddress());
-                logisticsOrderDTO.setLoadName(loadOrderAddress.getName());
-                logisticsOrderDTO.setLoadContacts(loadOrderAddress.getContacts());
-                logisticsOrderDTO.setLoadPhone(loadOrderAddress.getPhone());
-                logisticsOrderDTO.setUnloadAddress(unloadOrderAddress.getDetailAddress());
-                logisticsOrderDTO.setUnloadName(unloadOrderAddress.getName());
-                logisticsOrderDTO.setUnloadContacts(unloadOrderAddress.getContacts());
-                logisticsOrderDTO.setUnloadPhone(unloadOrderAddress.getPhone());
+//                logisticsOrderDTO.setLoadAddress(loadOrderAddress.getDetailAddress());
+//                logisticsOrderDTO.setLoadName(loadOrderAddress.getName());
+//                logisticsOrderDTO.setLoadContacts(loadOrderAddress.getContacts());
+//                logisticsOrderDTO.setLoadPhone(loadOrderAddress.getPhone());
+//                logisticsOrderDTO.setUnloadAddress(unloadOrderAddress.getDetailAddress());
+//                logisticsOrderDTO.setUnloadName(unloadOrderAddress.getName());
+//                logisticsOrderDTO.setUnloadContacts(unloadOrderAddress.getContacts());
+//                logisticsOrderDTO.setUnloadPhone(unloadOrderAddress.getPhone());
                 logisticsOrderDTO.setCarrierCompany(carrierOrderUnit == null ? null : carrierOrderUnit.getFirmName());
                 logisticsOrderDTO.setCarrierPhone(carrierOrderUnit == null ? null : carrierOrderUnit.getPhone());
                 logisticsOrderDTO.setCarrierContacts(carrierOrderUnit == null ? null : carrierOrderUnit.getContacts());
@@ -1013,7 +1011,7 @@ public class KwtTransportCommonService {
                 new LambdaQueryWrapper<KwtWaybillOrderSubtask>()
                         .eq(KwtWaybillOrderSubtask::getLOrderId, Long.parseLong(orderId))
                         .eq(KwtWaybillOrderSubtask::getDelFlag, 0)
-                        .in(KwtWaybillOrderSubtask::getStatus,orderStatus)).intValue());
+                        .in(KwtWaybillOrderSubtask::getStatus, orderStatus)).intValue());
         orderFinishVO.setUnit(logisticsOrder.getUnit());
         orderFinishVO.setUnitName(unitMap != null ? unitMap.get(logisticsOrder.getUnit()) : null);
         orderFinishVO.setAmount(logisticsOrder.getAmount());

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

@@ -34,11 +34,33 @@
     <select id="findListPage" resultType="com.sckw.transport.model.vo.WaybillSubtaskSelectVo"
             parameterType="com.sckw.transport.model.dto.WaybillSubtaskOrderQueryDto">
         SELECT
-        wos.w_order_id wOrderId, wos.unit, wos.entrust_amount entrustAmount, wos.unload_amount unloadAmount, wos.unload_time unloadDateTime,
-        wos.load_time loadDateTime, wos.load_amount loadAmount, wos.deficit_amount deficitAmount, wos.deficit_price deficitPrice, wos.id wSubtaskId,
-        wo.w_order_no wOrderNo, wo.driver_id driverId, wo.driver_name driverName, wo.driver_phone driverPhone, wo.driver_idcard driverIdcard,
-        wo.truck_id truckId, wo.truck_no truckNo, wo.type, wo.create_by createBy, wo.create_time createTime, wo.create_time sendCarDate,
-        wo.ent_id entId, wo.status, lo.l_order_no lOrderNo, lo.loss
+                wos.w_order_id wOrderId,
+                wos.unit,
+                wos.entrust_amount entrustAmount,
+                wos.unload_amount unloadAmount,
+                wos.unload_time unloadDateTime,
+                wos.load_time loadDateTime,
+                wos.load_amount loadAmount,
+                wos.deficit_amount deficitAmount,
+                wos.deficit_price deficitPrice,
+                wos.id wSubtaskId,
+                wo.w_order_no wOrderNo,
+                wo.driver_id driverId,
+                wo.driver_name driverName,
+                wo.driver_phone driverPhone,
+                wo.driver_idcard driverIdcard,
+                wo.truck_id truckId,
+                wo.truck_no truckNo,
+                wo.type,
+                wo.create_by createBy,
+                wo.create_time createTime,
+                wo.create_time sendCarDate,
+                wo.ent_id entId,
+                wo.status,
+                lo.l_order_no lOrderNo,
+                lo.loss,
+                lo.loss_unit lossLabel,
+                lo.goods_price
         from kwt_waybill_order_subtask wos
         left join kwt_waybill_order wo on wo.id = wos.w_order_id
         left join kwt_logistics_order lo on lo.id = wos.l_order_id