统计报表：订单明细

@@ -1323,3 +1323,55 @@ CREATE TABLE `product_sample_confirmation_slip_detail` (
    `update_time`            datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
    `update_time`            datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
    PRIMARY KEY (`id`)
    PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='产品试样确认单明细'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='产品试样确认单明细'
+
+CREATE TABLE `order_detail_report` (
+    `id`                           varchar(32) NOT NULL COMMENT 'ID',
+    `purchase_order_line_id`       varchar(32)    DEFAULT NULL COMMENT '订货单物料行ID',
+    `order_no`                     varchar(100)   DEFAULT NULL COMMENT '订单编号',
+    `order_date`                   date           default null COMMENT '订货日期',
+    `workshop_id`                  varchar(50)    DEFAULT NULL COMMENT '生产厂',
+    `dept_name`                    varchar(50) comment '科办',
+    `region_name`                  varchar(50) comment '区域',
+    `ordering_unit_name`           varchar(200) comment '订货单位名称',
+    `industry`                     varchar(50) comment '行业',
+    `brand`                        varchar(50) comment '牌号',
+    `thickness`                    decimal(10, 4) default null comment '厚度',
+    `thickness_tol_pos`            decimal(10, 4) default null comment '厚度公差正',
+    `thickness_tol_neg`            decimal(10, 4) default null comment '厚度公差负',
+    `width`                        decimal(10, 4) default null comment '宽度',
+    `width_tol_pos`                decimal(10, 4) default null comment '宽度公差正',
+    `width_tol_neg`                decimal(10, 4) default null comment '宽度公差负',
+    `length`                       decimal(10, 4) default null comment '长度',
+    `length_tol_pos`               decimal(10, 4) default null comment '长度公差正',
+    `length_tol_neg`               decimal(10, 4) default null comment '长度公差负',
+    `status`                       varchar(50) comment '状态',
+    `quantity`                     decimal(15, 4) COMMENT '数量',
+    `suggested_price`              varchar(50) comment '指导价',
+    `delivery_date`                date           default null comment '发货日期',
+    `assessment_exceeds_agreement` varchar(50) comment '超协价',
+    `sales_price`                  varchar(50) comment '销售价',
+    `price_list_no`                varchar(50) comment '价格表编号',
+    `packaging_fee`                varchar(50) comment '包装费',
+    `invoicing_status`             varchar(50) comment '开票情况',
+    `piece_weight_header`          text comment '件重条头',
+    `surface`                      text comment '表面',
+    `tolerance`                    text comment '公差',
+    `performance`                  text comment '性能',
+    `packaging`                    text comment '包装',
+    `remarks`                      text comment '备注',
+    `shipping_cost`                varchar(50) comment '运费',
+    `return_shipping_cost`         varchar(50) comment '回程运费',
+    `customer_type`                varchar(50) comment '客户类型',
+    `quality`                      varchar(100) comment '标准行业',
+    `contract_type`                varchar(100) comment '加工经销',
+    `stock_up_company_name`        varchar(200) comment '备货单位',
+    `order_type`                   varchar(50) comment '订单类型',
+    `show_order`                   int DEFAULT '0' COMMENT '排序，订货单：0，撤销单：1，规格变更单：2',
+    `create_by_id`                 varchar(32) NOT NULL COMMENT '创建人ID',
+    `create_by`                    varchar(20) NOT NULL COMMENT '创建人',
+    `update_by_id`                 varchar(32) NOT NULL COMMENT '更新人ID',
+    `update_by`                    varchar(20) NOT NULL COMMENT '更新人',
+    `create_time`                  datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `update_time`                  datetime       DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='订单明细报表'

+package com.lframework.xingyun.sc.bo.statistics.orderDetail;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订单明细 GetBo
+ * </p>
+ *
+ */
+@Data
+public class GetOrderDetailReportBo extends BaseBo<OrderDetailReport> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 科办
+     */
+    @ApiModelProperty("科办")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 指导价
+     */
+    @ApiModelProperty("指导价")
+    private String suggestedPrice;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty("超协价")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 销售价
+     */
+    @ApiModelProperty("销售价")
+    private String salesPrice;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ApiModelProperty("回程运费")
+    private String returnShippingCost;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 标准行业
+     */
+    @ApiModelProperty("标准行业")
+    private String quality;
+
+    /**
+     * 加工经销
+     */
+    @ApiModelProperty("加工经销")
+    private String contractType;
+
+    /**
+     * 备货单位
+     */
+    @ApiModelProperty("备货单位")
+    private String stockUpCompanyName;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String orderType;
+
+    /**
+     * 排序，订货单：0，撤销单：1，规格变更单：2
+     */
+    @ApiModelProperty("排序，订货单：0，撤销单：1，规格变更单：2")
+    private Integer showOrder;
+
+    public GetOrderDetailReportBo() {
+
+    }
+
+    public GetOrderDetailReportBo(OrderDetailReport dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<OrderDetailReport> convert(OrderDetailReport dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(OrderDetailReport dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.bo.statistics.orderDetail;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.bo.BaseBo;
+import java.time.LocalDate;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import io.swagger.annotations.ApiModelProperty;
+
+import lombok.Data;
+
+/**
+ * <p>
+ * 订单明细 QueryBo
+ * </p>
+ *
+ */
+@Data
+public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
+
+    /**
+     * ID
+     */
+    @ApiModelProperty("ID")
+    private String id;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate orderDate;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 科办
+     */
+    @ApiModelProperty("科办")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    private String industry;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 指导价
+     */
+    @ApiModelProperty("指导价")
+    private String suggestedPrice;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @JsonFormat(pattern = StringPool.DATE_PATTERN)
+    private LocalDate deliveryDate;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty("超协价")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 销售价
+     */
+    @ApiModelProperty("销售价")
+    private String salesPrice;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    private String remarks;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ApiModelProperty("回程运费")
+    private String returnShippingCost;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 标准行业
+     */
+    @ApiModelProperty("标准行业")
+    private String quality;
+
+    /**
+     * 加工经销
+     */
+    @ApiModelProperty("加工经销")
+    private String contractType;
+
+    /**
+     * 备货单位
+     */
+    @ApiModelProperty("备货单位")
+    private String stockUpCompanyName;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    private String orderType;
+
+    /**
+     * 排序，订货单：0，撤销单：1，规格变更单：2
+     */
+    @ApiModelProperty("排序，订货单：0，撤销单：1，规格变更单：2")
+    private Integer showOrder;
+
+    public QueryOrderDetailReportBo() {
+
+    }
+
+    public QueryOrderDetailReportBo(OrderDetailReport dto) {
+
+        super(dto);
+    }
+
+    @Override
+    public BaseBo<OrderDetailReport> convert(OrderDetailReport dto) {
+        return super.convert(dto);
+    }
+
+    @Override
+    protected void afterInit(OrderDetailReport dto) {
+
+    }
+}

+package com.lframework.xingyun.sc.controller.statistics;
+
+import com.lframework.starter.mq.core.utils.ExportTaskUtil;
+import com.lframework.starter.web.core.annotations.security.HasPermission;
+import com.lframework.starter.web.core.controller.DefaultBaseController;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.components.resp.InvokeResult;
+import javax.validation.constraints.NotBlank;
+import com.lframework.xingyun.sc.bo.statistics.orderDetail.GetOrderDetailReportBo;
+import com.lframework.xingyun.sc.bo.statistics.orderDetail.QueryOrderDetailReportBo;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.enums.ExportType;
+import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import io.swagger.annotations.ApiImplicitParam;
+import com.lframework.starter.web.core.components.resp.InvokeResultBuilder;
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
+import io.swagger.annotations.ApiOperation;
+import com.lframework.starter.common.utils.CollectionUtil;
+import io.swagger.annotations.Api;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * 订单明细 Controller
+ *
+ */
+@Api(tags = "订单明细")
+@Validated
+@RestController
+@RequestMapping("/orderDetailReport")
+public class OrderDetailReportController extends DefaultBaseController {
+
+    @Autowired
+    private OrderDetailReportService orderDetailReportService;
+
+    /**
+     * 查询列表
+     */
+    @ApiOperation("查询列表")
+    @HasPermission({"statistical-report:order-detail:query"})
+    @GetMapping("/query")
+    public InvokeResult<PageResult<QueryOrderDetailReportBo>> query(@Valid QueryOrderDetailReportVo vo) {
+
+        PageResult<OrderDetailReport> pageResult = orderDetailReportService.query(getPageIndex(vo), getPageSize(vo), vo);
+
+        List<OrderDetailReport> datas = pageResult.getDatas();
+        List<QueryOrderDetailReportBo> results = null;
+
+        if (!CollectionUtil.isEmpty(datas)) {
+            results = datas.stream().map(QueryOrderDetailReportBo::new).collect(Collectors.toList());
+        }
+
+        return InvokeResultBuilder.success(PageResultUtil.rebuild(pageResult, results));
+    }
+
+    /**
+     * 根据ID查询
+     */
+    @ApiOperation("根据ID查询")
+    @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
+    @HasPermission({"statistical-report:order-detail:query"})
+    @GetMapping
+    public InvokeResult<GetOrderDetailReportBo> get(@NotBlank(message = "id不能为空！") String id) {
+
+        OrderDetailReport data = orderDetailReportService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("订单明细不存在！");
+        }
+
+        GetOrderDetailReportBo result = new GetOrderDetailReportBo(data);
+
+        return InvokeResultBuilder.success(result);
+    }
+
+    /**
+     * 新增
+     */
+    @ApiOperation("新增")
+    @PostMapping
+    public InvokeResult<Void> create(@Valid CreateOrderDetailReportVo vo) {
+
+        orderDetailReportService.create(vo);
+
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 订单明细导出
+     */
+    @ApiOperation("订单明细导出")
+    @HasPermission({"statistical-report:order-detail:export"})
+    @GetMapping("/export")
+    public InvokeResult<Void> export(@Valid QueryOrderDetailReportVo vo) {
+        vo.setExportType(ExportType.ORDER_DETAIL_REPORT.getCode());
+        ExportTaskUtil.exportTask("订单明细报表", OrderDetailReportExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 处理历史数据
+     */
+    @ApiOperation("处理历史数据")
+    @GetMapping("/processHistoricalData")
+    public InvokeResult<Void> processHistoricalData() {
+
+        orderDetailReportService.processHistoricalData();
+
+        return InvokeResultBuilder.success();
+    }
+}

+package com.lframework.xingyun.sc.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.math.BigDecimal;
+import com.lframework.starter.web.core.dto.BaseDto;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.lframework.starter.web.core.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+/**
+ * <p>
+ * 订单明细
+ * </p>
+ *
+ */
+@Data
+@TableName("order_detail_report")
+public class OrderDetailReport extends BaseEntity implements BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+    public static final String CACHE_NAME = "OrderDetailReport";
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 订货单物料行ID
+     */
+    private String purchaseOrderLineId;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+    /**
+     * 订货日期
+     */
+    private LocalDate orderDate;
+
+    /**
+     * 生产厂
+     */
+    private String workshopId;
+
+    /**
+     * 生产厂
+     */
+    @TableField(exist = false)
+    private String workshopName;
+
+    /**
+     * 科办
+     */
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    private String orderingUnitName;
+
+    /**
+     * 行业
+     */
+    private String industry;
+
+    /**
+     * 牌号
+     */
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 数量
+     */
+    private BigDecimal quantity;
+
+    /**
+     * 指导价
+     */
+    private String suggestedPrice;
+
+    /**
+     * 发货日期
+     */
+    private LocalDate deliveryDate;
+
+    /**
+     * 超协价
+     */
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 销售价
+     */
+    private String salesPrice;
+
+    /**
+     * 价格表编号
+     */
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    private String surface;
+
+    /**
+     * 公差
+     */
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    private String performance;
+
+    /**
+     * 包装
+     */
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    private String remarks;
+
+    /**
+     * 运费
+     */
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    private String returnShippingCost;
+
+    /**
+     * 客户类型
+     */
+    private String customerType;
+
+    /**
+     * 标准行业
+     */
+    private String quality;
+
+    /**
+     * 加工经销
+     */
+    private String contractType;
+
+    /**
+     * 备货单位
+     */
+    private String stockUpCompanyName;
+
+    /**
+     * 订单类型
+     */
+    private String orderType;
+
+    /**
+     * 排序，订货单：0，撤销单：1，规格变更单：2
+     */
+    private Integer showOrder;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createBy;
+
+    /**
+     * 更新人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
+     * 更新人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateBy;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updateTime;
+
+}

@@ -11,6 +11,7 @@ public enum ExportType implements BaseEnum<String> {
     CONTRACT_FRAMEWORK("CONTRACT_FRAMEWORK", "合同框架"),
     CONTRACT_FRAMEWORK("CONTRACT_FRAMEWORK", "合同框架"),
     RECEIVABLE_LEDGER_REPORT("RECEIVABLE_LEDGER_REPORT", "应收款台账报表"),
     RECEIVABLE_LEDGER_REPORT("RECEIVABLE_LEDGER_REPORT", "应收款台账报表"),
     SHIPMENT_DETAIL_REPORT("SHIPMENT_DETAIL_REPORT", "发货明细报表"),
     SHIPMENT_DETAIL_REPORT("SHIPMENT_DETAIL_REPORT", "发货明细报表"),
+    ORDER_DETAIL_REPORT("ORDER_DETAIL_REPORT", "订单明细报表"),
 
 
 
 
     ;
     ;

+package com.lframework.xingyun.sc.excel.statistics;
+
+import com.lframework.starter.common.utils.CollectionUtil;
+import com.lframework.starter.mq.core.components.export.ExportTaskWorker;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.ApplicationUtil;
+import com.lframework.starter.web.core.utils.JsonUtil;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.xingyun.sc.bo.statistics.orderDetail.QueryOrderDetailReportBo;
+import com.lframework.xingyun.sc.bo.statistics.shipmentDetail.QueryShipmentDetailStatisticsBo;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.entity.ShipmentDetailStatistics;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.service.statistics.ShipmentDetailStatisticsService;
+import com.lframework.xingyun.sc.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.shipmentDetail.QueryShipmentDetailStatisticsVo;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+
+public class OrderDetailReportExportTaskWorker implements
+        ExportTaskWorker<QueryOrderDetailReportVo, QueryOrderDetailReportBo, OrderDetailStatisticsModel> {
+
+
+    @Override
+    public QueryOrderDetailReportVo parseParams(String json) {
+        return JsonUtil.parseObject(json, QueryOrderDetailReportVo.class);
+    }
+
+    @Override
+    public PageResult<QueryOrderDetailReportBo> getDataList(int pageIndex, int pageSize, QueryOrderDetailReportVo params) {
+        OrderDetailReportService orderDetailReportService = ApplicationUtil.getBean(OrderDetailReportService.class);
+        PageResult<OrderDetailReport> pageResult = orderDetailReportService.query(pageIndex, pageSize, params);
+        List<QueryOrderDetailReportBo> results = null;
+        if (!CollectionUtil.isEmpty(pageResult.getDatas())) {
+            results = pageResult.getDatas().stream().map(QueryOrderDetailReportBo::new).collect(Collectors.toList());
+        }
+        return PageResultUtil.rebuild(pageResult, results);
+    }
+
+    @Override
+    public OrderDetailStatisticsModel exportData(QueryOrderDetailReportBo data) {
+        // 公差数据处理
+        String thicknessTol = CommonUtil.handleTolData(
+                data.getThicknessTolPos() != null ? data.getThicknessTolPos().doubleValue() : null,
+                data.getThicknessTolNeg() != null ? data.getThicknessTolNeg().doubleValue() : null);
+        String widthTol = CommonUtil.handleTolData(
+                data.getWidthTolPos() != null ? data.getWidthTolPos().doubleValue() : null,
+                data.getWidthTolNeg() != null ? data.getWidthTolNeg().doubleValue() : null);
+        String lengthTol = CommonUtil.handleTolData(
+                data.getLengthTolPos() != null ? data.getLengthTolPos().doubleValue() : null,
+                data.getLengthTolNeg() != null ? data.getLengthTolNeg().doubleValue() : null);
+
+        OrderDetailStatisticsModel model = JsonUtil.parseObject(JsonUtil.toJsonString(data), OrderDetailStatisticsModel.class);
+        model.setThicknessTol(thicknessTol);
+        model.setWidthTol(widthTol);
+        model.setLengthTol(lengthTol);
+        return model;
+    }
+
+    @Override
+    public Class<OrderDetailStatisticsModel> getModelClass() {
+        return OrderDetailStatisticsModel.class;
+    }
+}

+package com.lframework.xingyun.sc.excel.statistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import lombok.Data;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 发货明细Excel Model
+ * </p>
+ *
+ */
+@Data
+public class OrderDetailStatisticsModel implements ExcelModel {
+
+    /**
+     * 订货金额
+     */
+    @ExcelProperty("订货金额")
+    private String amount;
+
+    /**
+     * 超协金额
+     */
+    @ExcelProperty("超协金额")
+    private String superCoordinationAmount;
+
+    /**
+     * 折65金额
+     */
+    @ExcelProperty("折65金额")
+    private String discountAmount;
+
+    /**
+     * 订货日期
+     */
+    @ExcelProperty("订货日期")
+    private String orderDate1;
+
+    /**
+     * 订单编号
+     */
+    @ExcelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 包装金额
+     */
+    @ExcelProperty("包装金额")
+    private String packagingAmount;
+
+    /**
+     * 当日电铜
+     */
+    @ExcelProperty("当日电铜")
+    private String sameDayCopper;
+
+    /**
+     * 订货日期
+     */
+    @ExcelProperty("订货日期")
+    private String orderDate;
+
+    /**
+     * 生产厂
+     */
+    @ExcelProperty("生产厂")
+    private String workshopName;
+
+    /**
+     * 科办
+     */
+    @ExcelProperty("科办")
+    private String deptName;
+
+    /**
+     * 片
+     */
+    @ExcelProperty("片")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ExcelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 行业(用途)
+     */
+    @ExcelProperty("行业(用途)")
+    private String industry;
+
+    /**
+     * 高新标识
+     */
+    @ExcelProperty("高新标识")
+    private String highTechLogo;
+
+    /**
+     * 牌号
+     */
+    @ExcelProperty("牌号")
+    private String brand;
+
+    /**
+     * 厚
+     */
+    @ExcelProperty("厚")
+    private BigDecimal thickness;
+
+    /**
+     * 厚差
+     */
+    @ExcelProperty("厚差")
+    private String thicknessTol;
+
+    /**
+     * 宽
+     */
+    @ExcelProperty("宽")
+    private BigDecimal width;
+
+    /**
+     * 宽差
+     */
+    @ExcelProperty("宽差")
+    private String widthTol;
+
+    /**
+     * 长
+     */
+    @ExcelProperty("长")
+    private BigDecimal length;
+
+    /**
+     * 长差
+     */
+    @ExcelProperty("长差")
+    private String lengthTol;
+
+    /**
+     * 状态
+     */
+    @ExcelProperty("状态")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ExcelProperty("数量")
+    private BigDecimal quantity;
+
+    /**
+     * 指导价
+     */
+    @ExcelProperty("指导价")
+    private String suggestedPrice;
+
+    /**
+     * 发货日期
+     */
+    @ExcelProperty("发货日期")
+    private String deliveryDate;
+
+    /**
+     * 超协价
+     */
+    @ExcelProperty("超协价")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 当日南海H65
+     */
+    @ExcelProperty("当日南海H65")
+    private String H65;
+
+    /**
+     * 销售价
+     */
+    @ExcelProperty("销售价")
+    private String salesPrice;
+
+    /**
+     * 价格表编号
+     */
+    @ExcelProperty("价格表编号")
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    @ExcelProperty("包装费")
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    @ExcelProperty("开票情况")
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    @ExcelProperty("件重条头")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ExcelProperty("表面")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ExcelProperty("公差")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ExcelProperty("性能")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ExcelProperty("包装")
+    private String packaging;
+
+    /**
+     * 特别注重要求
+     */
+    @ExcelProperty("特别注重要求")
+    private String specialRequirements;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty("备注")
+    private String remarks;
+
+    /**
+     * 当日锌锭
+     */
+    @ExcelProperty("当日锌锭")
+    private String zincDay;
+
+    /**
+     * 运费
+     */
+    @ExcelProperty("运费")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ExcelProperty("回程运费")
+    private String returnShippingCost;
+
+    /**
+     * 客户类型
+     */
+    @ExcelProperty("客户类型")
+    private String customerType;
+
+    /**
+     * 标准行业
+     */
+    @ExcelProperty("标准行业")
+    private String quality;
+
+    /**
+     * 加工经销
+     */
+    @ExcelProperty("加工经销")
+    private String contractType;
+
+    /**
+     * 备货单位/人（生产标准）
+     */
+    @ExcelProperty("备货单位/人（生产标准）")
+    private String stockUpCompanyName;
+
+    /**
+     * 订单类型
+     */
+    @ExcelProperty("订单类型")
+    private String orderType;
+
+}

@@ -15,29 +15,29 @@ import com.lframework.starter.web.core.components.resp.PageResult;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.web.core.utils.OpLogUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.utils.StringUtil;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.common.exceptions.impl.DefaultClientException;
-
 import java.io.Serializable;
 import java.io.Serializable;
-
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.web.core.utils.IdUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.common.utils.ObjectUtil;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.annotations.oplog.OpLog;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.web.core.utils.PageHelperUtil;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.common.utils.Assert;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
 import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
-import com.lframework.xingyun.sc.entity.ContractDistributorStandard;
-import com.lframework.xingyun.sc.entity.CustomerCredit;
-import com.lframework.xingyun.sc.entity.PurchaseOrderInfo;
-import com.lframework.xingyun.sc.entity.PurchaseOrderLine;
+import com.lframework.xingyun.sc.entity.*;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.enums.OrderSpecChangeStatus;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.mappers.PurchaseOrderInfoMapper;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
 import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
 import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.customer.credit.QueryCustomerCreditVo;
 import com.lframework.xingyun.sc.vo.order.*;
 import com.lframework.xingyun.sc.vo.order.*;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
@@ -66,6 +66,12 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
     private WorkshopService workshopService;
     private WorkshopService workshopService;
     @Resource
     @Resource
     private ContractDistributorStandardService contractDistributorStandardService;
     private ContractDistributorStandardService contractDistributorStandardService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private ContractStdProcessingLineService contractStdProcessingLineService;
+    @Resource
+    private OrderDetailReportService orderDetailReportService;
 
 
     @Override
     @Override
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
     public PageResult<PurchaseOrderInfo> query(Integer pageIndex, Integer pageSize, QueryPurchaseOrderInfoVo vo) {
@@ -267,10 +273,120 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
         if (!vo.isNoFlowInstance()) {
         if (!vo.isNoFlowInstance()) {
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
             flowInstanceWrapperService.startInstance(BPM_FLAG, data.getId(), BPM_FLAG, data);
         }
         }
+        //生成订单明细报表
+        createOrderDetailReport(data.getId());
 
 
         return data.getId();
         return data.getId();
     }
     }
 
 
+    private void createOrderDetailReport(String businessId) {
+        PurchaseOrderInfo purchaseOrderInfo = this.findById(businessId);
+        ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
+        CustomerCredit customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+        QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
+        vo1.setPurchaseOrderId(purchaseOrderInfo.getId());
+        List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
+        if (CollectionUtils.isNotEmpty(lineVoList)) {
+            for (PurchaseOrderLine line : lineVoList) {
+                CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
+                vo.setPurchaseOrderLineId(line.getId());
+                vo.setOrderNo(purchaseOrderInfo.getOrderNo());
+                vo.setOrderDate(purchaseOrderInfo.getOrderDate());
+                vo.setWorkshopId(purchaseOrderInfo.getWorkshopId());
+                vo.setDeptName(purchaseOrderInfo.getDeptName());
+                vo.setRegionName(purchaseOrderInfo.getRegionName());
+                vo.setOrderingUnitName(purchaseOrderInfo.getOrderingUnitName());
+                vo.setIndustry(line.getIndustry());
+                vo.setBrand(line.getBrand());
+                vo.setThickness(line.getThickness());
+                vo.setThicknessTolPos(line.getThicknessTolPos());
+                vo.setThicknessTolNeg(line.getThicknessTolNeg());
+                vo.setWidth(line.getWidth());
+                vo.setWidthTolPos(line.getWidthTolPos());
+                vo.setWidthTolNeg(line.getWidthTolNeg());
+                vo.setLength(line.getLength());
+                vo.setLengthTolPos(line.getLengthTolPos());
+                vo.setLengthTolNeg(line.getLengthTolNeg());
+                vo.setStatus(line.getStatus());
+                vo.setQuantity(line.getQuantity());
+                String assessmentExceedsAgreement;
+                BigDecimal salesPrice = line.getSalesPrice();
+                if (line.getSalesPrice() != null && StringUtils.isNotEmpty(line.getAssessmentExceedsAgreement())) {
+                    assessmentExceedsAgreement = line.getAssessmentExceedsAgreement().trim();
+                    try {
+                        BigDecimal exceedsAgreement = new BigDecimal(assessmentExceedsAgreement);
+                        BigDecimal divisor = new BigDecimal("1000");
+                        BigDecimal adjustment = exceedsAgreement.divide(divisor, 4, RoundingMode.HALF_UP); // 保留4位小数
+                        BigDecimal subtract = salesPrice.subtract(adjustment);
+                        vo.setSuggestedPrice(subtract.toPlainString());
+                    } catch (NumberFormatException e) {
+                        // 日志记录或按业务处理：超协价格式无效，忽略计算
+                        log.error("超协价格式错误，使用原始销售价。value=" + assessmentExceedsAgreement);
+                    }
+                }
+                vo.setDeliveryDate(line.getDeliveryDate());
+                vo.setAssessmentExceedsAgreement(line.getAssessmentExceedsAgreement());
+                vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                vo.setPriceListNo(purchaseOrderInfo.getPriceListNo());
+                vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                vo.setInvoicingStatus(purchaseOrderInfo.getInvoicingStatus());
+                vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
+                vo.setSurface(purchaseOrderInfo.getSurface());
+                vo.setTolerance(purchaseOrderInfo.getTolerance());
+                vo.setPerformance(purchaseOrderInfo.getPerformance());
+                vo.setPackaging(purchaseOrderInfo.getPackaging());
+                vo.setRemarks(purchaseOrderInfo.getRemarks());
+                //加工合同就是回程运费
+                String type = standard.getType();
+                if ("PROCESS_STD_AGMT".equals(type)) {
+                    vo.setReturnShippingCost(purchaseOrderInfo.getShippingCost());
+                } else {
+                    vo.setShippingCost(purchaseOrderInfo.getShippingCost());
+                }
+                if (customerCredit != null) {
+                    SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", customerCredit.getEnterpriseType());
+                    if (dataDicItem != null) {
+                        vo.setCustomerType(dataDicItem.getName());
+                    }
+                }
+                vo.setQuality(line.getQuality());
+                String contractType = handleContractType(type);
+                vo.setContractType(contractType);
+                if ("加工".equals(contractType)) {
+                    String contractDistributorLineId = line.getContractDistributorLineId();
+                    ContractStdProcessingLine processingLine = contractStdProcessingLineService.findById(contractDistributorLineId);
+
+                    if (processingLine != null) {
+                        String materialProductRatio = processingLine.getMaterialProductRatio();
+                        SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio);
+
+                        if (dataDicItem != null) {
+                            vo.setContractType(dataDicItem.getName() + contractType);
+                        }
+                    }
+                }
+                vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
+//                vo.setOrderType();
+                vo.setShowOrder(0);
+                orderDetailReportService.create(vo);
+            }
+        }
+    }
+
+    private String handleContractType(String contractType) {
+        String result = "";
+        if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType)) {
+            result = "经销";
+        } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            result = "外贸";
+        } else if ("PROCESS_STD_AGMT".equals(contractType)) {
+            result = "加工";
+        }
+        return result;
+    }
+
     @OpLog(type = OtherOpLogType.class, name = "修改订货单表，ID：{}", params = {"#id"})
     @OpLog(type = OtherOpLogType.class, name = "修改订货单表，ID：{}", params = {"#id"})
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override

+package com.lframework.xingyun.sc.impl.statistics;
+
+import com.github.pagehelper.PageInfo;
+import com.lframework.starter.web.core.impl.BaseMpServiceImpl;
+import com.lframework.starter.web.core.utils.PageResultUtil;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.starter.web.core.utils.OpLogUtil;
+import com.lframework.starter.common.utils.StringUtil;
+import java.io.Serializable;
+import com.lframework.starter.web.core.utils.IdUtil;
+import com.lframework.starter.web.core.annotations.oplog.OpLog;
+import com.lframework.starter.web.core.utils.PageHelperUtil;
+import com.lframework.starter.common.utils.Assert;
+import com.lframework.starter.web.inner.components.oplog.OtherOpLogType;
+import com.lframework.starter.web.inner.entity.SysDataDicItem;
+import com.lframework.starter.web.inner.service.system.SysDataDicItemService;
+import com.lframework.xingyun.sc.entity.*;
+import com.lframework.xingyun.sc.mappers.OrderDetailReportMapper;
+import com.lframework.xingyun.sc.service.contract.ContractDistributorStandardService;
+import com.lframework.xingyun.sc.service.contract.ContractStdProcessingLineService;
+import com.lframework.xingyun.sc.service.customer.CustomerCreditService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderInfoService;
+import com.lframework.xingyun.sc.service.order.PurchaseOrderLineService;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderInfoVo;
+import com.lframework.xingyun.sc.vo.order.QueryPurchaseOrderLineVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.List;
+
+@Service
+public class OrderDetailReportServiceImpl extends BaseMpServiceImpl<OrderDetailReportMapper, OrderDetailReport> implements OrderDetailReportService {
+    @Resource
+    private PurchaseOrderInfoService purchaseOrderInfoService;
+    @Resource
+    private ContractDistributorStandardService contractDistributorStandardService;
+    @Resource
+    private CustomerCreditService customerCreditService;
+    @Resource
+    private PurchaseOrderLineService purchaseOrderLineService;
+    @Resource
+    private SysDataDicItemService sysDataDicItemService;
+    @Resource
+    private ContractStdProcessingLineService contractStdProcessingLineService;
+    @Resource
+    private OrderDetailReportService orderDetailReportService;
+
+    @Override
+    public PageResult<OrderDetailReport> query(Integer pageIndex, Integer pageSize, QueryOrderDetailReportVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<OrderDetailReport> datas = this.query(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
+    public List<OrderDetailReport> query(QueryOrderDetailReportVo vo) {
+
+        return getBaseMapper().query(vo);
+    }
+
+    @Override
+    public OrderDetailReport findById(String id) {
+
+        return getBaseMapper().selectById(id);
+    }
+
+    @OpLog(type = OtherOpLogType.class, name = "新增订单明细，ID：{}", params = {"#id"})
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public String create(CreateOrderDetailReportVo vo) {
+
+        OrderDetailReport data = new OrderDetailReport();
+        data.setId(IdUtil.getId());
+        if (!StringUtil.isBlank(vo.getPurchaseOrderLineId())) {
+            data.setPurchaseOrderLineId(vo.getPurchaseOrderLineId());
+        }
+        if (!StringUtil.isBlank(vo.getOrderNo())) {
+            data.setOrderNo(vo.getOrderNo());
+        }
+        if (vo.getOrderDate() != null) {
+            data.setOrderDate(vo.getOrderDate());
+        }
+        if (!StringUtil.isBlank(vo.getWorkshopId())) {
+            data.setWorkshopId(vo.getWorkshopId());
+        }
+        if (!StringUtil.isBlank(vo.getDeptName())) {
+            data.setDeptName(vo.getDeptName());
+        }
+        if (!StringUtil.isBlank(vo.getRegionName())) {
+            data.setRegionName(vo.getRegionName());
+        }
+        if (!StringUtil.isBlank(vo.getOrderingUnitName())) {
+            data.setOrderingUnitName(vo.getOrderingUnitName());
+        }
+        if (!StringUtil.isBlank(vo.getIndustry())) {
+            data.setIndustry(vo.getIndustry());
+        }
+        if (!StringUtil.isBlank(vo.getBrand())) {
+            data.setBrand(vo.getBrand());
+        }
+        if (vo.getThickness() != null) {
+            data.setThickness(vo.getThickness());
+        }
+        if (vo.getThicknessTolPos() != null) {
+            data.setThicknessTolPos(vo.getThicknessTolPos());
+        }
+        if (vo.getThicknessTolNeg() != null) {
+            data.setThicknessTolNeg(vo.getThicknessTolNeg());
+        }
+        if (vo.getWidth() != null) {
+            data.setWidth(vo.getWidth());
+        }
+        if (vo.getWidthTolPos() != null) {
+            data.setWidthTolPos(vo.getWidthTolPos());
+        }
+        if (vo.getWidthTolNeg() != null) {
+            data.setWidthTolNeg(vo.getWidthTolNeg());
+        }
+        if (vo.getLength() != null) {
+            data.setLength(vo.getLength());
+        }
+        if (vo.getLengthTolPos() != null) {
+            data.setLengthTolPos(vo.getLengthTolPos());
+        }
+        if (vo.getLengthTolNeg() != null) {
+            data.setLengthTolNeg(vo.getLengthTolNeg());
+        }
+        if (!StringUtil.isBlank(vo.getStatus())) {
+            data.setStatus(vo.getStatus());
+        }
+        if (vo.getQuantity() != null) {
+            data.setQuantity(vo.getQuantity());
+        }
+        if (!StringUtil.isBlank(vo.getSuggestedPrice())) {
+            data.setSuggestedPrice(vo.getSuggestedPrice());
+        }
+        if (vo.getDeliveryDate() != null) {
+            data.setDeliveryDate(vo.getDeliveryDate());
+        }
+        if (!StringUtil.isBlank(vo.getAssessmentExceedsAgreement())) {
+            data.setAssessmentExceedsAgreement(vo.getAssessmentExceedsAgreement());
+        }
+        if (!StringUtil.isBlank(vo.getSalesPrice())) {
+            data.setSalesPrice(vo.getSalesPrice());
+        }
+        if (!StringUtil.isBlank(vo.getPriceListNo())) {
+            data.setPriceListNo(vo.getPriceListNo());
+        }
+        if (!StringUtil.isBlank(vo.getPackagingFee())) {
+            data.setPackagingFee(vo.getPackagingFee());
+        }
+        if (!StringUtil.isBlank(vo.getInvoicingStatus())) {
+            data.setInvoicingStatus(vo.getInvoicingStatus());
+        }
+        if (!StringUtil.isBlank(vo.getPieceWeightHeader())) {
+            data.setPieceWeightHeader(vo.getPieceWeightHeader());
+        }
+        if (!StringUtil.isBlank(vo.getSurface())) {
+            data.setSurface(vo.getSurface());
+        }
+        if (!StringUtil.isBlank(vo.getTolerance())) {
+            data.setTolerance(vo.getTolerance());
+        }
+        if (!StringUtil.isBlank(vo.getPerformance())) {
+            data.setPerformance(vo.getPerformance());
+        }
+        if (!StringUtil.isBlank(vo.getPackaging())) {
+            data.setPackaging(vo.getPackaging());
+        }
+        if (!StringUtil.isBlank(vo.getRemarks())) {
+            data.setRemarks(vo.getRemarks());
+        }
+        if (!StringUtil.isBlank(vo.getShippingCost())) {
+            data.setShippingCost(vo.getShippingCost());
+        }
+        if (!StringUtil.isBlank(vo.getReturnShippingCost())) {
+            data.setReturnShippingCost(vo.getReturnShippingCost());
+        }
+        if (!StringUtil.isBlank(vo.getCustomerType())) {
+            data.setCustomerType(vo.getCustomerType());
+        }
+        if (!StringUtil.isBlank(vo.getQuality())) {
+            data.setQuality(vo.getQuality());
+        }
+        if (!StringUtil.isBlank(vo.getContractType())) {
+            data.setContractType(vo.getContractType());
+        }
+        if (!StringUtil.isBlank(vo.getStockUpCompanyName())) {
+            data.setStockUpCompanyName(vo.getStockUpCompanyName());
+        }
+        if (!StringUtil.isBlank(vo.getOrderType())) {
+            data.setOrderType(vo.getOrderType());
+        }
+        if (vo.getShowOrder() != null) {
+            data.setShowOrder(vo.getShowOrder());
+        }
+
+        getBaseMapper().insert(data);
+
+        OpLogUtil.setVariable("id", data.getId());
+        OpLogUtil.setExtra(vo);
+
+        return data.getId();
+    }
+
+    @Override
+    public void processHistoricalData() {
+        QueryPurchaseOrderInfoVo vo2 = new QueryPurchaseOrderInfoVo();
+        List<PurchaseOrderInfo> query = purchaseOrderInfoService.query(vo2);
+        if (CollectionUtils.isNotEmpty(query)) {
+            for (PurchaseOrderInfo purchaseOrderInfo : query) {
+                ContractDistributorStandard standard = contractDistributorStandardService.findById(purchaseOrderInfo.getContractId());
+                CustomerCredit customerCredit = customerCreditService.findById(purchaseOrderInfo.getCustomerCreditId());
+                QueryPurchaseOrderLineVo vo1 = new QueryPurchaseOrderLineVo();
+                vo1.setPurchaseOrderId(purchaseOrderInfo.getId());
+                List<PurchaseOrderLine> lineVoList = purchaseOrderLineService.query(vo1);
+                if (CollectionUtils.isNotEmpty(lineVoList)) {
+                    for (PurchaseOrderLine line : lineVoList) {
+                        CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo();
+                        vo.setPurchaseOrderLineId(line.getId());
+                        vo.setOrderNo(purchaseOrderInfo.getOrderNo());
+                        vo.setOrderDate(purchaseOrderInfo.getOrderDate());
+                        vo.setWorkshopId(purchaseOrderInfo.getWorkshopId());
+                        vo.setDeptName(purchaseOrderInfo.getDeptName());
+                        vo.setRegionName(purchaseOrderInfo.getRegionName());
+                        vo.setOrderingUnitName(purchaseOrderInfo.getOrderingUnitName());
+                        vo.setIndustry(line.getIndustry());
+                        vo.setBrand(line.getBrand());
+                        vo.setThickness(line.getThickness());
+                        vo.setThicknessTolPos(line.getThicknessTolPos());
+                        vo.setThicknessTolNeg(line.getThicknessTolNeg());
+                        vo.setWidth(line.getWidth());
+                        vo.setWidthTolPos(line.getWidthTolPos());
+                        vo.setWidthTolNeg(line.getWidthTolNeg());
+                        vo.setLength(line.getLength());
+                        vo.setLengthTolPos(line.getLengthTolPos());
+                        vo.setLengthTolNeg(line.getLengthTolNeg());
+                        vo.setStatus(line.getStatus());
+                        vo.setQuantity(line.getQuantity());
+                        String assessmentExceedsAgreement;
+                        BigDecimal salesPrice = line.getSalesPrice();
+                        if (line.getSalesPrice() != null && StringUtils.isNotEmpty(line.getAssessmentExceedsAgreement())) {
+                            assessmentExceedsAgreement = line.getAssessmentExceedsAgreement().trim();
+                            try {
+                                BigDecimal exceedsAgreement = new BigDecimal(assessmentExceedsAgreement);
+                                BigDecimal divisor = new BigDecimal("1000");
+                                BigDecimal adjustment = exceedsAgreement.divide(divisor, 4, RoundingMode.HALF_UP); // 保留4位小数
+                                BigDecimal subtract = salesPrice.subtract(adjustment);
+                                vo.setSuggestedPrice(subtract.toPlainString());
+                            } catch (NumberFormatException e) {
+                                // 日志记录或按业务处理：超协价格式无效，忽略计算
+                                log.error("assessmentExceedsAgreement====>" + assessmentExceedsAgreement);
+                            }
+                        }
+                        vo.setDeliveryDate(line.getDeliveryDate());
+                        vo.setAssessmentExceedsAgreement(line.getAssessmentExceedsAgreement());
+                        vo.setSalesPrice(line.getSalesPrice().toPlainString());
+                        vo.setPriceListNo(purchaseOrderInfo.getPriceListNo());
+                        vo.setPackagingFee(line.getPackagingFee().toPlainString());
+                        vo.setInvoicingStatus(purchaseOrderInfo.getInvoicingStatus());
+                        vo.setPieceWeightHeader(purchaseOrderInfo.getPieceWeightHeader());
+                        vo.setSurface(purchaseOrderInfo.getSurface());
+                        vo.setTolerance(purchaseOrderInfo.getTolerance());
+                        vo.setPerformance(purchaseOrderInfo.getPerformance());
+                        vo.setPackaging(purchaseOrderInfo.getPackaging());
+                        vo.setRemarks(purchaseOrderInfo.getRemarks());
+                        //加工合同就是回程运费
+                        String type = standard.getType();
+                        if ("PROCESS_STD_AGMT".equals(type)) {
+                            vo.setReturnShippingCost(purchaseOrderInfo.getShippingCost());
+                        } else {
+                            vo.setShippingCost(purchaseOrderInfo.getShippingCost());
+                        }
+                        if (customerCredit != null) {
+                            SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("ENTERPRISE_TYPE", customerCredit.getEnterpriseType());
+                            if (dataDicItem != null) {
+                                vo.setCustomerType(dataDicItem.getName());
+                            }
+                        }
+                        vo.setQuality(line.getQuality());
+                        String contractType = handleContractType(type);
+                        vo.setContractType(contractType);
+                        if ("加工".equals(contractType)) {
+                            String contractDistributorLineId = line.getContractDistributorLineId();
+                            ContractStdProcessingLine processingLine = contractStdProcessingLineService.findById(contractDistributorLineId);
+
+                            if (processingLine != null) {
+                                String materialProductRatio = processingLine.getMaterialProductRatio();
+                                SysDataDicItem dataDicItem = sysDataDicItemService.findByCode("RAW_TO_PROD_RATIO", materialProductRatio);
+
+                                if (dataDicItem != null) {
+                                    vo.setContractType(dataDicItem.getName() + contractType);
+                                }
+                            }
+                        }
+                        vo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName());
+                        //vo.setOrderType();
+                        vo.setShowOrder(0);
+                        orderDetailReportService.create(vo);
+                    }
+                }
+            }
+        }
+    }
+
+    private String handleContractType(String contractType) {
+        String result = "";
+        if ("DISTRIB_STD".equals(contractType) || "DIST_STOCK_CONTRACT".equals(contractType)
+                || "DRAFT_DIST_AGMT".equals(contractType)) {
+            result = "经销";
+        } else if ("INTL_STD_CONTRACT".equals(contractType) || "INTL_INVENTORY_AGMT".equals(contractType)
+                || "INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            result = "外贸";
+        } else if ("PROCESS_STD_AGMT".equals(contractType)) {
+            result = "加工";
+        }
+        return result;
+    }
+
+    @Override
+    public void cleanCacheByKey(Serializable key) {
+
+    }
+}

+package com.lframework.xingyun.sc.mappers;
+
+import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单明细 Mapper 接口
+ * </p>
+ *
+ */
+public interface OrderDetailReportMapper extends BaseMapper<OrderDetailReport> {
+
+	/**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<OrderDetailReport> query(@Param("vo") QueryOrderDetailReportVo vo);
+}

+package com.lframework.xingyun.sc.service.statistics;
+
+import com.lframework.starter.web.core.service.BaseMpService;
+import com.lframework.starter.web.core.components.resp.PageResult;
+import com.lframework.xingyun.sc.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.CreateOrderDetailReportVo;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import java.util.List;
+
+/**
+ * 订单明细 Service
+ */
+public interface OrderDetailReportService extends BaseMpService<OrderDetailReport> {
+
+    /**
+     * 查询列表
+     * @return
+     */
+    PageResult<OrderDetailReport> query(Integer pageIndex, Integer pageSize, QueryOrderDetailReportVo vo);
+
+    /**
+     * 查询列表
+     * @param vo
+     * @return
+     */
+    List<OrderDetailReport> query(QueryOrderDetailReportVo vo);
+
+    /**
+     * 根据ID查询
+     * @param id
+     * @return
+     */
+    OrderDetailReport findById(String id);
+
+    /**
+     * 创建
+     * @param vo
+     * @return
+     */
+    String create(CreateOrderDetailReportVo vo);
+
+    /**
+     * 处理历史数据
+     */
+    void processHistoricalData();
+
+
+}

+package com.lframework.xingyun.sc.vo.statistics.orderDetail;
+
+import com.lframework.starter.web.core.components.validation.IsNumberPrecision;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import com.lframework.starter.web.core.components.validation.TypeMismatch;
+import org.hibernate.validator.constraints.Length;
+import java.io.Serializable;
+import lombok.Data;
+
+@Data
+public class CreateOrderDetailReportVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    @Length(message = "订货单物料行ID最多允许32个字符！")
+    private String purchaseOrderLineId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    @Length(message = "订单编号最多允许100个字符！")
+    private String orderNo;
+
+    /**
+     * 订货日期
+     */
+    @ApiModelProperty("订货日期")
+    @TypeMismatch(message = "订货日期格式有误！")
+    private LocalDate orderDate;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    @Length(message = "生产厂最多允许50个字符！")
+    private String workshopId;
+
+    /**
+     * 科办
+     */
+    @ApiModelProperty("科办")
+    @Length(message = "科办最多允许50个字符！")
+    private String deptName;
+
+    /**
+     * 区域
+     */
+    @ApiModelProperty("区域")
+    @Length(message = "区域最多允许50个字符！")
+    private String regionName;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    @Length(message = "订货单位名称最多允许200个字符！")
+    private String orderingUnitName;
+
+    /**
+     * 行业
+     */
+    @ApiModelProperty("行业")
+    @Length(message = "行业最多允许50个字符！")
+    private String industry;
+
+    /**
+     * 牌号
+     */
+    @ApiModelProperty("牌号")
+    @Length(message = "牌号最多允许50个字符！")
+    private String brand;
+
+    /**
+     * 厚度
+     */
+    @ApiModelProperty("厚度")
+    @TypeMismatch(message = "厚度格式有误！")
+    @IsNumberPrecision(message = "厚度最多允许4位小数！", value = 4)
+    private BigDecimal thickness;
+
+    /**
+     * 厚度公差正
+     */
+    @ApiModelProperty("厚度公差正")
+    @TypeMismatch(message = "厚度公差正格式有误！")
+    @IsNumberPrecision(message = "厚度公差正最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolPos;
+
+    /**
+     * 厚度公差负
+     */
+    @ApiModelProperty("厚度公差负")
+    @TypeMismatch(message = "厚度公差负格式有误！")
+    @IsNumberPrecision(message = "厚度公差负最多允许4位小数！", value = 4)
+    private BigDecimal thicknessTolNeg;
+
+    /**
+     * 宽度
+     */
+    @ApiModelProperty("宽度")
+    @TypeMismatch(message = "宽度格式有误！")
+    @IsNumberPrecision(message = "宽度最多允许4位小数！", value = 4)
+    private BigDecimal width;
+
+    /**
+     * 宽度公差正
+     */
+    @ApiModelProperty("宽度公差正")
+    @TypeMismatch(message = "宽度公差正格式有误！")
+    @IsNumberPrecision(message = "宽度公差正最多允许4位小数！", value = 4)
+    private BigDecimal widthTolPos;
+
+    /**
+     * 宽度公差负
+     */
+    @ApiModelProperty("宽度公差负")
+    @TypeMismatch(message = "宽度公差负格式有误！")
+    @IsNumberPrecision(message = "宽度公差负最多允许4位小数！", value = 4)
+    private BigDecimal widthTolNeg;
+
+    /**
+     * 长度
+     */
+    @ApiModelProperty("长度")
+    @TypeMismatch(message = "长度格式有误！")
+    @IsNumberPrecision(message = "长度最多允许4位小数！", value = 4)
+    private BigDecimal length;
+
+    /**
+     * 长度公差正
+     */
+    @ApiModelProperty("长度公差正")
+    @TypeMismatch(message = "长度公差正格式有误！")
+    @IsNumberPrecision(message = "长度公差正最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolPos;
+
+    /**
+     * 长度公差负
+     */
+    @ApiModelProperty("长度公差负")
+    @TypeMismatch(message = "长度公差负格式有误！")
+    @IsNumberPrecision(message = "长度公差负最多允许4位小数！", value = 4)
+    private BigDecimal lengthTolNeg;
+
+    /**
+     * 状态
+     */
+    @ApiModelProperty("状态")
+    @Length(message = "状态最多允许50个字符！")
+    private String status;
+
+    /**
+     * 数量
+     */
+    @ApiModelProperty("数量")
+    @TypeMismatch(message = "数量格式有误！")
+    @IsNumberPrecision(message = "数量最多允许4位小数！", value = 4)
+    private BigDecimal quantity;
+
+    /**
+     * 指导价
+     */
+    @ApiModelProperty("指导价")
+    @Length(message = "指导价最多允许50个字符！")
+    private String suggestedPrice;
+
+    /**
+     * 发货日期
+     */
+    @ApiModelProperty("发货日期")
+    @TypeMismatch(message = "发货日期格式有误！")
+    private LocalDate deliveryDate;
+
+    /**
+     * 超协价
+     */
+    @ApiModelProperty("超协价")
+    @Length(message = "超协价最多允许50个字符！")
+    private String assessmentExceedsAgreement;
+
+    /**
+     * 销售价
+     */
+    @ApiModelProperty("销售价")
+    @Length(message = "销售价最多允许50个字符！")
+    private String salesPrice;
+
+    /**
+     * 价格表编号
+     */
+    @ApiModelProperty("价格表编号")
+    @Length(message = "价格表编号最多允许50个字符！")
+    private String priceListNo;
+
+    /**
+     * 包装费
+     */
+    @ApiModelProperty("包装费")
+    @Length(message = "包装费最多允许50个字符！")
+    private String packagingFee;
+
+    /**
+     * 开票情况
+     */
+    @ApiModelProperty("开票情况")
+    @Length(message = "开票情况最多允许50个字符！")
+    private String invoicingStatus;
+
+    /**
+     * 件重条头
+     */
+    @ApiModelProperty("件重条头")
+    @Length(message = "件重条头最多允许65,535个字符！")
+    private String pieceWeightHeader;
+
+    /**
+     * 表面
+     */
+    @ApiModelProperty("表面")
+    @Length(message = "表面最多允许65,535个字符！")
+    private String surface;
+
+    /**
+     * 公差
+     */
+    @ApiModelProperty("公差")
+    @Length(message = "公差最多允许65,535个字符！")
+    private String tolerance;
+
+    /**
+     * 性能
+     */
+    @ApiModelProperty("性能")
+    @Length(message = "性能最多允许65,535个字符！")
+    private String performance;
+
+    /**
+     * 包装
+     */
+    @ApiModelProperty("包装")
+    @Length(message = "包装最多允许65,535个字符！")
+    private String packaging;
+
+    /**
+     * 备注
+     */
+    @ApiModelProperty("备注")
+    @Length(message = "备注最多允许65,535个字符！")
+    private String remarks;
+
+    /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    @Length(message = "运费最多允许50个字符！")
+    private String shippingCost;
+
+    /**
+     * 回程运费
+     */
+    @ApiModelProperty("回程运费")
+    @Length(message = "回程运费最多允许50个字符！")
+    private String returnShippingCost;
+
+    /**
+     * 客户类型
+     */
+    @ApiModelProperty("客户类型")
+    @Length(message = "客户类型最多允许50个字符！")
+    private String customerType;
+
+    /**
+     * 标准行业
+     */
+    @ApiModelProperty("标准行业")
+    @Length(message = "标准行业最多允许100个字符！")
+    private String quality;
+
+    /**
+     * 加工经销
+     */
+    @ApiModelProperty("加工经销")
+    @Length(message = "加工经销最多允许100个字符！")
+    private String contractType;
+
+    /**
+     * 备货单位
+     */
+    @ApiModelProperty("备货单位")
+    @Length(message = "备货单位最多允许200个字符！")
+    private String stockUpCompanyName;
+
+    /**
+     * 订单类型
+     */
+    @ApiModelProperty("订单类型")
+    @Length(message = "订单类型最多允许50个字符！")
+    private String orderType;
+
+    /**
+     * 排序，订货单：0，撤销单：1，规格变更单：2
+     */
+    @ApiModelProperty("排序，订货单：0，撤销单：1，规格变更单：2")
+    @TypeMismatch(message = "排序，订货单：0，撤销单：1，规格变更单：2格式有误！")
+    private Integer showOrder;
+
+}

+package com.lframework.xingyun.sc.vo.statistics.orderDetail;
+
+import lombok.Data;
+import com.lframework.starter.web.core.vo.PageVo;
+import com.lframework.starter.web.core.vo.BaseVo;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+
+@Data
+public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 订货单物料行ID
+     */
+    @ApiModelProperty("订货单物料行ID")
+    private String purchaseOrderLineId;
+
+    /**
+     * 订单编号
+     */
+    @ApiModelProperty("订单编号")
+    private String orderNo;
+
+    /**
+     * 生产厂
+     */
+    @ApiModelProperty("生产厂")
+    private String workshopId;
+
+    /**
+     * 科办
+     */
+    @ApiModelProperty("科办")
+    private String deptName;
+
+    /**
+     * 订货单位名称
+     */
+    @ApiModelProperty("订货单位名称")
+    private String orderingUnitName;
+
+    /**
+     * 导出类型
+     */
+    @ApiModelProperty("导出类型")
+    private String exportType;
+
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.lframework.xingyun.sc.mappers.OrderDetailReportMapper">
+
+    <resultMap id="OrderDetailReport" type="com.lframework.xingyun.sc.entity.OrderDetailReport">
+        <id column="id" property="id"/>
+        <result column="purchase_order_line_id" property="purchaseOrderLineId"/>
+        <result column="order_no" property="orderNo"/>
+        <result column="order_date" property="orderDate"/>
+        <result column="workshop_id" property="workshopId"/>
+        <result column="workshop_name" property="workshopName"/>
+        <result column="dept_name" property="deptName"/>
+        <result column="region_name" property="regionName"/>
+        <result column="ordering_unit_name" property="orderingUnitName"/>
+        <result column="industry" property="industry"/>
+        <result column="brand" property="brand"/>
+        <result column="thickness" property="thickness"/>
+        <result column="thickness_tol_pos" property="thicknessTolPos"/>
+        <result column="thickness_tol_neg" property="thicknessTolNeg"/>
+        <result column="width" property="width"/>
+        <result column="width_tol_pos" property="widthTolPos"/>
+        <result column="width_tol_neg" property="widthTolNeg"/>
+        <result column="length" property="length"/>
+        <result column="length_tol_pos" property="lengthTolPos"/>
+        <result column="length_tol_neg" property="lengthTolNeg"/>
+        <result column="status" property="status"/>
+        <result column="quantity" property="quantity"/>
+        <result column="suggested_price" property="suggestedPrice"/>
+        <result column="delivery_date" property="deliveryDate"/>
+        <result column="assessment_exceeds_agreement" property="assessmentExceedsAgreement"/>
+        <result column="sales_price" property="salesPrice"/>
+        <result column="price_list_no" property="priceListNo"/>
+        <result column="packaging_fee" property="packagingFee"/>
+        <result column="invoicing_status" property="invoicingStatus"/>
+        <result column="piece_weight_header" property="pieceWeightHeader"/>
+        <result column="surface" property="surface"/>
+        <result column="tolerance" property="tolerance"/>
+        <result column="performance" property="performance"/>
+        <result column="packaging" property="packaging"/>
+        <result column="remarks" property="remarks"/>
+        <result column="shipping_fee" property="shippingFee"/>
+        <result column="return_shipping_cost" property="returnShippingCost"/>
+        <result column="customer_type" property="customerType"/>
+        <result column="quality" property="quality"/>
+        <result column="contract_type" property="contractType"/>
+        <result column="stock_up_company_name" property="stockUpCompanyName"/>
+        <result column="order_type" property="orderType"/>
+        <result column="show_order" property="showOrder"/>
+        <result column="create_by_id" property="createById"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by_id" property="updateById"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
+
+    <sql id="OrderDetailReport_sql">
+        SELECT
+            tb.id,
+            tb.purchase_order_line_id,
+            tb.order_no,
+            tb.order_date,
+            tb.workshop_id,
+            ws.name AS workshop_name,
+            tb.dept_name,
+            tb.region_name,
+            tb.ordering_unit_name,
+            tb.industry,
+            tb.brand,
+            tb.thickness,
+            tb.thickness_tol_pos,
+            tb.thickness_tol_neg,
+            tb.width,
+            tb.width_tol_pos,
+            tb.width_tol_neg,
+            tb.length,
+            tb.length_tol_pos,
+            tb.length_tol_neg,
+            tb.status,
+            tb.quantity,
+            tb.suggested_price,
+            tb.delivery_date,
+            tb.assessment_exceeds_agreement,
+            tb.sales_price,
+            tb.price_list_no,
+            tb.packaging_fee,
+            tb.invoicing_status,
+            tb.piece_weight_header,
+            tb.surface,
+            tb.tolerance,
+            tb.performance,
+            tb.packaging,
+            tb.remarks,
+            tb.shipping_fee,
+            tb.return_shipping_cost,
+            tb.customer_type,
+            tb.quality,
+            tb.contract_type,
+            tb.stock_up_company_name,
+            tb.order_type,
+            tb.show_order,
+            tb.create_by_id,
+            tb.create_by,
+            tb.update_by_id,
+            tb.update_by,
+            tb.create_time,
+            tb.update_time
+        FROM order_detail_report AS tb
+        left join base_data_workshop as ws on ws.id = tb.workshop_id
+    </sql>
+
+    <select id="query" resultMap="OrderDetailReport">
+        <include refid="OrderDetailReport_sql"/>
+        <where>
+            <if test="vo.purchaseOrderLineId != null and vo.purchaseOrderLineId != ''">
+                AND tb.purchase_order_line_id = #{vo.purchaseOrderLineId}
+            </if>
+            <if test="vo.orderNo != null and vo.orderNo != ''">
+                AND tb.order_no LIKE CONCAT('%', #{vo.orderNo}, '%')
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.deptName != null and vo.deptName != ''">
+                AND tb.dept_name LIKE CONCAT('%', #{vo.deptName}, '%')
+            </if>
+            <if test="vo.orderingUnitName != null and vo.orderingUnitName != ''">
+                AND tb.ordering_unit_name LIKE CONCAT('%', #{vo.orderingUnitName}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>