报表：库存入库订单明细报表

@@ -290,6 +290,33 @@ public class QueryOrderDetailReportBo extends BaseBo<OrderDetailReport> {
     @ApiModelProperty("工艺要求")
     @ApiModelProperty("工艺要求")
     private String productionProcess;
     private String productionProcess;
 
 
+    @ApiModelProperty("办事处代码")
+    private String officeCode;
+
+    @ApiModelProperty("办事处")
+    private String officeName;
+
+    @ApiModelProperty("客户简称")
+    private String customerShortName;
+
+    @ApiModelProperty("结算方式或期限")
+    private String settlementTerms;
+
+    @ApiModelProperty("执行标准")
+    private String executionStandard;
+
+    @ApiModelProperty("结构报表用（产品名称）")
+    private String structureReportUsed;
+
+    @ApiModelProperty("合同类型编码")
+    private String contractTypeCode;
+
+    @ApiModelProperty("特别注重要求")
+    private String specialRequirements;
+
+    @ApiModelProperty("合同创建人")
+    private String contractCreateBy;
+
     public QueryOrderDetailReportBo() {
     public QueryOrderDetailReportBo() {
 
 
     }
     }

@@ -14,6 +14,7 @@ import com.lframework.xingyun.sc.entity.OrderDetailReport;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.QualityOrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.QualityOrderDetailReportExportTaskWorker;
+import com.lframework.xingyun.sc.excel.statistics.StockInOrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
 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.CreateOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
 import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
@@ -64,6 +65,30 @@ public class OrderDetailReportController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 库存合同未锁价订单明细查询
+     */
+    @ApiOperation("库存合同未锁价订单明细查询")
+    @HasPermission({"statistical-report:order-detail:query","statistical-report:quality-order-detail:query"})
+    @GetMapping("/inventoryUnlocked/query")
+    public InvokeResult<PageResult<QueryOrderDetailReportBo>> inventoryUnlockedQuery(@Valid QueryOrderDetailReportVo vo) {
+        vo.setInventoryUnlockedOnly(Boolean.TRUE);
+        vo.setExcludeInventoryUnlocked(null);
+        return query(vo);
+    }
+
+    /**
+     * 库存入库订单明细查询
+     */
+    @ApiOperation("库存入库订单明细查询")
+    @HasPermission({"statistical-report:order-detail:query","statistical-report:quality-order-detail:query"})
+    @GetMapping("/stockIn/query")
+    public InvokeResult<PageResult<QueryOrderDetailReportBo>> stockInQuery(@Valid QueryOrderDetailReportVo vo) {
+        vo.setExcludeInventoryUnlocked(Boolean.TRUE);
+        vo.setInventoryUnlockedOnly(null);
+        return query(vo);
+    }
+
+    /**
      * 根据ID查询
      * 根据ID查询
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
@@ -108,6 +133,34 @@ public class OrderDetailReportController extends DefaultBaseController {
     }
     }
 
 
     /**
     /**
+     * 库存入库订单明细导出
+     */
+    @ApiOperation("库存入库订单明细导出")
+    @HasPermission({"statistical-report:order-detail:export"})
+    @PostMapping("/inventoryUnlocked/export")
+    public InvokeResult<Void> inventoryUnlockedExport(@Valid @RequestBody QueryOrderDetailReportVo vo) {
+        vo.setInventoryUnlockedOnly(Boolean.TRUE);
+        vo.setExcludeInventoryUnlocked(null);
+        vo.setExportType(ExportType.INVENTORY_UNLOCKED_ORDER_DETAIL_REPORT.getCode());
+        ExportTaskUtil.exportTask("库存入库订单明细报表", StockInOrderDetailReportExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
+     * 入库订单明细导出
+     */
+    @ApiOperation("入库订单明细导出")
+    @HasPermission({"statistical-report:order-detail:export"})
+    @PostMapping("/stockIn/export")
+    public InvokeResult<Void> stockInExport(@Valid @RequestBody QueryOrderDetailReportVo vo) {
+        vo.setExcludeInventoryUnlocked(Boolean.TRUE);
+        vo.setInventoryUnlockedOnly(null);
+        vo.setExportType(ExportType.STOCK_IN_ORDER_DETAIL_REPORT.getCode());
+        ExportTaskUtil.exportTask("入库订单明细报表", StockInOrderDetailReportExportTaskWorker.class, vo);
+        return InvokeResultBuilder.success();
+    }
+
+    /**
      * 处理历史数据
      * 处理历史数据
      */
      */
     @ApiOperation("处理历史数据")
     @ApiOperation("处理历史数据")

@@ -286,4 +286,49 @@ public class OrderDetailReport extends BaseEntity implements BaseDto {
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private LocalDateTime updateTime;
     private LocalDateTime updateTime;
 
 
+    /**
+     * 办事处编码
+     */
+    @TableField(exist = false)
+    private String deptCode;
+
+    /**
+     * 客户简称（基础信息-客户简称）
+     */
+    @TableField(exist = false)
+    private String customerShortName;
+
+    /**
+     * 结算方式
+     */
+    @TableField(exist = false)
+    private String settlementTerms;
+
+    /**
+     * 执行标准
+     */
+    @TableField(exist = false)
+    private String executionStandard;
+
+    /**
+     * 结构报表用（合同物料行产品ID）
+     */
+    @TableField(exist = false)
+    private String structureReportUsed;
+
+    /**
+     * 合同类型编码
+     */
+    @TableField(exist = false)
+    private String contractTypeCode;
+
+    /**
+     * 特别注重要求
+     */
+    @TableField(exist = false)
+    private String specialRequirements;
+
+    @TableField(exist = false)
+    private String contractCreateBy;
+
 }
 }

@@ -14,6 +14,8 @@ public enum ExportType implements BaseEnum<String> {
     ORDER_DETAIL_REPORT("ORDER_DETAIL_REPORT", "订单明细报表"),
     ORDER_DETAIL_REPORT("ORDER_DETAIL_REPORT", "订单明细报表"),
     ORDER_EXPORT_ZIP("ORDER_EXPORT_ZIP", "订货单信息"),
     ORDER_EXPORT_ZIP("ORDER_EXPORT_ZIP", "订货单信息"),
     QUALITY_ORDER_DETAIL_REPORT("QUALITY_ORDER_DETAIL_REPORT", "品质科订单明细报表"),
     QUALITY_ORDER_DETAIL_REPORT("QUALITY_ORDER_DETAIL_REPORT", "品质科订单明细报表"),
+    INVENTORY_UNLOCKED_ORDER_DETAIL_REPORT("INVENTORY_UNLOCKED_ORDER_DETAIL_REPORT", "库存入库订单明细报表"),
+    STOCK_IN_ORDER_DETAIL_REPORT("STOCK_IN_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.entity.OrderDetailReport;
+import com.lframework.xingyun.sc.service.statistics.OrderDetailReportService;
+import com.lframework.xingyun.sc.utils.CommonUtil;
+import com.lframework.xingyun.sc.vo.statistics.orderDetail.QueryOrderDetailReportVo;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Date;
+import java.util.stream.Collectors;
+
+public class StockInOrderDetailReportExportTaskWorker implements
+        ExportTaskWorker<QueryOrderDetailReportVo, QueryOrderDetailReportBo, StockInOrderDetailReportModel> {
+
+    @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 StockInOrderDetailReportModel 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);
+
+        StockInOrderDetailReportModel model = new StockInOrderDetailReportModel();
+        model.setOrderNo(data.getOrderNo());
+        model.setDeptCode(convertDeptNameToDeptCode(data.getDeptName()));
+        model.setCustomerShortName(data.getCustomerShortName());
+        model.setOrderDate(toDate(data.getOrderDate()));
+        model.setWorkshopName(data.getWorkshopName());
+        model.setDeptName(data.getDeptName());
+        model.setRegionName(data.getRegionName());
+        model.setCustomerName(data.getOrderingUnitName());
+        model.setIndustry(data.getIndustry());
+        model.setStructureReportUsed(data.getStructureReportUsed());
+        model.setBrand(data.getBrand());
+        model.setThickness(data.getThickness());
+        model.setThicknessTol(thicknessTol);
+        model.setWidth(data.getWidth());
+        model.setWidthTol(widthTol);
+        model.setLength(data.getLength());
+        model.setLengthTol(lengthTol);
+        model.setStatus(data.getStatus());
+        model.setQuantity(data.getQuantity());
+        model.setSuggestedPrice(toBigDecimalOrZero(data.getSuggestedPrice()));
+        model.setDeliveryDate(toDate(data.getDeliveryDate()));
+        model.setAssessmentExceedsAgreement(toBigDecimalOrZero(data.getAssessmentExceedsAgreement()));
+        model.setExecutionStandard(data.getExecutionStandard());
+        model.setSalesPrice(toBigDecimalOrZero(data.getSalesPrice()));
+        model.setPriceListNo(data.getPriceListNo());
+        model.setPackagingFee(toBigDecimalOrZero(data.getPackagingFee()));
+        model.setSettlementTerms(data.getSettlementTerms());
+        model.setPieceWeightHeader(data.getPieceWeightHeader());
+        model.setSurface(data.getSurface());
+        model.setTolerance(data.getTolerance());
+        model.setPerformance(data.getPerformance());
+        model.setPackaging(data.getPackaging());
+        model.setSpecialRequirements(data.getSpecialRequirements());
+        model.setRemarks(data.getRemarks());
+        model.setSalesman(data.getContractCreateBy());
+        model.setShippingCost(toBigDecimalOrZero(data.getShippingCost()));
+        model.setReturnShippingCost(toBigDecimalOrZero(data.getReturnShippingCost()));
+        model.setCustomerType(data.getCustomerType());
+        model.setQuality(data.getQuality());
+        model.setProcessingAndDistributor(data.getContractType());
+        model.setActualCustomer(data.getOrderingUnitName());
+        model.setOrderType(handleContractType(data.getContractTypeCode()));
+        model.setLeadCadmiumPpm("Pb≤ppm\n" + "Cd≤ppm");
+        model.setIronConductivity("Fe≤ppm\n" + "Co+Ni≤ppm\n" + "%IACS");
+        model.setReserve1(data.getIndustry());
+        model.setReserve3(data.getOrderNo());
+        return model;
+    }
+
+    @Override
+    public Class<StockInOrderDetailReportModel> getModelClass() {
+        return StockInOrderDetailReportModel.class;
+    }
+
+    private static Date toDate(LocalDate date) {
+        if (date == null) {
+            return null;
+        }
+        return Date.from(date.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+    private static BigDecimal toBigDecimalOrZero(String value) {
+        if (StringUtils.isBlank(value)) {
+            return BigDecimal.ZERO;
+        }
+        try {
+            return new BigDecimal(value.trim());
+        } catch (Exception e) {
+            return BigDecimal.ZERO;
+        }
+    }
+
+    private static String handleContractType(String contractType) {
+        if ("DISTRIB_STD".equals(contractType)) {
+            return "经销标准";
+        }
+        if ("DIST_STOCK_CONTRACT".equals(contractType)) {
+            return "经销库存";
+        }
+        if ("DRAFT_DIST_AGMT".equals(contractType)) {
+            return "经销未锁规";
+        }
+        if ("INTL_STD_CONTRACT".equals(contractType)) {
+            return "外贸标准";
+        }
+        if ("INTL_INVENTORY_AGMT".equals(contractType)) {
+            return "外贸库存";
+        }
+        if ("INTL_OPEN_SPEC_AGMT".equals(contractType)) {
+            return "外贸未锁规";
+        }
+        if ("PROCESS_STD_AGMT".equals(contractType)) {
+            return "加工标准";
+        }
+        return null;
+    }
+
+    private static String convertDeptNameToDeptCode(String deptName) {
+        if (StringUtils.isBlank(deptName)) {
+            return null;
+        }
+        String name = deptName.trim();
+        if (name.contains("北方")) {
+            return "BF";
+        }
+        if (name.contains("常州")) {
+            return "CZ";
+        }
+        if (name.contains("东莞")) {
+            return "DG";
+        }
+        if (name.contains("佛山")) {
+            return "FS";
+        }
+        if (name.contains("宁波")) {
+            return "NB";
+        }
+        if (name.contains("苏州")) {
+            return "SZ";
+        }
+        if (name.contains("温州")) {
+            return "WZ";
+        }
+        if (name.contains("紫铜")) {
+            return "ZT";
+        }
+        if (name.contains("外贸")) {
+            return "WM";
+        }
+        return null;
+    }
+}
+

+package com.lframework.xingyun.sc.excel.statistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
+import com.lframework.starter.common.constants.StringPool;
+import com.lframework.starter.web.core.components.excel.ExcelModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 库存入库订单明细
+ */
+@Data
+public class StockInOrderDetailReportModel implements ExcelModel {
+
+    @ExcelProperty(value = "订单编号", index = 0)
+    private String orderNo;
+
+    @ExcelProperty(value = "办事处编码", index = 1)
+    private String deptCode;
+
+    @ExcelProperty(value = "客户简称", index = 2)
+    private String customerShortName;
+
+    @ExcelProperty(value = "订货日期", index = 3)
+    @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN)
+    private Date orderDate;
+
+    @ExcelProperty(value = "生产厂", index = 4)
+    private String workshopName;
+
+    @ExcelProperty(value = "科办", index = 5)
+    private String deptName;
+
+    @ExcelProperty(value = "片", index = 6)
+    private String regionName;
+
+    @ExcelProperty(value = "客户名称", index = 7)
+    private String customerName;
+
+    @ExcelProperty(value = "行业（用途）", index = 8)
+    private String industry;
+
+    @ExcelProperty(value = "结构报表用", index = 9)
+    private String structureReportUsed;
+
+    @ExcelProperty(value = "牌号", index = 10)
+    private String brand;
+
+    @ExcelProperty(value = "厚", index = 11)
+    private BigDecimal thickness;
+
+    @ExcelProperty(value = "误差", index = 12)
+    private String thicknessTol;
+
+    @ExcelProperty(value = "宽", index = 13)
+    private BigDecimal width;
+
+    @ExcelProperty(value = "误差", index = 14)
+    private String widthTol;
+
+    @ExcelProperty(value = "长", index = 15)
+    private BigDecimal length;
+
+    @ExcelProperty(value = "误差", index = 16)
+    private String lengthTol;
+
+    @ExcelProperty(value = "状态", index = 17)
+    private String status;
+
+    @ExcelProperty(value = "订单数量", index = 18)
+    private BigDecimal quantity;
+
+    @ExcelProperty(value = "指导价", index = 19)
+    private BigDecimal suggestedPrice;
+
+    @ExcelProperty(value = "交货日期", index = 20)
+    @DateTimeFormat(StringPool.EXCEL_DATE_PATTERN)
+    private Date deliveryDate;
+
+    @ExcelProperty(value = "超价协调价", index = 21)
+    private BigDecimal assessmentExceedsAgreement;
+
+    @ExcelProperty(value = "执行标准", index = 22)
+    private String executionStandard;
+
+    @ExcelProperty(value = "销售价", index = 23)
+    private BigDecimal salesPrice;
+
+    @ExcelProperty(value = "价格表编号", index = 24)
+    private String priceListNo;
+
+    @ExcelProperty(value = "包装费", index = 25)
+    private BigDecimal packagingFee;
+
+    @ExcelProperty(value = "结算方式", index = 26)
+    private String settlementTerms;
+
+    @ExcelProperty(value = "件重条头", index = 27)
+    private String pieceWeightHeader;
+
+    @ExcelProperty(value = "表面", index = 28)
+    private String surface;
+
+    @ExcelProperty(value = "公差", index = 29)
+    private String tolerance;
+
+    @ExcelProperty(value = "性能", index = 30)
+    private String performance;
+
+    @ExcelProperty(value = "包装", index = 31)
+    private String packaging;
+
+    @ExcelProperty(value = "特别注重要求", index = 32)
+    private String specialRequirements;
+
+    @ExcelProperty(value = "备注", index = 33)
+    private String remarks;
+
+    @ExcelProperty(value = "业务员", index = 34)
+    private String salesman;
+
+    @ExcelProperty(value = "运费", index = 35)
+    private BigDecimal shippingCost;
+
+    @ExcelProperty(value = "回程运费", index = 36)
+    private BigDecimal returnShippingCost;
+
+    @ExcelProperty(value = "客户类型", index = 37)
+    private String customerType;
+
+    @ExcelProperty(value = "品质", index = 38)
+    private String quality;
+
+    @ExcelProperty(value = "加工双经销", index = 39)
+    private String processingAndDistributor;
+
+    @ExcelProperty(value = "实际客户", index = 40)
+    private String actualCustomer;
+
+    @ExcelProperty(value = "订单类型", index = 41)
+    private String orderType;
+
+    @ExcelProperty(value = "铅、镉含量ppm", index = 42)
+    private String leadCadmiumPpm;
+
+    @ExcelProperty(value = "铁含量导电率%IACS", index = 43)
+    private String ironConductivity;
+
+    @ExcelProperty(value = "备用", index = 44)
+    private String reserve1;
+
+    @ExcelProperty(value = "加工来料", index = 45)
+    private String processingIncomingMaterial;
+
+    @ExcelProperty(value = "加工料补价代购锌锭", index = 46)
+    private String processingExtraPriceOrPurchaseZinc;
+
+    @ExcelProperty(value = "备用", index = 47)
+    private String reserve2;
+
+    @ExcelProperty(value = "备用", index = 48)
+    private String reserve3;
+
+    @ExcelProperty(value = "备用", index = 49)
+    private String reserve4;
+
+    @ExcelProperty(value = "其中行业", index = 50)
+    private String industryIncluded;
+
+    @ExcelProperty(value = "行业", index = 51)
+    private String industryStandard;
+
+    @ExcelProperty(value = "客户简称", index = 52)
+    private String customerShortName2;
+
+    @ExcelProperty(value = "品种", index = 53)
+    private String variety;
+
+    @ExcelProperty(value = "三厂库存", index = 54)
+    private String thirdFactoryStock;
+
+    @ExcelProperty(value = "电缆分类", index = 55)
+    private String cableCategory;
+
+    @ExcelProperty(value = "备用", index = 56)
+    private String reserve5;
+
+    @ExcelProperty(value = "备用", index = 57)
+    private String reserve6;
+
+    @ExcelProperty(value = "备用", index = 58)
+    private String reserve7;
+
+    @ExcelProperty(value = "备用", index = 59)
+    private String reserve8;
+
+    @ExcelProperty(value = "备用", index = 60)
+    private String reserve9;
+
+    @ExcelProperty(value = "备用", index = 61)
+    private String reserve10;
+
+    @ExcelProperty(value = "备用", index = 62)
+    private String reserve11;
+
+    @ExcelProperty(value = "备用", index = 63)
+    private String reserve12;
+
+    @ExcelProperty(value = "备用", index = 64)
+    private String reserve13;
+
+    @ExcelProperty(value = "备用", index = 65)
+    private String reserve14;
+
+    @ExcelProperty(value = "备用", index = 66)
+    private String reserve15;
+
+    @ExcelProperty(value = "备用", index = 67)
+    private String reserve16;
+
+    @ExcelProperty(value = "备用", index = 68)
+    private String reserve17;
+
+    @ExcelProperty(value = "备用", index = 69)
+    private String reserve18;
+
+    @ExcelProperty(value = "备用", index = 70)
+    private String reserve19;
+
+    @ExcelProperty(value = "备用", index = 71)
+    private String reserve20;
+
+    @ExcelProperty(value = "备用", index = 72)
+    private String reserve21;
+
+    @ExcelProperty(value = "备用", index = 73)
+    private String reserve22;
+
+    @ExcelProperty(value = "备用", index = 74)
+    private String reserve23;
+
+    @ExcelProperty(value = "备用", index = 75)
+    private String reserve24;
+
+    @ExcelProperty(value = "备用", index = 76)
+    private String reserve25;
+
+    @ExcelProperty(value = "备用", index = 77)
+    private String reserve26;
+
+    @ExcelProperty(value = "备用", index = 78)
+    private String reserve27;
+
+    @ExcelProperty(value = "备用", index = 79)
+    private String reserve28;
+
+    @ExcelProperty(value = "备用", index = 80)
+    private String reserve29;
+
+    @ExcelProperty(value = "备用", index = 81)
+    private String reserve30;
+
+    @ExcelProperty(value = "备用", index = 82)
+    private String reserve31;
+
+    @ExcelProperty(value = "备用", index = 83)
+    private String reserve32;
+
+    @ExcelProperty(value = "备用", index = 84)
+    private String reserve33;
+
+    @ExcelProperty(value = "备用", index = 85)
+    private String reserve34;
+
+    @ExcelProperty(value = "备用", index = 86)
+    private String reserve35;
+}

@@ -95,4 +95,10 @@ public class QueryOrderDetailReportVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
     private String status;
     private String status;
 
 
+    @ApiModelProperty("仅查询库存合同未锁价订单明细")
+    private Boolean inventoryUnlockedOnly;
+
+    @ApiModelProperty("排除库存合同未锁价订单明细（入库订单明细）")
+    private Boolean excludeInventoryUnlocked;
+
 }
 }

@@ -54,6 +54,13 @@
         <result column="update_by" property="updateBy"/>
         <result column="update_by" property="updateBy"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_time" property="updateTime"/>
+        <result column="customer_short_name" property="customerShortName"/>
+        <result column="settlement_terms" property="settlementTerms"/>
+        <result column="execution_standard" property="executionStandard"/>
+        <result column="structure_report_used" property="structureReportUsed"/>
+        <result column="contract_type_code" property="contractTypeCode"/>
+        <result column="special_requirements" property="specialRequirements"/>
+        <result column="contract_create_by" property="contractCreateBy"/>
     </resultMap>
     </resultMap>
 
 
     <sql id="OrderDetailReport_sql">
     <sql id="OrderDetailReport_sql">
@@ -197,9 +204,25 @@
         tb.update_by,
         tb.update_by,
         tb.create_time,
         tb.create_time,
         tb.update_time,
         tb.update_time,
+        cs.short_name AS customer_short_name,
+        poi.settlement_terms AS settlement_terms,
+        poi.execution_standard AS execution_standard,
+        CASE
+            WHEN c.type = 'PROCESS_STD_AGMT' THEN pl.product_id
+            ELSE cl.product_id
+        END AS structure_report_used,
+        c.type AS contract_type_code,
+        c.special_terms AS special_requirements,
+        c.create_by AS contract_create_by,
         MAX(tb.create_time) OVER (PARTITION BY tb.order_no, tb.purchase_order_line_id) AS group_latest_time
         MAX(tb.create_time) OVER (PARTITION BY tb.order_no, tb.purchase_order_line_id) AS group_latest_time
         FROM order_detail_report tb
         FROM order_detail_report tb
         LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
         LEFT JOIN base_data_workshop ws ON ws.id = tb.workshop_id
+        LEFT JOIN tbl_purchase_order_line pol ON pol.id = tb.purchase_order_line_id
+        LEFT JOIN purchase_order_info poi ON poi.id = pol.purchase_order_id
+        LEFT JOIN tbl_contract_distributor_standard c ON c.id = poi.contract_id
+        LEFT JOIN base_data_customer_short cs ON cs.customer_id = poi.ordering_unit
+        LEFT JOIN tbl_contract_distributor_line cl ON cl.id = pol.contract_distributor_line_id
+        LEFT JOIN tbl_contract_std_processing_line pl ON pl.id = pol.contract_distributor_line_id
         <where>
         <where>
             <if test="vo.ids != null and !vo.ids.isEmpty()">
             <if test="vo.ids != null and !vo.ids.isEmpty()">
                 AND tb.id IN
                 AND tb.id IN
@@ -256,6 +279,14 @@
             <if test="vo.status != null and vo.status != ''">
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
                 AND tb.status = #{vo.status}
             </if>
             </if>
+            <if test="vo.inventoryUnlockedOnly != null and vo.inventoryUnlockedOnly">
+                AND c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT')
+                AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
+            </if>
+            <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
+                AND NOT (c.type IN ('DIST_STOCK_CONTRACT','INTL_INVENTORY_AGMT')
+                AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL))
+            </if>
         </where>
         </where>
         ) t
         ) t
         ORDER BY
         ORDER BY