Merge remote-tracking branch 'origin/dev' into dev

pom.xml

@@ -338,17 +338,21 @@
 
     <profiles>
         <profile>
-            <id>pdy</id>
+            <id>dev</id>
             <properties>
-                <!-- 环境标识，需要与配置文件的名称相对应 -->
-                <profiles.active>pdy</profiles.active>
+                <profiles.active>dev</profiles.active>
                 <nacos.server>10.10.10.230:8848</nacos.server>
-                <nacos.namespace>sckw_pdy</nacos.namespace>
+                <nacos.namespace>sckw-service-platform-dev</nacos.namespace>
+            </properties>
+        </profile>
+        <!--测试环境-->
+        <profile>
+            <id>test</id>
+            <properties>
+                <profiles.active>test</profiles.active>
+                <nacos.server>10.10.10.224:8848</nacos.server>
+                <nacos.namespace>sckw-service-platform</nacos.namespace>
             </properties>
-            <activation>
-                <!-- 默认环境 -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
     </profiles>
     <build>

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/base/IdsList.java

@@ -11,10 +11,27 @@ import java.util.List;
  * @date 2023-07-27 16:40:15
  */
 public interface IdsList {
+    default String getId() {
+        return "";
+    }
+
     default String getIds() {
         return "";
     }
 
+    /**
+     * 返回long类型的id
+     *
+     * @return Long
+     */
+    default Long getIdLong() {
+        String s;
+        if (StringUtils.isNotBlank(s = getId())) {
+            return Long.parseLong(s);
+        }
+        return null;
+    }
+
     default List<Long> getIdList() {
         return StringUtils.splitStrToList(getIds(), Long.class);
     }

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/enums/CarWaybillEnum.java

@@ -35,9 +35,9 @@ public enum CarWaybillEnum {
      */
     COMPLETION_UNLOADING(7, "completionUnloading", "7", "已卸货"),
     /**
-     * 已核单
+     * 已核-通过
      */
-    APPROVAL_COMPLETED(8, "approvalCompleted", "8", "已核单"),
+    APPROVAL_PASS(8, "approvalPass", "8", "已核单"),
     /**
      * 拒接单
      */
@@ -50,6 +50,10 @@ public enum CarWaybillEnum {
      * 已撤销
      */
     REVOKED(11, "revoked", "11", "已撤销"),
+    /**
+     * 已核单-不通过
+     */
+    APPROVAL_NO_PASS(12, "revoked", "12", "已撤销"),
     ;
 
     private final Integer code;

sckw-common/sckw-common-core/src/main/java/com/sckw/core/model/vo/BasePara.java

@@ -1,5 +1,6 @@
 package com.sckw.core.model.vo;
 
+import com.sckw.core.model.base.IdsList;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -12,7 +13,7 @@ import java.io.Serializable;
  */
 @Getter
 @Setter
-public class BasePara implements Serializable {
+public class BasePara implements IdsList, Serializable {
     @Serial
     private static final long serialVersionUID = 1881051859375157819L;
     /**

sckw-common/sckw-common-mongo/src/main/java/com/sckw/mongo/model/SckwLogisticsOrder.java

@@ -54,6 +54,11 @@ public class SckwLogisticsOrder {
      */
     private String tOrderNo;
 
+    /**
+     * 物流订单类型（1 贸易订单生成物流订单、2 自建物流订单）
+     */
+    private Integer type;
+
     /**
      * 结算周期(周结、月结、季结)
      */
@@ -160,9 +165,9 @@ public class SckwLogisticsOrder {
     private String remark;
 
     /**
-     * 用户状态（0正常、1已锁）
+     * 业务状态
      */
-    private String status = "0";
+    private String status;
 
     /**
      * 企业id

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

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

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerLogisticsController.java

@@ -2,7 +2,6 @@ package com.sckw.payment.controller;
 
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -31,12 +30,10 @@ public class KwpLedgerLogisticsController {
     private KwpLedgerLogisticsService kwpLedgerLogisticsService;
 
     private void fill(LogisticsSendReq logisticsSendReq) {
-        String ids = logisticsSendReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsSendReq.getIdList())) {
             throw new BusinessException("物流订单不能为空");
         }
-        logisticsSendReq.setOrders(longs);
+        logisticsSendReq.setOrders(logisticsSendReq.getIdList());
     }
 
     /**
@@ -206,14 +203,12 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportShipper")
     public HttpResult exportShipper(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        String ids = logisticsReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.shipperList(logisticsReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerLogisticsService.selectShipperList(longs);
+            list = kwpLedgerLogisticsService.selectShipperList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");
@@ -237,15 +232,13 @@ public class KwpLedgerLogisticsController {
      */
     @PostMapping("exportCarrier")
     public HttpResult exportCarrier(HttpServletResponse response, @RequestBody LogisticsReq logisticsReq) {
-        String ids = logisticsReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
         List<ILedger> list;
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(logisticsReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerLogisticsService.carrierList(logisticsReq);
             list = pageResult.getList();
 
         } else {
-            list = kwpLedgerLogisticsService.selectCarrierList(longs);
+            list = kwpLedgerLogisticsService.selectCarrierList(logisticsReq.getIdList());
         }
         if (CollectionUtils.isEmpty(list)) {
             return HttpResult.error("没有可导出的数据");

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpLedgerTradeController.java

@@ -2,7 +2,6 @@ package com.sckw.payment.controller;
 
 import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
-import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.dto.ILedger;
@@ -34,12 +33,10 @@ public class KwpLedgerTradeController {
     private KwpLedgerTradeService kwpLedgerTradeService;
 
     private void fill(TradeSendReq tradeSendReq) {
-        String ids = tradeSendReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeSendReq.getIdList())) {
             throw new BusinessException("销售订单不能为空");
         }
-        tradeSendReq.setOrders(longs);
+        tradeSendReq.setOrders(tradeSendReq.getIdList());
     }
 
     /**
@@ -137,7 +134,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @DeleteMapping("delete")
-    public HttpResult delete(@NotBlank(message = "id不能为空")String id) {
+    public HttpResult delete(@NotBlank(message = "id不能为空") String id) {
         return HttpResult.ok(kwpLedgerTradeService.remove(Long.valueOf(id)));
     }
 
@@ -148,7 +145,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @PostMapping("back")
-    public HttpResult back(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult back(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.backOrder(Long.valueOf(id)));
     }
 
@@ -170,7 +167,7 @@ public class KwpLedgerTradeController {
      * @return
      */
     @GetMapping("queryBack")
-    public HttpResult queryBack(@NotBlank(message = "id不能为空")@RequestParam("id") String id) {
+    public HttpResult queryBack(@NotBlank(message = "id不能为空") @RequestParam("id") String id) {
         return HttpResult.ok(kwpLedgerTradeService.queryBack(Long.valueOf(id)));
     }
 
@@ -209,14 +206,12 @@ public class KwpLedgerTradeController {
     @PostMapping("sellExport")
     public HttpResult sellExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        String ids = tradeReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
 
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.sellList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectSellList(longs);
+            list = kwpLedgerTradeService.selectSellList(tradeReq.getIdList());
         }
 
         if (CollectionUtils.isEmpty(list)) {
@@ -241,14 +236,11 @@ public class KwpLedgerTradeController {
     @PostMapping("purchaseExport")
     public HttpResult purchaseExport(HttpServletResponse response, @RequestBody @Valid TradeReq tradeReq) {
         List<ILedger> list;
-        String ids = tradeReq.getIds();
-        List<Long> longs = StringUtils.splitStrToList(ids, Long.class);
-
-        if (CollectionUtils.isEmpty(longs)) {
+        if (CollectionUtils.isEmpty(tradeReq.getIdList())) {
             PageRes<ILedger> pageResult = kwpLedgerTradeService.purchaseList(tradeReq);
             list = pageResult.getList();
         } else {
-            list = kwpLedgerTradeService.selectPurchaseList(longs);
+            list = kwpLedgerTradeService.selectPurchaseList(tradeReq.getIdList());
         }
 
         if (CollectionUtils.isEmpty(list)) {

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementLogisticsController.java

@@ -1,13 +1,11 @@
 package com.sckw.payment.controller;
 
-import com.sckw.core.exception.BusinessException;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.excel.utils.ExcelUtil;
 import com.sckw.payment.model.constant.LogisticsUnitType;
 import com.sckw.payment.model.dto.SettlementLogisticsDto;
 import com.sckw.payment.model.vo.req.SettlementReq;
-import com.sckw.payment.model.vo.req.SettlementWalletReq;
 import com.sckw.payment.model.vo.res.SettlementLogisticsVo;
 import com.sckw.payment.service.KwpSettlementLogisticsService;
 import jakarta.annotation.Resource;
@@ -38,6 +36,7 @@ public class KwpSettlementLogisticsController {
     //   ========= 运费收款 承运方 =========
     @PostMapping(name = "运费收款-物流订单列表", path = "pageListCollection")
     public HttpResult pageSelectCollection(@RequestBody @Valid SettlementReq settlementReq) {
+        List<Long> idList = settlementReq.getIdList();
         return HttpResult.ok(kwpSettlementLogisticsService.pageSelectCollection(settlementReq));
     }
 
@@ -54,16 +53,16 @@ public class KwpSettlementLogisticsController {
     @PostMapping(name = "运费收款-根据条件导出物流订单表数据", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementLogisticsDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
             //有page、pageSize，无ids
             PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectCollection(settlementReq);
             list = pageResult.getList();
-        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        } else if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             //无page、pageSize，无ids
             list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.CARRIER);
         } else {
             //有ids
-            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }
@@ -88,16 +87,16 @@ public class KwpSettlementLogisticsController {
     @PostMapping(name = "运费付款-根据条件导出物流订单表数据", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementLogisticsDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList()) && settlementReq.getPage() != 0 && settlementReq.getPageSize() != 0) {
             //有page、pageSize，无ids
             PageRes<SettlementLogisticsDto> pageResult = kwpSettlementLogisticsService.pageSelectPayment(settlementReq);
             list = pageResult.getList();
-        } else if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        } else if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             //无page、pageSize，无ids
             list = kwpSettlementLogisticsService.selectList(LogisticsUnitType.SHIPPER);
         } else {
             //有ids
-            list = kwpSettlementLogisticsService.selectList(settlementReq.getIds());
+            list = kwpSettlementLogisticsService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/controller/KwpSettlementTradeController.java

@@ -43,11 +43,11 @@ public class KwpSettlementTradeController {
     @PostMapping(name = "收款-根据ids导出销售结算单列表", path = "exportCollection")
     public HttpResult exportCollection(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementTradeDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListCollection(settlementReq);
             list = pageResult.getList();
         } else {
-            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+            list = kwpSettlementTradeService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }
@@ -72,11 +72,11 @@ public class KwpSettlementTradeController {
     @PostMapping(name = "付款-根据ids导出采购结算单列表", path = "exportPayment")
     public HttpResult exportPayment(HttpServletResponse response, @RequestBody @Valid SettlementReq settlementReq) {
         List<SettlementTradeDto> list;
-        if (CollectionUtils.isEmpty(settlementReq.getIds())) {
+        if (CollectionUtils.isEmpty(settlementReq.getIdList())) {
             PageRes<SettlementTradeDto> pageResult = kwpSettlementTradeService.pageListPayment(settlementReq);
             list = pageResult.getList();
         } else {
-            list = kwpSettlementTradeService.selectList(settlementReq.getIds());
+            list = kwpSettlementTradeService.selectList(settlementReq.getIdList());
         }
         return this.export(response, list);
     }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LedgerConfirmReq.java

@@ -1,5 +1,6 @@
 package com.sckw.payment.model.vo.req;
 
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
@@ -14,7 +15,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class LedgerConfirmReq {
+public class LedgerConfirmReq implements IdsList {
     @NotNull(message = "id不能为空")
     private String id;
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/LogisticsSendReq.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,7 +17,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class LogisticsSendReq {
+public class LogisticsSendReq implements IdsList {
 
     private String id;
     /**

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/SettlementReq.java

@@ -9,7 +9,6 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author Aick Spt
@@ -18,8 +17,8 @@ import java.util.List;
 @Getter
 @Setter
 public class SettlementReq extends BasePara {
-//    @Serial
-//    private static final long serialVersionUID = 5328731681168692784L;
+    @Serial
+    private static final long serialVersionUID = 6537008434516489423L;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -46,6 +45,5 @@ public class SettlementReq extends BasePara {
      */
     private Integer status;
 
-
-    private List<Long> ids;
+    private String ids;
 }

sckw-modules/sckw-payment/src/main/java/com/sckw/payment/model/vo/req/TradeSendReq.java

@@ -1,6 +1,7 @@
 package com.sckw.payment.model.vo.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.sckw.core.model.base.IdsList;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -21,7 +22,7 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class TradeSendReq {
+public class TradeSendReq implements IdsList {
 
     private String id;
     /**

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

@@ -89,6 +89,7 @@ public class KwTransportService {
      */
     public HttpResult getWaybillDriverDetail(Long id, String type) {
         HttpResult result = new HttpResult();
+
         /**
          * 当前司机端页面 页面【计划】=1；【出车】=2；【执行】=3；【完结】=4
          * 计划:对应运单状态的[待接单]
@@ -96,6 +97,7 @@ public class KwTransportService {
          * 执行:对应[已出车][到达装货地点]、[已装货]、[到达卸货地点]
          * 完结: 对应[已卸货]、[已核单]
          * */
+
         List<Long> status = new ArrayList<>();
         if (String.valueOf(NumberConstant.ONE).equals(type)) {
             status.add(CarWaybillEnum.PENDING_ORDER.getCode().longValue());
@@ -108,7 +110,7 @@ public class KwTransportService {
             status.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
         } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
             status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            status.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         } else {
             result.setMsg("类型错误");
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
@@ -143,8 +145,9 @@ public class KwTransportService {
         Criteria criteria = buildWaybillOrdersQuery(query);
         Query queryFormat = new Query(criteria);
         // in查询
-        if (CollectionUtils.isNotEmpty(query.getIds())) {
-            queryFormat.addCriteria(Criteria.where("wOrderId").in(query.getIds()));
+        List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
+        if (CollectionUtils.isNotEmpty(wOrderIds)) {
+            queryFormat.addCriteria(Criteria.where("wOrderId").in(wOrderIds));
         }
         // 总记录数
         long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);

sckw-modules/sckw-report/src/main/java/com/sckw/report/service/param/WaybillOrderQuery.java

@@ -17,7 +17,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class WaybillOrderQuery extends PageRequest implements Serializable {
-    private List<Long> ids;
+    private String ids;
     /**
      * 派车开始时间
      */

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/KwtWaybillOrderController.java

@@ -202,6 +202,28 @@ public class KwtWaybillOrderController {
         return waybillOrderService.unloading(params);
     }
 
+    /**
+     * @param params {}
+     * @desc 修改单证
+     * @author zk
+     * @date 2023/7/26
+     **/
+    @PostMapping("/editTicket")
+    public HttpResult editTicket(@RequestBody @Valid WaybillOrderTicketDto params){
+        return waybillOrderService.editTicket(params);
+    }
+
+    /**
+     * @param params {}
+     * @desc 单证审核
+     * @author zk
+     * @date 2023/7/26
+     **/
+    @PostMapping("/approvalTicket")
+    public HttpResult approvalTicket(@RequestBody @Valid WaybillOrderApprovalDto params){
+        return waybillOrderService.approvalTicket(params);
+    }
+
 
 
     //取消派车（未接单前）
@@ -210,9 +232,9 @@ public class KwtWaybillOrderController {
     //确认接单-趟次/循环
     //拒绝接单-趟次/循环
     //确认/拒绝出车
-    //到达装货地点 arriveLoadLocation
+    //到达装货地点
     //确认装货
-    //到达卸货地点 arriveUnloadLocation
+    //到达卸货地点
     //确认卸货
     //修改单证
     //单证审核

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/controller/WaybillManagementController.java

@@ -38,6 +38,7 @@ public class WaybillManagementController {
             return HttpResult.error(HttpStatus.GLOBAL_EXCEPTION_CODE, e.getMessage());
         }
     }
+
     @RequestMapping(name = "运单看板", value = "/waybillIndex", method = RequestMethod.GET)
     public HttpResult waybillIndex(WaybillOrderDTO waybillOrderDTO) {
         try {

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtLogisticsOrderMapper.java

@@ -100,4 +100,13 @@ public interface KwtLogisticsOrderMapper extends BaseMapper<KwtLogisticsOrder> {
      * @return
      */
     OrderFinishVO selectOrderFinishData(@Param("orderId") String orderId);
+
+    /**
+     * @param params {lOrderId 物流订单id}
+     * @desc 查询下级分包物流订单
+     * @author zk
+     * @date 2023/7/20
+     **/
+    List<KwtLogisticsOrder> findLogisticsOrder(Map params);
+
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/dao/KwtWaybillOrderTicketMapper.java

@@ -3,8 +3,17 @@ package com.sckw.transport.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sckw.transport.model.KwtWaybillOrderTicket;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface KwtWaybillOrderTicketMapper extends BaseMapper<KwtWaybillOrderTicket> {
 
+    /**
+     * @param wOrderId 车辆订单id
+     * @param type 磅单类型（1装货单/2卸货单）
+     * @desc 查询车辆运单榜单信息
+     * @author zk
+     * @date 2023/7/27
+     **/
+    KwtWaybillOrderTicket findWaybillOrderTicket(@Param("wOrderId") Long wOrderId, @Param("type") Integer type);
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtLogisticsOrder.java

@@ -26,6 +26,11 @@ public class KwtLogisticsOrder implements Serializable {
      */
     private Long entId;
 
+    /**
+     * 物流订单类型（1 贸易订单生成物流订单、2 自建物流订单）
+     */
+    private String type;
+
     /**
      * 交易订单id（kwo_trade_order）
      */

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/KwtWaybillOrderTicket.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.sckw.core.model.base.BaseModel;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author lfdc
@@ -44,4 +45,9 @@ public class KwtWaybillOrderTicket extends BaseModel {
      */
     private String urls;
 
+    /**
+     * 装卸货时间
+     */
+    private Date time;
+
 }

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

@@ -0,0 +1,35 @@
+package com.sckw.transport.model.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
+import lombok.Data;
+
+
+/**
+ * @author zk
+ * @desc 车辆运单审核
+ * @date 2023/7/27 0027
+ */
+@Data
+public class WaybillOrderApprovalDto {
+    /**
+     * 车辆运单id
+     */
+    @JsonProperty("wOrderId")
+    @NotNull(message = "车辆运单ID不能为空")
+    private Long wOrderId;
+
+    /**
+     * 磅单类型（0 审核-通过/1 已核-不通过）
+     */
+     @JsonProperty("status")
+     @NotNull(message = "磅单类型不能为空")
+     private Integer status;
+
+    /**
+     * 备注
+     */
+    @Size(max=100, message = "原因长度不能大于100个字符！")
+    private String remark;
+}

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

@@ -18,7 +18,7 @@ import java.util.List;
 @Data
 @Accessors(chain = true)
 public class WaybillOrderDTO extends PageRequest implements Serializable {
-    private List<Long> ids;
+    private String ids;
     /**
      * 派车开始时间
      */

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

@@ -7,6 +7,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Data;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @author zk
@@ -25,10 +26,10 @@ public class WaybillOrderTicketDto {
 
     /**
      * 磅单类型（1装货单/2卸货单）
-
+     */
     @JsonProperty("type")
     @NotNull(message = "磅单类型不能为空")
-    private Integer type;*/
+    private Integer type;
 
     /**
      * 装卸货数量
@@ -57,6 +58,13 @@ public class WaybillOrderTicketDto {
     @NotBlank(message = "凭证不能为空")
     private String urls;
 
+    /**
+     * 装卸货时间
+     */
+    @JsonProperty("time")
+    @NotBlank(message = "时间不能为空")
+    private Date time;
+
     /**
      * 备注
      */

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/model/vo/WaybillStatusVO.java

@@ -36,4 +36,9 @@ public class WaybillStatusVO {
      * 记录时间
      */
     private String createByName;
+
+    /**
+     * 记录ID
+     */
+    private Long id;
 }

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,29 +115,9 @@ 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;
-    }
 
     /**
-     * 承运订单分包托运
+     * 承运订单-分包托运
      *
      * @param bo
      * @return
@@ -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();
@@ -494,7 +470,7 @@ public class AcceptCarriageOrderService {
      * 分包托运-承运订单-主体
      * @param bo    页面填写分包数据
      * @param lOrderNo  当前分包物流订单编号
-     * @param order 父级物流订单数据
+     * @param order 当前物流订单数据
      * @param orderId   当前订单主键id
      * @param pids  组装的pids
      * @param orderStatus   当前单据状态
@@ -505,8 +481,9 @@ public class AcceptCarriageOrderService {
                                                  Long orderId, String pids, Integer orderStatus,KwtLogisticsOrder logisticsOrder) {
         order.setId(orderId);
         order.setEntId(LoginUserHolder.getEntId());
-        order.setTOrderId(order.getTOrderId());
-        order.setTOrderNo(order.getTOrderNo());
+        order.setType(logisticsOrder.getType());
+        order.setTOrderId(logisticsOrder.getTOrderId());
+        order.setTOrderNo(logisticsOrder.getTOrderNo());
         order.setLOrderNo(lOrderNo);
         //分包时,存放分包上级id
         order.setPid(Long.parseLong(bo.getLOrderId()));
@@ -529,7 +506,7 @@ public class AcceptCarriageOrderService {
         order.setStartTime(bo.getShipmentsDateTime());
         order.setEndTime(bo.getReceiveGoodsDateTime());
         order.setRemark(bo.getRemark());
-        order.setPayment(order.getPayment());
+        order.setPayment(Long.parseLong(bo.getPayment()));
         order.setTaxRate(new BigDecimal(bo.getTaxRate()));
         order.setCreateBy(LoginUserHolder.getUserId());
         order.setCreateTime(new Date());
@@ -545,8 +522,6 @@ public class AcceptCarriageOrderService {
         order.setIgnoreAmount(decimal);
         order.setDeficitPrice(decimal);
         order.setDeficitAmount(decimal);
-        order.setTOrderId(logisticsOrder.getTOrderId());
-        order.setTOrderNo(logisticsOrder.getTOrderNo());
         kwtLogisticsOrderMapper.insert(order);
     }
 
@@ -1099,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/DriverService.java

@@ -118,7 +118,7 @@ public class DriverService {
         top2.setValue(String.valueOf(NumberConstant.THREE));
         status.clear();
         status.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-        status.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+        status.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         TableTops top3 = waybillOrderMapper.statistics(id, status);
         top3.setName("完结");
         top3.setValue(String.valueOf(NumberConstant.FOUR));
@@ -164,10 +164,10 @@ public class DriverService {
             loopStatus.add(CarWaybillEnum.WAIT_UNLOADING.getCode().longValue());
         } else if (String.valueOf(NumberConstant.FOUR).equals(type)) {
             tripStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            tripStatus.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            tripStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
 
             loopStatus.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode().longValue());
-            loopStatus.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode().longValue());
+            loopStatus.add(CarWaybillEnum.APPROVAL_PASS.getCode().longValue());
         } else {
             result.setMsg("类型错误");
             result.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);

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

@@ -16,19 +16,17 @@ import com.sckw.mongo.model.SckwWaybillOrder;
 import com.sckw.stream.model.SckwBusSum;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
-import com.sckw.transport.model.dto.OperateWaybillDto;
-import com.sckw.transport.model.dto.OperateSendCarDto;
-import com.sckw.transport.model.dto.SendCarDto1;
-import com.sckw.transport.model.dto.WaybillOrderTicketDto;
+import com.sckw.transport.model.dto.*;
 import jakarta.annotation.Resource;
-import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cloud.stream.function.StreamBridge;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestBody;
+
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -64,7 +62,7 @@ public class KwtWaybillOrderService {
 
     /**
      * @param params
-     * @desc 派车-趟次
+     * @desc 派车
      * @author zk
      * @date 2023/7/19
      **/
@@ -487,16 +485,21 @@ public class KwtWaybillOrderService {
                         BigDecimal entrustAmount = logisticsOrder.getEntrustAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getEntrustAmount();
                         logisticsOrder.setEntrustAmount(entrustAmount.add(ranksAmount));
                     }
-                    //承运订单:待派车->运输中
+                    /**承运订单:待派车->运输中**/
                     logisticsOrder.setStatus(LogisticsOrderEnum.IN_TRANSIT.getCode());
                     logisticsOrderDao.updateById(order);
 
-                    //承运订单状态记录
+                    /**承运订单状态记录**/
                     KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
                     orderTrack.setLOrderId(order.getId());
                     orderTrack.setStatus(order.getStatus());
                     orderTrack.setRemark(LogisticsOrderEnum.getName(order.getStatus()));
                     logisticsOrderTrackDao.insert(orderTrack);
+
+                    /**Mongodb数据更新**/
+                    //2承运订单
+                    SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
+                    editSckwLogisticsOrder(lOrder, logisticsOrder);
                 }
             }
         }
@@ -622,6 +625,7 @@ public class KwtWaybillOrderService {
         lOrder.set_id(order.getId());
         lOrder.setLOrderId(order.getId());
         lOrder.setEntrustAmount(order.getEntrustAmount());
+        lOrder.setStatus(String.valueOf(order.getStatus()));
         lOrder.setUpdateTime(order.getUpdateTime());
         lOrder.setUpdateBy(order.getUpdateBy());
         //rabbitMq业务汇总数据发送/消费对象
@@ -1063,7 +1067,7 @@ public class KwtWaybillOrderService {
      * @date 2023/7/26
      **/
     @Transactional(rollbackFor = Exception.class)
-    public HttpResult unloading(@RequestBody @Valid WaybillOrderTicketDto params){
+    public HttpResult unloading(WaybillOrderTicketDto params){
         /**数据校验**/
         KwtWaybillOrder waybillOrder = waybillOrderDao.selectById(params.getWOrderId());
         if (waybillOrder == null) {
@@ -1095,13 +1099,17 @@ public class KwtWaybillOrderService {
         /**4更新承运订单entrustAmount**/
         //更新卸货量/卸货时间/亏吨/亏吨扣款
         KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(waybillOrder.getLOrderId());
-        //承运订单已卸货量=承运订单原卸货量+当前车辆运单卸货量
+        //承运订单卸货量=承运订单原卸货量+当前车辆运单卸货量
         BigDecimal unloadAmount = logisticsOrder.getUnloadAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getUnloadAmount();
         logisticsOrder.setUnloadAmount(unloadAmount.add(waybillOrder.getUnloadAmount()));
         logisticsOrder.setUnloadTime(waybillOrder.getUpdateTime());
+        //承运订单亏吨量=承运订单装货量-承运订单卸货量
         logisticsOrder.setDeficitAmount(logisticsOrder.getLoadAmount().subtract(logisticsOrder.getUnloadAmount()));
-        logisticsOrder.setDeficitPrice(null);
+        //承运订单亏吨扣款
+        deficitPrice(logisticsOrder);
         logisticsOrderDao.updateById(logisticsOrder);
+        //校验当前承运订单是否运输完成
+        setLogisticsByUnloading(logisticsOrder.getId());
 
         /**5Mongodb数据更新**/
         //1车辆运单
@@ -1116,6 +1124,8 @@ public class KwtWaybillOrderService {
         SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
         lOrder.setUnloadTime(logisticsOrder.getUnloadTime());
         lOrder.setUnloadAmount(logisticsOrder.getUnloadAmount());
+        lOrder.setDeficitAmount(logisticsOrder.getDeficitAmount());
+        lOrder.setDeficitPrice(logisticsOrder.getDeficitPrice());
         editSckwLogisticsOrder(lOrder, logisticsOrder);
 
         /**6发送消息**/
@@ -1123,4 +1133,148 @@ public class KwtWaybillOrderService {
         return HttpResult.ok("装货成功！");
     }
 
+    /**
+     * @param logisticsOrder 物流订单
+     * @desc 计算物流订单亏吨扣款
+     * @author zk
+     * @date 2023/7/27
+     **/
+    public void deficitPrice(KwtLogisticsOrder logisticsOrder) {
+        //承运订单亏吨扣款=（承运订单亏吨量 -（承运订单装货量 * 承运订单合理损耗））* 扣亏货值
+        BigDecimal loadAmount = logisticsOrder.getLoadAmount();
+        BigDecimal deficitAmount = logisticsOrder.getDeficitAmount();
+        BigDecimal loss = logisticsOrder.getLoss() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getLoss();
+        BigDecimal goodsPrice = logisticsOrder.getGoodsPrice() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getGoodsPrice();
+        BigDecimal deficitPrice = deficitAmount.subtract(loadAmount.multiply(loss).setScale(4, RoundingMode.HALF_UP))
+                .multiply(goodsPrice).setScale(4, RoundingMode.HALF_UP);
+        logisticsOrder.setDeficitPrice(deficitPrice);
+    }
+
+    /**
+     * @param lOrderId 承运订单ID
+     * @description 校验当前承运订单是否运输完成
+     * @author zk
+     * @date 2023/7/27
+     **/
+    public void setLogisticsByUnloading(Long lOrderId) {
+        /**
+         校验当前承运订单是否运输完成（虑该当前承运订单上下级物流订单）
+         存在下级分包，下级物流订单和当前物流订单全部运输完成则修改当前物流订单状态为已完成（HAVE_FINISHED）
+         当前物流订单属于分包：需要判断上级及同级分包全部运输完成修改上级物流订单状态为已完成（HAVE_FINISHED）-一直向上到一级物流订单
+         **/
+        //承运单信息
+        KwtLogisticsOrder logisticsOrder = logisticsOrderDao.selectById(lOrderId);
+        /**校验当前承运订单是否运输完成**/
+        if (logisticsOrder.getAmount().compareTo(logisticsOrder.getLoadAmount()) < 0) {
+            return;
+        }
+
+        /**存在下级分包**/
+        BigDecimal subcontractAmount = logisticsOrder.getSubcontractAmount() == null ? new BigDecimal(Global.AMOUNT) : logisticsOrder.getSubcontractAmount();
+        if (subcontractAmount.compareTo(new BigDecimal(Global.AMOUNT)) == 0) {
+            List<KwtLogisticsOrder> logisticsOrders = logisticsOrderDao.findLogisticsOrder(
+                    new HashMap(){{put("upperlOrderId", logisticsOrder.getId()); put("lOrderId", logisticsOrder.getId());}});
+            for (KwtLogisticsOrder logisticsOrder1:logisticsOrders) {
+                if (logisticsOrder1.getStatus() == LogisticsOrderEnum.TO_BE_PLANNED.getCode()
+                        || logisticsOrder1.getStatus() == LogisticsOrderEnum.PENDING_ORDER.getCode()
+                        || logisticsOrder1.getStatus() == LogisticsOrderEnum.WAIT_DELIVERY.getCode()
+                        || logisticsOrder1.getStatus() == LogisticsOrderEnum.IN_TRANSIT.getCode()) {
+                    //下级分包承运订单运输未完成
+                    return;
+                }
+            }
+            /**下级分包承运订单运输完成**/
+            logisticsOrder.setStatus(LogisticsOrderEnum.HAVE_FINISHED.getCode());
+            logisticsOrderDao.updateById(logisticsOrder);
+
+            /**承运订单状态记录**/
+            KwtLogisticsOrderTrack orderTrack = new KwtLogisticsOrderTrack();
+            orderTrack.setLOrderId(logisticsOrder.getId());
+            orderTrack.setStatus(logisticsOrder.getStatus());
+            orderTrack.setRemark(LogisticsOrderEnum.getName(logisticsOrder.getStatus()));
+            logisticsOrderTrackDao.insert(orderTrack);
+
+            /**Mongodb数据更新**/
+            //2承运订单
+            SckwLogisticsOrder lOrder = new SckwLogisticsOrder();
+            editSckwLogisticsOrder(lOrder, logisticsOrder);
+        }
+
+        /**当前物流订单属于分包(存在上级物流订单)**/
+        //当前承运订单所属分包层级
+        //int level = checkLogisticsLevel(logisticsOrder);
+        String pids = logisticsOrder.getPids();
+        if (StringUtils.isNotBlank(pids)) {
+            String [] idArray = pids.split(",");
+            for (String id : idArray) {
+                KwtLogisticsOrder order = logisticsOrderDao.selectById(id);
+
+            }
+        }
+    }
+
+    /**
+     * @param params {}
+     * @desc 修改单证
+     * @author zk
+     * @date 2023/7/26
+     **/
+    public HttpResult editTicket(WaybillOrderTicketDto params) {
+        /**校验**/
+        KwtWaybillOrderTicket ticket = waybillOrderTicketDao.findWaybillOrderTicket(params.getWOrderId(), params.getType());
+        if (ticket == null) {
+            return HttpResult.error("车辆运单榜单信息不存在！");
+        }
+
+        /**更新榜单信息**/
+        BeanUtils.copyProperties(params, ticket);
+        waybillOrderTicketDao.updateById(ticket);
+
+        /**更新承运订单装卸货量**/
+
+        return HttpResult.ok("修改单证成功！");
+    }
+
+    /**
+     * @param params {}
+     * @desc 单证审核
+     * @author zk
+     * @date 2023/7/26
+     **/
+    public HttpResult approvalTicket(WaybillOrderApprovalDto params) {
+        /**数据校验**/
+        KwtWaybillOrder waybillOrder = waybillOrderDao.selectById(params.getWOrderId());
+        if (waybillOrder == null) {
+            return HttpResult.error("车辆运单不存在！");
+        }
+        //已卸货/审批不通过车辆运单才能审核
+        if (waybillOrder.getStatus() != CarWaybillEnum.COMPLETION_UNLOADING.getCode()
+                && waybillOrder.getStatus() != CarWaybillEnum.APPROVAL_NO_PASS.getCode()) {
+            return HttpResult.error("车辆运单当前状态已不能审核！");
+        }
+        //已卸货/审批不通过车辆运单只能审批通过或审批不通过
+        if (params.getStatus() != Global.NO && params.getStatus() != Global.YES) {
+            return HttpResult.error("车辆运单当前状态只能审批通过或审批不通过！");
+        }
+
+        /**业务处理**/
+        /**1更新车辆运单**/
+        int status = params.getStatus() == Global.NO ? CarWaybillEnum.APPROVAL_PASS.getCode() : CarWaybillEnum.APPROVAL_NO_PASS.getCode();
+        waybillOrder.setStatus(status);
+        waybillOrderDao.updateById(waybillOrder);
+
+        /**2新增运单状态记录**/
+        setWaybillOrderTrack(waybillOrder.getId(), waybillOrder.getStatus(), params.getRemark());
+
+        /**3Mongodb数据更新**/
+        //1车辆运单
+        SckwWaybillOrder wOrder = new SckwWaybillOrder();
+        wOrder.set_id(waybillOrder.getId());
+        editSckwWaybillOrder(wOrder, waybillOrder, 2);
+
+        /**4发送消息**/
+
+        return HttpResult.ok("车辆运单审核完成！");
+    }
+
 }

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/java/com/sckw/transport/service/WaybillManagementService.java

@@ -25,8 +25,6 @@ import com.sckw.transport.model.KwtWaybillOrderTrack;
 import com.sckw.transport.model.dto.WayBillDetailDTO;
 import com.sckw.transport.model.dto.WaybillOrderDTO;
 import com.sckw.transport.model.vo.*;
-import jakarta.validation.constraints.NotBlank;
-import lombok.Value;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.apache.ibatis.annotations.Param;
@@ -37,11 +35,9 @@ import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.regex.Pattern;
 
 /**
  * @author jc
@@ -180,7 +176,7 @@ public class WaybillManagementService {
         statuses.add(CarWaybillEnum.COMPLETION_LOADING.getCode());
         statuses.add(CarWaybillEnum.WAIT_UNLOADING.getCode());
         statuses.add(CarWaybillEnum.COMPLETION_UNLOADING.getCode());
-        statuses.add(CarWaybillEnum.APPROVAL_COMPLETED.getCode());
+        statuses.add(CarWaybillEnum.APPROVAL_PASS.getCode());
         // 初始化各状态
         List<WaybillStatusVO> statusVOS = new ArrayList<>();
         statuses.forEach(e -> {
@@ -203,6 +199,11 @@ public class WaybillManagementService {
         criteria.and("entId").is(LoginUserHolder.getEntId());
         criteria.and("delFlag").is(NumberConstant.ZERO);
 
+        List<Long> wOrderIds = StringUtils.splitStrToList(query.getIds(), ",", Long.class);
+        if (CollectionUtils.isNotEmpty(wOrderIds)) {
+            Criteria.where("wOrderId").in(wOrderIds);
+        }
+
         if (StringUtils.isNotBlank(query.getStatus())) {
             criteria.and("status").is(query.getStatus());
         } else {
@@ -230,14 +231,14 @@ public class WaybillManagementService {
         // 多条件模糊查询
         List<Criteria> orCriteria = new ArrayList<>();
         if (StringUtils.isNotBlank(query.getKeywords())) {
-            /*Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
+            Pattern pattern = Pattern.compile("^.*" + query.getKeywords() + ".*$", Pattern.CASE_INSENSITIVE);
             orCriteria.add(Criteria.where("wOrderNo").regex(pattern));
             orCriteria.add(Criteria.where("truckNo").regex(pattern));
             orCriteria.add(Criteria.where("driverName").regex(pattern));
             orCriteria.add(Criteria.where("firmName").regex(pattern));
             orCriteria.add(Criteria.where("loadAddress").regex(pattern));
             orCriteria.add(Criteria.where("unloadAddress").regex(pattern));
-            criteria.orOperator(orCriteria);*/
+            criteria.orOperator(orCriteria);
         }
         Query queryFormat = new Query(criteria);
         long total = mongoTemplate.count(queryFormat, SckwWaybillOrder.class);
@@ -245,7 +246,6 @@ public class WaybillManagementService {
                 Sort.by(Sort.Order.desc("createTime"))));
         // 执行查询
         List<SckwWaybillOrder> list = mongoTemplate.find(queryFormat, SckwWaybillOrder.class);
-        // 查询关联单据信息
         List<WaybillBoardListVO> orders = new ArrayList<>();
         for (SckwWaybillOrder sckwWaybillOrder:list) {
             WaybillBoardListVO waybillBoardListVO = new WaybillBoardListVO();
@@ -266,27 +266,34 @@ public class WaybillManagementService {
             waybillBoardListVO.setUnloadGrossAmount(sckwWaybillOrder.getUnloadGrossAmount() != null ? String.valueOf(sckwWaybillOrder.getUnloadGrossAmount()) : null);
             waybillBoardListVO.setLoadUrls(sckwWaybillOrder.getLoadUrls() != null ? String.valueOf(sckwWaybillOrder.getLoadUrls()) : null);
             waybillBoardListVO.setUnloadUrls(sckwWaybillOrder.getUnloadUrls() != null ? String.valueOf(sckwWaybillOrder.getUnloadUrls()) : null);
-            // 运单进度
             List<WaybillStatusVO> statusVOS2 = new ArrayList<>();
-            BeanUtils.copyProperties(statusVOS, statusVOS2);
-            log.error("XXXX-11 {}", statusVOS);
-            log.error("XXXX-12 {}", statusVOS2);
+            statusVOS.forEach(e -> {
+                WaybillStatusVO temp = new WaybillStatusVO();
+                BeanUtils.copyProperties(e, temp);
+                statusVOS2.add(temp);
+            });
+            waybillBoardListVO.setTracks(statusVOS2);
+            // 运单进度
             List<KwtWaybillOrderTrack> kwtWaybillOrderTracks = kwtWaybillOrderTrackMapper.selectList(new LambdaQueryWrapper<KwtWaybillOrderTrack>()
                     .eq(KwtWaybillOrderTrack::getWOrderId, sckwWaybillOrder.getWOrderId()));
             if (CollectionUtils.isNotEmpty(kwtWaybillOrderTracks)) {
-                for (WaybillStatusVO waybillStatusVO: statusVOS2) {
-                    for (KwtWaybillOrderTrack waybillOrderTrack: kwtWaybillOrderTracks) {
-                        log.error("XXXX-1 {}", waybillStatusVO.getCode());
-                        log.error("XXXX-2 {}", waybillOrderTrack.getStatus());
-                        if(waybillStatusVO.getCode().equals(waybillOrderTrack.getStatus())) {
-                            waybillStatusVO.setStatus(true);
-                            waybillStatusVO.setCreateTime(DateUtil.getDateTime(waybillOrderTrack.getCreateTime()));
-                            waybillStatusVO.setCreateByName(String.valueOf(waybillOrderTrack.getCreateBy()));
+                List<Long> userIds = new ArrayList<>();
+                kwtWaybillOrderTracks.forEach(e -> userIds.add(e.getCreateBy()));
+//                List<UserCacheResDto> users = remoteSystemService.queryUserCacheByIds(userIds);
+                List<UserCacheResDto> users = new ArrayList<>();
+                Map<Long, String> usersMap = new HashMap<>();
+                users.forEach(e -> usersMap.put(e.getId(), e.getName()));
+                waybillBoardListVO.getTracks().forEach(e -> {
+                    kwtWaybillOrderTracks.forEach(e2 -> {
+                        if(e.getCode().equals(e2.getStatus())) {
+                            e.setStatus(true);
+                            e.setId(e2.getId());
+                            e.setCreateTime(DateUtil.getDateTime(e2.getCreateTime()));
+                            e.setCreateByName(usersMap.get(e2.getCreateBy()));
                         }
-                    }
-                }
+                    });
+                });
             }
-            waybillBoardListVO.setTracks(statusVOS);
             orders.add(waybillBoardListVO);
         }
 

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

@@ -4,6 +4,7 @@
     <resultMap id="BaseResultMap" type="com.sckw.transport.model.KwtLogisticsOrder">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="ent_id" jdbcType="BIGINT" property="entId"/>
+        <result column="type" jdbcType="BIGINT" property="type"/>
         <result column="t_order_id" jdbcType="BIGINT" property="tOrderId"/>
         <result column="t_order_no" jdbcType="VARCHAR" property="tOrderNo"/>
         <result column="l_order_no" jdbcType="VARCHAR" property="lOrderNo"/>
@@ -40,7 +41,7 @@
     </resultMap>
     <sql id="Base_Column_List">
         id
-        , ent_id, t_order_id, t_order_no, l_order_no, pid,pids, settlement_cycle, price, price_type,billing_mode,
+        , ent_id, t_order_id,type, t_order_no, l_order_no, pid,pids, settlement_cycle, price, price_type,billing_mode,
     amount, unit, loss, loss_unit, goods_price, goods_price_unit, start_time, end_time,
     subcontract_amount, entrust_amount, unload_amount, load_amount, ignore_amount, deficit_amount,
     deficit_price, payment, tax_rate, remark, `status`, create_by, create_time, update_by,
@@ -314,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
@@ -360,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
@@ -373,4 +374,29 @@
             </if>
         </where>
     </select>
+
+    <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,
+        amount, unit, loss, loss_unit lossUnit, goods_price goodsPrice, goods_price_unit goodsPriceUnit,
+        start_time startTime, end_time endTime, subcontract_amount subcontractAmount, entrust_amount entrustAmount,
+        unload_amount unloadAmount, load_amount loadAmount, ignore_amount ignoreAmount, deficit_amount deficitAmount,
+        deficit_price deficitPrice, payment, tax_rate taxRate, remark, `status`, create_by createBy,
+        create_time createTime, update_by updateBy, update_time updateTime
+        from kwt_logistics_order
+        where del_flag = 0
+        <if test="id != null and id != ''">
+            and id = #{id, jdbcType=BIGINT}
+        </if>
+        <if test="upperlOrderId != null and upperlOrderId != ''">
+            and FIND_IN_SET(#{upperlOrderId, jdbcType=BIGINT}, pids)
+            and id != #{lOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="belowlOrderId != null and belowlOrderId != ''">
+            and FIND_IN_SET(id, #{belowlOrderId, jdbcType=VARCHAR})
+            and id != #{lOrderId, jdbcType=BIGINT}
+        </if>
+    </select>
 </mapper>

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

@@ -9,6 +9,7 @@
         <result column="gross_amount" jdbcType="DECIMAL" property="grossAmount" />
         <result column="tare_amount" jdbcType="DECIMAL" property="tareAmount" />
         <result column="urls" jdbcType="VARCHAR" property="urls" />
+        <result column="time" jdbcType="TIMESTAMP" property="time" />
         <result column="remark" jdbcType="VARCHAR" property="remark" />
         <result column="status" jdbcType="INTEGER" property="status" />
         <result column="create_by" jdbcType="BIGINT" property="createBy" />
@@ -18,8 +19,22 @@
         <result column="del_flag" jdbcType="INTEGER" property="delFlag" />
     </resultMap>
     <sql id="Base_Column_List">
-        id, w_order_id, `type`, amount, gross_amount, tare_amount, urls, remark, `status`,
+        id, w_order_id, `type`, amount, gross_amount, tare_amount, urls, time, remark, `status`,
         create_by, create_time, update_by, update_time, del_flag
     </sql>
 
+    <select id="findWaybillOrderTicket" resultType="com.sckw.transport.model.KwtWaybillOrderTicket" >
+        select
+        id, w_order_id wOrderId, `type`, amount, gross_amount grossAmount, tare_amount tareAmount,
+        urls, time, remark, `status`, create_by createBy, create_time createTime, update_by updateBy,
+        update_time updateTime
+        from kwt_waybill_order_ticket
+        where del_flag = 0
+        <if test="wOrderId != null and wOrderId != ''">
+            and w_order_id != #{wOrderId, jdbcType=BIGINT}
+        </if>
+        <if test="type != null and type != ''">
+            and type != #{type, jdbcType=INTEGER}
+        </if>
+    </select>
 </mapper>