物流运单放行需要区分山上山下

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/controller/enterpriseApp/AppWayBillController.java

@@ -507,5 +507,18 @@ public class AppWayBillController {
     }
 
 
+    /**
+     * 销售月度报表
+     *
+     * @param param
+     * @return
+     */
+    @Operation(summary = "销售月度报表", description = "销售月度报表")
+    @PostMapping("/queryWaybillOrderMonthlySalesReport")
+    public BaseResult<List<WaybillOrderMonthlySaleReportResp>> queryWaybillOrderMonthlySalesReport(@RequestBody @Valid WaybillOrderMonthlySaleReportQueryParam param){
+        return BaseResult.success( waybillOrderService.queryWaybillOrderMonthlySalesReport(param));
+    }
+
+
 
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderMonthlySaleReportQueryParam.java

@@ -0,0 +1,61 @@
+package com.sckw.transport.model.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author :donglang
+ * @version :1.0
+ * @description :
+ * @create :2025-11-13 08:59:00
+ */
+@Data
+public class WaybillOrderMonthlySaleReportQueryParam implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 7250765223450002065L;
+
+    /**
+     * 企业id
+     */
+    @Schema(description = "企业id")
+    @NotNull(message = "企业id不能为空")
+    private Long entId;
+
+    /**
+     * 客户id
+     */
+    @Schema(description = "客户id")
+    private List<Long> customerEntIds;
+
+    /**
+     * 商品id
+     */
+    @Schema(description = "商品id")
+    private List<Long> dictIds;
+
+    /**
+     * 开始时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "开始时间")
+    @NotNull(message = "开始时间不能为空")
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @Schema(description = "结束时间")
+    @NotNull(message = "结束时间不能为空")
+    private Date endTime;
+
+
+}

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/WaybillOrderMonthlySaleReportResp.java

@@ -0,0 +1,126 @@
+package com.sckw.transport.model.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author :chenXiaoFei
+ * @version :1.0
+ * @description : 分页查询运单每日报表
+ * @create :2025-11-11 20:16:00
+ */
+@Data
+public class WaybillOrderMonthlySaleReportResp implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 7250765223450002066L;
+
+    /**
+     * 序号（导出用，汇总行设为null）
+     */
+    @Schema(description = "序号")
+    private String serialNumber;
+
+    /**
+     * 运单id
+     */
+    @Schema(description = "运单id")
+    private Long id;
+
+    /**
+     * 贸易订单编号
+     */
+    @Schema(description = "贸易订单编号")
+    private String tradeOrderNo;
+    /**
+     * 运单编号
+     */
+    @Schema(description = "运单编号")
+    private String waybillNo;
+
+    /**
+     * 采购单位id
+     */
+    @Schema(description = "采购单位id")
+    private Long procurementEntId;
+
+    /**
+     * 采购单位名称
+     */
+    @Schema(description = "采购单位名称")
+    private String procurementEntName;
+
+    /**
+     * 商品id
+     */
+    @Schema(description = "商品id")
+    private Long dictId;
+
+    /**
+     * 商品名称
+     */
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    private String truckNo;
+
+    /**
+     * 皮重
+     */
+    @Schema(description = "皮重")
+    private BigDecimal tareAmount;
+
+    /**
+     * 毛重
+     */
+    @Schema(description = "毛重")
+    private BigDecimal grossAmount;
+
+    /**
+     * 净重
+     */
+    @Schema(description = "净重")
+    private BigDecimal amount;
+
+    /**
+     * 离场时间
+     */
+    @Schema(description = "离场时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date leaveTime;
+
+    /**
+     * 卸货联系人
+     */
+    @Schema(description = "卸货联系人")
+    private String unloadingPerson;
+
+    /**
+     * 单价
+     */
+    @Schema(description = "单价")
+    private BigDecimal unitPrice;
+
+    /**
+     * 金额：单价*净重
+     */
+    @Schema(description = "金额")
+    private BigDecimal totalPrice;
+
+    /**
+     * 剩余预付款
+     */
+    @Schema(description = "剩余预付款")
+    private BigDecimal advancePayment;
+
+}

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

@@ -4310,7 +4310,7 @@ public class KwtWaybillOrderV1Service {
             waybillOrderResp.setIsPassReason(isLossRateExceeded(logOrder, lossRate));
 
             // 原矿运输山上山下的自己放行自己门卫数据
-            if (Objects.equals(waybillOrderResp.getConsignUnitId(), mockEntIds.get(0))) {
+            if (Objects.equals(LoginUserHolder.getEntId(), mockEntIds.get(0))) {
                 // 如果状态为待放行，只能山上的运单展示放行按钮
                 if (!Objects.equals(waybillOrderResp.getStatus(), CarWaybillV1Enum.WAIT_RELEASE.getCode())) {
                     waybillOrderResp.setIsDisplayPassButton(Boolean.FALSE);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/WaybillOrderService.java

@@ -2652,6 +2652,32 @@ public class WaybillOrderService {
     }
 
 
+    /**
+     * 查询运单每日报表
+     * @param param
+     * @return
+     */
+    public List<WaybillOrderMonthlySaleReportResp> queryWaybillOrderMonthlySalesReport(WaybillOrderMonthlySaleReportQueryParam param) {
+        log.info("[报表]开始查询销售运单每日报表：{}", JSON.toJSONString(param));
+        List<WaybillOrderMonthlySaleReportResp>  list = new ArrayList<>();
+        return list;
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 //    /**
 //     * 物流订单接单
 //     * @param param