承运订单-完结订单数据查询

托运订单-完结订单数据查询

sckw-modules/sckw-file/src/main/resources/bootstrap.yml

@@ -5,7 +5,8 @@ spring:
   application:
     name: sckw-file
   profiles:
-    active: @profiles.active@
+    active: ${DEPLOY_MODE:dev}
+#    active: @profiles.active@
   main:
     allow-bean-definition-overriding: true
     allow-circular-references: true

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/AcceptCarriageOrderController.java

@@ -216,6 +216,21 @@ public class AcceptCarriageOrderController {
         }
     }
 
+    /**
+     * 承运订单-完结订单-页面数据查询
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/acceptCarriageOrderFinishDetail", method = RequestMethod.GET)
+    public HttpResult acceptCarriageOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
+        log.info("承运订单-完结订单-页面数据查询 传递参数信息:{}", orderId);
+        try {
+            return acceptCarriageOrderService.acceptCarriageOrderFinishDetail(orderId);
+        } catch (Exception e) {
+            log.error("承运订单-完结订单-页面数据查询 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
 
     /**
      * 承运订单-完结订单

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/ConsignOrderController.java

@@ -5,6 +5,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.service.ConsignOrderService;
+import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -70,6 +71,22 @@ public class ConsignOrderController {
         }
     }
 
+    /**
+     * 托运订单-完结订单-页面数据查询
+     * @param orderId
+     * @return
+     */
+    @RequestMapping(value = "/consignOrderFinishDetail", method = RequestMethod.GET)
+    public HttpResult consignOrderFinishDetail(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
+        log.info("托运订单-完结订单-页面数据查询 传递参数信息:{}", orderId);
+        try {
+            return consignOrderService.consignOrderFinishDetail(orderId);
+        } catch (Exception e) {
+            log.error("托运订单-完结订单-页面数据查询 error :{}", e.getMessage(), e);
+            return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
+        }
+    }
+
     /**
      * 托运订单-完结订单
      *

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/LogisticsConsignmentController.java

@@ -24,6 +24,7 @@ import java.util.List;
  * @date 2023-06-28 11:06:06
  */
 @Slf4j
+@Validated
 @RestController
 @RequiredArgsConstructor
 @RequestMapping(value = "/kwtLogisticsConsignment")
@@ -118,7 +119,7 @@ public class LogisticsConsignmentController {
      */
     @Validated
     @RequestMapping(value = "/selectPurchaseOrderFinish", method = RequestMethod.GET)
-    public HttpResult selectPurchaseOrderFinish(@RequestParam("orderId") @NotNull(message = "数据id不能为空") String orderId) {
+    public HttpResult selectPurchaseOrderFinish(@RequestParam("orderId") @NotBlank(message = "数据id不能为空") String orderId) {
         log.info("采购订单-托运订单列表-订单完结-数据查询 传递参数信息:{}", orderId);
         try {
             return logisticsConsignmentService.selectOrderFinishVo(orderId, "1");

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

@@ -15,6 +15,10 @@ public class OrderFinishVO {
      * 总运单次数
      */
     private Integer number;
+    /**
+     * 运输
+     */
+    private BigDecimal amount;
     /**
      * 总卸货量
      */

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

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import com.sckw.contract.api.RemoteContractService;
 import com.sckw.contract.api.model.dto.res.ContractCommonInfoResDto;
 import com.sckw.core.common.enums.NumberConstant;
@@ -14,8 +12,6 @@ import com.sckw.core.common.enums.StringConstant;
 import com.sckw.core.common.enums.enums.DictTypeEnum;
 import com.sckw.core.model.enums.CarWaybillEnum;
 import com.sckw.core.model.enums.LogisticsOrderEnum;
-import com.sckw.core.model.page.PageHelperUtil;
-import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.*;
 import com.sckw.core.web.constant.HttpStatus;
 import com.sckw.core.web.context.LoginUserHolder;
@@ -33,14 +29,14 @@ import com.sckw.product.api.model.KwpGoods;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
-import com.sckw.system.api.model.dto.res.*;
+import com.sckw.system.api.model.dto.res.EntCacheResDto;
+import com.sckw.system.api.model.dto.res.SysDictResDto;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.model.dto.OrderTakingDTO;
 import com.sckw.transport.model.dto.StopOrderTakingDTO;
 import com.sckw.transport.model.dto.SubcontractConsignmentDTO;
-import com.sckw.transport.model.param.AcceptCarriageOrderQuery;
 import com.sckw.transport.model.param.DriverParam;
 import com.sckw.transport.model.vo.*;
 import jakarta.annotation.Resource;
@@ -119,26 +115,6 @@ public class AcceptCarriageOrderService {
     @Autowired
     private MongoTemplate mongoTemplate;
 
-    public HttpResult list(AcceptCarriageOrderQuery query) {
-        List<AcceptCarriageOrderVO> list = new ArrayList<>();
-        AcceptCarriageOrderVO acceptCarriageOrderVo = new AcceptCarriageOrderVO();
-        List<CarWaybillVO> carWaybillVOList = new ArrayList<>();
-        CarWaybillVO carWaybillVo = new CarWaybillVO();
-        carWaybillVOList.add(carWaybillVo);
-        List<ConsignmentVO> consignmentVOS = new ArrayList<>();
-        ConsignmentVO consignmentVo = new ConsignmentVO();
-        consignmentVOS.add(consignmentVo);
-        acceptCarriageOrderVo.setCarWaybillList(carWaybillVOList);
-        acceptCarriageOrderVo.setConsignmentList(consignmentVOS);
-        list.add(acceptCarriageOrderVo);
-        PageHelper.startPage(query.getPage(), query.getPageSize());
-        PageResult pageResult = PageHelperUtil.getPageResult(new PageInfo<>(list));
-        return HttpResult.ok(pageResult);
-    }
-
-    public HttpResult count(AcceptCarriageOrderQuery query) {
-        return null;
-    }
 
     /**
      * 承运订单-分包托运
@@ -190,7 +166,7 @@ public class AcceptCarriageOrderService {
          * 判断是否已存在分包【当前分包只允许加上主单一共三级】*/
         Long count = logisticsOrderMapper.selectCount(new LambdaQueryWrapper<KwtLogisticsOrder>()
                 .in(KwtLogisticsOrder::getPids, bo.getLOrderId()));
-        if (count >= NumberConstant.TWO) {
+        if (count > NumberConstant.TWO) {
             throw new RuntimeException("分包次数已达上限!");
         }
         String pids = logisticsOrder.getPids();
@@ -1098,4 +1074,14 @@ public class AcceptCarriageOrderService {
         orderDetailVO.setPerformanceAmount(logisticsOrder.getLoadAmount() == null ? null : String.valueOf(logisticsOrder.getLoadAmount()));
         return HttpResult.ok(orderDetailVO);
     }
+
+    /**
+     * 承运订单-完结订单-数据查询展示
+     * @param orderId   物流订单id
+     * @return
+     */
+    public HttpResult acceptCarriageOrderFinishDetail(String orderId) {
+        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        return HttpResult.ok(orderFinishVO);
+    }
 }

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

@@ -24,6 +24,7 @@ import com.sckw.transport.model.dto.OrderDTO;
 import com.sckw.transport.model.dto.OrderFinishDTO;
 import com.sckw.transport.model.vo.CarDataVO;
 import com.sckw.transport.model.vo.CarWaybillVO;
+import com.sckw.transport.model.vo.OrderFinishVO;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -415,7 +416,7 @@ public class ConsignOrderService {
 
 
     /**
-     * 承运订单-分包托运-完结订单-修改本身数据
+     * 托运订单-完结订单-修改本身数据
      *
      * @param logisticsOrder 本身物流订单数据
      * @param orderFinishDTO 页面传递数据
@@ -456,7 +457,7 @@ public class ConsignOrderService {
     }
 
     /**
-     * 承运订单-分包托运-完结订单-修改分包订单
+     * 托运订单-完结订单-存在分包托运-修改分包订单
      *
      * @param orderFinishDTO
      * @param orderId        分包物流订单id
@@ -495,4 +496,14 @@ public class ConsignOrderService {
             streamBridge.send("sckw-busSum", com.alibaba.fastjson2.JSON.toJSONString(busSum));
         }
     }
+
+    /**
+     * 托运订单-完结订单-数据查询展示
+     * @param orderId   物流订单id
+     * @return
+     */
+    public HttpResult consignOrderFinishDetail(String orderId) {
+        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        return HttpResult.ok(orderFinishVO);
+    }
 }

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

@@ -407,6 +407,7 @@ public class LogisticsConsignmentService {
     private void insertLogisticsOrder(LogisticsConsignmentParam bo, String lOrderNo, KwtLogisticsOrder order, OrderDetailRes tradeOrder, Long orderId, Integer orderStatus) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
+        order.setType(String.valueOf(NumberConstant.ONE));
         order.setTOrderId(Long.parseLong(bo.getTOrderId()));
         order.setTOrderNo(bo.getTOrderNo());
         order.setLOrderNo(lOrderNo);

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

@@ -315,7 +315,7 @@
             AND b.driver_phone like concat('%',#{driverParam.driverPhone},'%')
         </if>
         <if test="driverParam.truckNo != null and driverParam.truckNo != ''">
-<!--            AND b.truck_no = #{driverParam.truckNo}-->
+            <!--            AND b.truck_no = #{driverParam.truckNo}-->
             AND b.truck_no like concat('%',#{driverParam.truckNo},'%')
         </if>
         GROUP BY b.truck_no
@@ -361,7 +361,7 @@
     </select>
 
     <select id="selectOrderFinishData" resultType="com.sckw.transport.model.vo.OrderFinishVO">
-        SELECT COUNT(a.id) AS number,
+        SELECT b.amount as amount,COUNT(a.id) AS number,
         SUM(IFNULL(a.load_amount, 0)) as loadAmount,
         SUM(IFNULL(a.unload_amount, 0)) AS unloadAmount
         FROM kwt_waybill_order a
@@ -375,7 +375,8 @@
         </where>
     </select>
 
-    <select id="findLogisticsOrder" resultType="com.sckw.transport.model.KwtLogisticsOrder" parameterType="java.util.Map" >
+    <select id="findLogisticsOrder" resultType="com.sckw.transport.model.KwtLogisticsOrder"
+            parameterType="java.util.Map">
         select
         id, ent_id entId, t_order_id tOrderId, t_order_no tOrderNo, l_order_no lOrderNo, pid, pids,
         settlement_cycle settlementCycle, price, price_type priceType, billing_mode billingMode,
@@ -397,6 +398,5 @@
             and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
             and id != #{lOrderId, jdbcType=BIGINT}
         </if>
-
     </select>
 </mapper>