采购订单/销售订单/承运订单/托运订单-完结订单数据查询修改查询接口

sckw-modules/sckw-example/src/main/java/com/sckw/example/controller/ExcelExportController.java

@@ -108,6 +108,7 @@ public class ExcelExportController {
      *
      * @param file 文件
      * @param type 文件类型-指的是什么模板 用于公共导入处理
+     *
      * @return
      */
     @SneakyThrows

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/KwAcceptCarriageService.java

@@ -202,9 +202,20 @@ public class KwAcceptCarriageService {
         if (StringUtils.isNotBlank(param.getUnloadAddress())) {
             criteria.and("unloadDetailAddress").is(param.getUnloadAddress());
         }
+
         if (StringUtils.isNotBlank(param.getStatus())) {
-            criteria.and("status").is(param.getStatus());
+            if (String.valueOf(NumberConstant.EIGHT).equals(param.getStatus())) {
+                List<String> status = new ArrayList<>();
+                status.add(LogisticsOrderEnum.REJECT_ORDER.getStatus());
+                status.add(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+                criteria.and("status").in(status);
+            } else {
+                criteria.and("status").is(param.getStatus());
+            }
         }
+//        if (StringUtils.isNotBlank(param.getStatus())) {
+//            criteria.and("status").is(param.getStatus());
+//        }
         criteria.and("delFlag").is(String.valueOf(NumberConstant.ZERO));
         // 4. 日期范围
         if (StringUtils.isNotEmpty(param.getStartDateTime())) {
@@ -419,8 +430,18 @@ public class KwAcceptCarriageService {
                 criteria.and("unloadDetailAddress").is(query.getUnloadAddress());
             }
             if (StringUtils.isNotBlank(query.getStatus())) {
-                criteria.and("status").is(query.getStatus());
+                if (String.valueOf(NumberConstant.EIGHT).equals(query.getStatus())) {
+                    List<String> status = new ArrayList<>();
+                    status.add(LogisticsOrderEnum.REJECT_ORDER.getStatus());
+                    status.add(LogisticsOrderEnum.CANCEL_ORDER.getStatus());
+                    criteria.and("status").in(status);
+                } else {
+                    criteria.and("status").is(query.getStatus());
+                }
             }
+//            if (StringUtils.isNotBlank(query.getStatus())) {
+//                criteria.and("status").is(query.getStatus());
+//            }
             // 4. 日期范围
             if (StringUtils.isNotEmpty(query.getStartDateTime()) && StringUtils.isNotEmpty(query.getEndDateTime())) {
                 criteria.andOperator(Criteria.where("createTime").gte(query.getStartDateTime()), Criteria.where("createTime")

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

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

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

@@ -12,7 +12,7 @@ import java.util.Date;
 @Data
 public class WaybillCountVo {
     /**
-     * 装货量
+     * 已委托量
      */
     private BigDecimal entrustAmount;
 

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

@@ -1469,7 +1469,16 @@ public class AcceptCarriageOrderService {
      * @return
      */
     public HttpResult acceptCarriageOrderFinishDetail(String orderId) {
-        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+//        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        Map<String, Object> map = new HashMap(NumberConstant.SIXTEEN);
+        map.put("upperlOrderId", orderId);
+        //随意给个值 主要是传递不为null
+        map.put("passStatus", 1);
+        WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
+        OrderFinishVO orderFinishVO = new OrderFinishVO();
+        orderFinishVO.setLoadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getLoadAmount());
+        orderFinishVO.setUnloadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getUnloadAmount());
+        orderFinishVO.setNumber(waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete());
         return HttpResult.ok(orderFinishVO);
     }
 

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

@@ -34,6 +34,7 @@ import com.sckw.transport.model.*;
 import com.sckw.transport.model.dto.*;
 import com.sckw.transport.model.vo.CarWaybillVO;
 import com.sckw.transport.model.vo.OrderFinishVO;
+import com.sckw.transport.model.vo.WaybillCountVo;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
@@ -582,7 +583,7 @@ public class ConsignOrderService {
         //验证当前物流订单是否还存在进行的车辆运单
         boolean flag = judgmentWaybillOrderIsFinish(id);
         if (flag) {
-            throw new BusinessException("您现在有车辆运单正在执行中,该订单目前不可完结,请先将运单执行完毕");
+            throw new BusinessException("检测您现在有运单正在执行中，该订单目前不可完结，请先将运单执行完毕！");
         }
         //修改单据本身数据
         BigDecimal ignoreAmount = logisticsOrder.getAmount().subtract(logisticsOrder.getTotalLoadAmount());
@@ -908,14 +909,23 @@ public class ConsignOrderService {
      * @return
      */
     public HttpResult consignOrderFinishDetail(String orderId) {
-        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+//        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        Map<String, Object> map = new HashMap(NumberConstant.SIXTEEN);
+        map.put("upperlOrderId", orderId);
+        //随意给个值 主要是传递不为null
+        map.put("passStatus", 1);
+        WaybillCountVo waybillOrderCount = kwtWaybillOrderMapper.findWaybillOrderCount(map);
+        OrderFinishVO orderFinishVO = new OrderFinishVO();
+        orderFinishVO.setLoadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getLoadAmount());
+        orderFinishVO.setUnloadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getUnloadAmount());
+        orderFinishVO.setNumber(waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete());
         return HttpResult.ok(orderFinishVO);
     }
 
     /**
      * 托运订单-新建订单
      *
-     * @param addOrderDTO   页面传递数据
+     * @param addOrderDTO 页面传递数据
      * @return
      */
     @Transactional(rollbackFor = Exception.class)

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

@@ -39,6 +39,7 @@ import com.sckw.transport.model.param.LogisticsConsignmentParam;
 import com.sckw.transport.model.vo.OrderFinishVO;
 import com.sckw.transport.model.vo.PurchaseLogisticOrderExcelVo;
 import com.sckw.transport.model.vo.SellLogisticOrderExcelVo;
+import com.sckw.transport.model.vo.WaybillCountVo;
 import io.seata.core.context.RootContext;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -1133,7 +1134,7 @@ public class LogisticsConsignmentService {
         //验证当前物流订单是否还存在进行的车辆运单
         boolean flag = judgmentWaybillOrderIsFinish(id);
         if (flag) {
-            throw new BusinessException("您现在有车辆运单正在执行中,该订单目前不可完结,请先将运单执行完毕");
+            throw new BusinessException("检测您现在有运单正在执行中，该订单目前不可完结，请先将运单执行完毕！");
         }
         //修改单据本身数据
         logisticsOrder.setTotalLoadAmount(orderFinishDTO.getLoadAmount());
@@ -1751,7 +1752,16 @@ public class LogisticsConsignmentService {
      */
     private HttpResult selectOrderFinishData(String orderId) {
         HttpResult httpResult = new HttpResult();
-        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+//        OrderFinishVO orderFinishVO = kwtLogisticsOrderMapper.selectOrderFinishData(orderId);
+        Map<String, Object> map = new HashMap(NumberConstant.SIXTEEN);
+        map.put("upperlOrderId", orderId);
+        //随意给个值 主要是传递不为null
+        map.put("passStatus", 1);
+        WaybillCountVo waybillOrderCount = waybillOrderMapper.findWaybillOrderCount(map);
+        OrderFinishVO orderFinishVO = new OrderFinishVO();
+        orderFinishVO.setLoadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getLoadAmount());
+        orderFinishVO.setUnloadAmount(waybillOrderCount == null ? new BigDecimal("0.00") : waybillOrderCount.getUnloadAmount());
+        orderFinishVO.setNumber(waybillOrderCount == null ? NumberConstant.ZERO : waybillOrderCount.getTotalComplete());
         httpResult.setData(orderFinishVO);
         return httpResult;
     }