报表：入库订单明细报表

@@ -15,6 +15,7 @@ import com.lframework.xingyun.sc.enums.ExportType;
 import com.lframework.xingyun.sc.excel.statistics.OrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.QualityOrderDetailReportExportTaskWorker;
 import com.lframework.xingyun.sc.excel.statistics.StockInOrderDetailReportExportTaskWorker;
+import com.lframework.xingyun.sc.excel.statistics.StockInboundOrderDetailReportExportTaskWorker;
 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;
@@ -93,7 +94,15 @@ public class OrderDetailReportController extends DefaultBaseController {
     public InvokeResult<PageResult<QueryOrderDetailReportBo>> stockInQuery(@Valid QueryOrderDetailReportVo vo) {
         vo.setExcludeInventoryUnlocked(Boolean.TRUE);
         vo.setInventoryUnlockedOnly(null);
-        return query(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));
     }
 
     /**
@@ -164,7 +173,7 @@ public class OrderDetailReportController extends DefaultBaseController {
         vo.setExcludeInventoryUnlocked(Boolean.TRUE);
         vo.setInventoryUnlockedOnly(null);
         vo.setExportType(ExportType.STOCK_IN_ORDER_DETAIL_REPORT.getCode());
-        ExportTaskUtil.exportTask("入库订单明细报表", StockInOrderDetailReportExportTaskWorker.class, vo);
+        ExportTaskUtil.exportTask("入库订单明细报表", StockInboundOrderDetailReportExportTaskWorker.class, vo);
         return InvokeResultBuilder.success();
     }
 

+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 StockInboundOrderDetailReportExportTaskWorker implements
+        ExportTaskWorker<QueryOrderDetailReportVo, QueryOrderDetailReportBo, StockInboundOrderDetailReportModel> {
+
+    @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 StockInboundOrderDetailReportModel 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);
+
+        StockInboundOrderDetailReportModel model = new StockInboundOrderDetailReportModel();
+        model.setDate(toDate(data.getOrderDate()));
+        model.setOrderNo(data.getOrderNo());
+        model.setDeptCode(data.getDeptCode());
+        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(stringToBigDecimal(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(stringToBigDecimal(data.getShippingCost()));
+        model.setReturnShippingCost(stringToBigDecimal(data.getReturnShippingCost()));
+        model.setCustomerType(data.getCustomerType());
+        model.setQuality(data.getQuality());
+        model.setProcessingAndDistributor(data.getContractType());
+        model.setActualCustomer(data.getOrderingUnitName());
+        model.setOrderType(data.getContractTypeName());
+        model.setLeadCadmiumPpm("Pb≤ppm\n" + "Cd≤ppm");
+        model.setIronConductivity("Fe≤ppm\n" + "Co+Ni≤ppm\n" + "%IACS");
+        model.setReserve3(data.getOrderNo());
+        model.setReserve4(data.getOrderNo());
+        return model;
+    }
+
+    @Override
+    public Class<StockInboundOrderDetailReportModel> getModelClass() {
+        return StockInboundOrderDetailReportModel.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;
+        }
+    }
+
+    public static BigDecimal stringToBigDecimal(String str) {
+        // 1. 判空处理：如果为 null 或去除空格后为空字符串，直接返回 null
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+
+        // 2. 尝试转换
+        try {
+            // 建议先 trim() 去除首尾空格，避免 " 100 " 这种格式报错
+            return new BigDecimal(str.trim());
+        } catch (NumberFormatException e) {
+            // 3. 如果字符串格式不合法（如 "abc"），根据业务需求处理，这里同样返回 null
+            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.web.core.components.excel.ExcelModel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 入库订单明细
+ */
+@Data
+public class StockInboundOrderDetailReportModel implements ExcelModel {
+
+    @ExcelProperty(value = "日期", index = 0)
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date date;
+
+    @ExcelProperty(value = "订单编号", index = 1)
+    private String orderNo;
+
+    @ExcelProperty(value = "办事处编码", index = 2)
+    private String deptCode;
+
+    @ExcelProperty(value = "客户简称", index = 3)
+    private String customerShortName;
+
+    @ExcelProperty(value = "订货日期", index = 4)
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date orderDate;
+
+    @ExcelProperty(value = "生产厂", index = 5)
+    private String workshopName;
+
+    @ExcelProperty(value = "科办", index = 6)
+    private String deptName;
+
+    @ExcelProperty(value = "片", index = 7)
+    private String regionName;
+
+    @ExcelProperty(value = "客户名称", index = 8)
+    private String customerName;
+
+    @ExcelProperty(value = "行业（用途）", index = 9)
+    private String industry;
+
+    @ExcelProperty(value = "结构报表用", index = 10)
+    private String structureReportUsed;
+
+    @ExcelProperty(value = "牌号", index = 11)
+    private String brand;
+
+    @ExcelProperty(value = "厚", index = 12)
+    private BigDecimal thickness;
+
+    @ExcelProperty(value = "误差", index = 13)
+    private String thicknessTol;
+
+    @ExcelProperty(value = "宽", index = 14)
+    private BigDecimal width;
+
+    @ExcelProperty(value = "误差", index = 15)
+    private String widthTol;
+
+    @ExcelProperty(value = "长", index = 16)
+    private BigDecimal length;
+
+    @ExcelProperty(value = "误差", index = 17)
+    private String lengthTol;
+
+    @ExcelProperty(value = "状态", index = 18)
+    private String status;
+
+    @ExcelProperty(value = "订单数量", index = 19)
+    private BigDecimal quantity;
+
+    @ExcelProperty(value = "指导价", index = 20)
+    private BigDecimal suggestedPrice;
+
+    @ExcelProperty(value = "交货日期", index = 21)
+    @DateTimeFormat("yyyy-MM-dd")
+    private Date deliveryDate;
+
+    @ExcelProperty(value = "超价协调价", index = 22)
+    private BigDecimal assessmentExceedsAgreement;
+
+    @ExcelProperty(value = "执行标准", index = 23)
+    private String executionStandard;
+
+    @ExcelProperty(value = "销售价", index = 24)
+    private BigDecimal salesPrice;
+
+    @ExcelProperty(value = "价格表编号", index = 25)
+    private String priceListNo;
+
+    @ExcelProperty(value = "包装费", index = 26)
+    private BigDecimal packagingFee;
+
+    @ExcelProperty(value = "结算方式", index = 27)
+    private String settlementTerms;
+
+    @ExcelProperty(value = "件重条头", index = 28)
+    private String pieceWeightHeader;
+
+    @ExcelProperty(value = "表面", index = 29)
+    private String surface;
+
+    @ExcelProperty(value = "公差", index = 30)
+    private String tolerance;
+
+    @ExcelProperty(value = "性能", index = 31)
+    private String performance;
+
+    @ExcelProperty(value = "包装", index = 32)
+    private String packaging;
+
+    @ExcelProperty(value = "特别注重要求", index = 33)
+    private String specialRequirements;
+
+    @ExcelProperty(value = "备注", index = 34)
+    private String remarks;
+
+    @ExcelProperty(value = "业务员", index = 35)
+    private String salesman;
+
+    @ExcelProperty(value = "运费", index = 36)
+    private BigDecimal shippingCost;
+
+    @ExcelProperty(value = "回程运费", index = 37)
+    private BigDecimal returnShippingCost;
+
+    @ExcelProperty(value = "客户类型", index = 38)
+    private String customerType;
+
+    @ExcelProperty(value = "品质", index = 39)
+    private String quality;
+
+    @ExcelProperty(value = "加工双经销", index = 40)
+    private String processingAndDistributor;
+
+    @ExcelProperty(value = "实际客户", index = 41)
+    private String actualCustomer;
+
+    @ExcelProperty(value = "订单类型", index = 42)
+    private String orderType;
+
+    @ExcelProperty(value = "铅、镉含量ppm", index = 43)
+    private String leadCadmiumPpm;
+
+    @ExcelProperty(value = "铁含量导电率%IACS", index = 44)
+    private String ironConductivity;
+
+    @ExcelProperty(value = "备用", index = 45)
+    private String reserve1;
+
+    @ExcelProperty(value = "加工来料", index = 46)
+    private String processingIncomingMaterial;
+
+    @ExcelProperty(value = "加工料补价代购锌锭", index = 47)
+    private String processingExtraPriceOrPurchaseZinc;
+
+    @ExcelProperty(value = "备用", index = 48)
+    private String reserve2;
+
+    @ExcelProperty(value = "原库存订单号", index = 49)
+    private String reserve3;
+
+    @ExcelProperty(value = "备用", index = 50)
+    private String reserve4;
+}
+

@@ -288,18 +288,17 @@
                 AND (c.price_spec_locked = 0 OR c.price_spec_locked IS NULL)
             </if>
             <if test="vo.excludeInventoryUnlocked != null and vo.excludeInventoryUnlocked">
-                -- 没关联上合同表的数据（集合C），直接保留
-                c.id IS NULL
+                AND (c.id IS NULL
                 OR
-                -- 关联上了，但不满足那4个特定条件的数据（集合B），保留
                 NOT(
-                    c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
-                    AND c.status = 'FORMAL'
-                    AND poi.type = 'PRODUCTION'
-                    AND (
-                        c.price_spec_locked = 0
-                        OR c.price_spec_locked IS NULL
-                    )
+                c.type IN ('DIST_STOCK_CONTRACT', 'INTL_INVENTORY_AGMT')
+                AND c.status = 'FORMAL'
+                AND poi.type = 'PRODUCTION'
+                AND (
+                c.price_spec_locked = 0
+                OR c.price_spec_locked IS NULL
+                )
+                )
                 )
             </if>
         </where>