fix(oms,wms): 入库反审修复：已反审tab列表查不到数据、未下发单反审补写反审记录

1. W收货单/W上架单【已反审】tab查不到数据：queryList 的 LEFT JOIN stock_in_order 固定带 a/b.DEL_FLAG=1，归档数据(反审后双方均已软删del_flag=2)关联不上b表，仓库/货主等基于b表的过滤条件把行全部过滤掉；改为按是否查反审归档动态切换关联条件(归档按del_flag=2关联，正常列表行为不变)

2. 未下发WMS的执行单反审不产生反审记录：reverseExecutionOrder 幂等跳过分支直接return导致入库异常无留痕；现补写1条反审记录(abnormalType=6，回退库存0，备注未下发WMS)，同单号已有有效记录时防重，重试/重复反审幂等

3. OMS反审Feign参数透传组织三字段(organizationId/organizationName/topOrganizationId)，供WMS跳过分支写反审记录使用(该场景无W入库单可取组织信息)

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/BmsServiceFeign.java

@@ -19,7 +19,7 @@ import java.util.Set;
 /**
  * bms财务结算系统feign调用接口
  */
-@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.102.192.32:8012",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "BmsService", value = ServiceNameConstants.BMS_SERVICE, url = "http://10.33.0.109:8012",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface BmsServiceFeign {
 
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/OmsServiceFeign.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
-@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.102.192.33:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "OmsService", value = ServiceNameConstants.OMS_SERVICE,url = "http://10.33.0.99:8017",fallbackFactory = RemoteOmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface OmsServiceFeign {
 
 

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WlhyServiceFeign.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.102.192.31:8014",configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "commonWlhyServiceFeign",value = ServiceNameConstants.WLHY_SERVICE,url = "http://10.33.0.129:8014",configuration = FeignAutoConfiguration.class)
 public interface WlhyServiceFeign {
 
     /**

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/WmsServiceFeign.java

@@ -21,7 +21,7 @@ import java.util.Map;
  * @description: TODO
  * @date 2024/5/10 8:58
  **/
-@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE,url = "http://10.102.192.32:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "remoteWmsServiceFeign",value = ServiceNameConstants.WMS_SERVICE,url = "http://10.33.0.109:8016",fallbackFactory = RemoteWmsFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface WmsServiceFeign {
 
     /**
@@ -133,6 +133,27 @@ public interface WmsServiceFeign {
     @PostMapping(value = "/stockInOrderApi/omsCancelInOrder")
     public AjaxResult omsCancelInOrder(@RequestBody StockInOrder stockInOrder);
 
+    /**
+     * oms出库执行单反审（已出库/已复核单据客户通知回退场景）：WMS侧还原实物库存并推送OMS库存、
+     * 逻辑删除出库链路单据、生成1条出库异常【反审记录】；反审原因经 remark 透传。
+     * 已产生下游不可逆数据时返回错误，OMS据此整体回滚。
+     */
+    @ApiOperation("oms出库执行单反审WMS回退")
+    @PostMapping(value = "/stockOutOrderApi/omsReverseExecutionOrder")
+    public AjaxResult omsReverseExecutionOrder(@RequestBody StockOutOrder stockOutOrder);
+
+    /**
+     * oms入库业务单反审：WMS侧一个事务内回退已入库/收货中/上架中单据——
+     * 校验未产生出库（按入库单号+动作"分配库存/出库"查库存调整记录>0即有出库） ->
+     * 按库存行整行回退库存扣减 -> 软删W入库单/W收货单/W上架单全链并打已反审标记
+     * （各页面【已反审】tab按"已软删+已反审"查询归档数据）-> 写1条入库异常【反审记录】(type=3)。
+     * 入参: inOrderNumber=执行入库单号, remark=业务单号+反审原因, updateBy/updateByName=反审人;
+     * WMS无该单数据时幂等返回成功(未下发单反审不产生WMS数据)。
+     */
+    @ApiOperation("oms入库单反审WMS回退")
+    @PostMapping(value = "/stockInOrderApi/omsReverseInOrder")
+    public AjaxResult omsReverseInOrder(@RequestBody StockInOrder stockInOrder);
+
     @ApiOperation("oms查询物料列表")
     @GetMapping("/materialBaseInfoApi/queryList")
     public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO);

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/YmsServiceFeign.java

@@ -9,7 +9,7 @@ import com.mhd.system.api.feign.FeignAutoConfiguration;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
-@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.102.192.33:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "YmsService", value = ServiceNameConstants.YMS_SERVICE,url = "http://10.33.0.99:8018",fallbackFactory = RemoteBmsFeignFallbackFactory.class, configuration = FeignAutoConfiguration.class)
 public interface YmsServiceFeign {
 
     /**

mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/factory/RemoteWmsFallbackFactory.java

@@ -82,6 +82,12 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
                 return AjaxResult.error("WMS取消下发清理失败：" + cause.getMessage());
             }
 
+            @Override
+            public AjaxResult omsReverseExecutionOrder(StockOutOrder stockOutOrder) {
+                //返回错误而非静默成功，让OMS反审事务能感知失败并整体回滚
+                return AjaxResult.error("WMS出库执行单反审失败（服务降级）：" + cause.getMessage());
+            }
+
             @Override
             public void omsAutoAssign(StockOutOrderDTO stockOutOrderDTO) {
 
@@ -110,6 +116,12 @@ public class RemoteWmsFallbackFactory implements FallbackFactory<WmsServiceFeign
                 return AjaxResult.error("WMS取消下发清理失败：" + cause.getMessage());
             }
 
+            @Override
+            public AjaxResult omsReverseInOrder(StockInOrder stockInOrder) {
+                //返回错误而非静默成功，让OMS侧反审能感知回退失败并整体回滚（反审可重试，WMS回退幂等）
+                return AjaxResult.error("WMS入库单反审回退失败（服务降级）：" + cause.getMessage());
+            }
+
             @Override
             public TableDataInfo getMaterialBaseInfoList(MaterialInfoDTO materialInfoDTO) {
                 TableDataInfo tableDataInfo = new TableDataInfo();

mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java

@@ -26,7 +26,7 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
 
-@FeignClient(value = "mhd-third-party-service",url = "http://10.102.192.31:8012", configuration = FeignAutoConfiguration.class)
+@FeignClient(value = "mhd-third-party-service",url = "http://10.33.0.129:8012", configuration = FeignAutoConfiguration.class)
 public interface ThirdPartyServiceFeign {
 
     //查询当前组织所有三方接口信息

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailPO.java

@@ -501,6 +501,6 @@ public class ExecutionInMaterialDetailPO extends ExecutionStockInOrderBasePO {
     private BigDecimal insureAmount;
 
     @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
-    @Excel(name = "货物类型")
+    @Excel(name = "货物类型", readConverterExp = "0=物料,1=半成品,2=成品")
     private Integer goodsType;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java

@@ -1,5 +1,7 @@
 package com.mhd.oms.domain.executionInMaterialDetail.repository.po;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -15,21 +17,34 @@ import java.util.Date;
 public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDetailPO {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
+    @ApiModelProperty("入库单流转状态(参考): 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
     private Integer inOrderStatus;
 
+    @ApiModelProperty("入库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已入库（WMS回写status=5时同步/推送创建时置4，前端状态列绑定此字段）")
+    @Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已入库")
+    private Integer issueStatus;
+
+    @ApiModelProperty("货物种类(物料分类名称，多个逗号分隔)")
+    @Excel(name = "货物种类")
+    private String materialClassifyName;
+
     @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
     private Integer inOrderAuditStatus;
 
     @ApiModelProperty("货主ID")
     private Long orderShipperId;
 
     @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
     private String orderShipperCode;
 
     @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
     private String orderShipperName;
 
     @ApiModelProperty("入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "入仓日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date warehouseDate;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/ExecutionInMaterialDetailQueryDTO.java

@@ -45,6 +45,12 @@ public class ExecutionInMaterialDetailQueryDTO extends BaseVOEntity {
     @ApiModelProperty("入库单类型编码")
     private String inOrderTypeCode;
 
+    @ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
+    private String orderTypeCode;
+
+    @ApiModelProperty("入库单类型名称(模糊查询)")
+    private String orderTypeName;
+
     @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
     private Integer inStatus;
 
@@ -66,4 +72,10 @@ public class ExecutionInMaterialDetailQueryDTO extends BaseVOEntity {
 
     @ApiModelProperty("物料名称")
     private String materialName;
+
+    @ApiModelProperty("实际入仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateStart;
+
+    @ApiModelProperty("实际入仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateEnd;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/QueryOrderOverStockDO.java

@@ -78,6 +78,12 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @Excel(name = "入库单类型编码")
     private String inOrderTypeCode;
 
+    @ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
+    private String orderTypeCode;
+
+    @ApiModelProperty("入库单类型名称")
+    private String orderTypeName;
+
     @ApiModelProperty("入库单类型名称")
     @Excel(name = "入库单类型名称")
     private String inOrderTypeName;
@@ -137,4 +143,10 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
     @Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
     private Integer overStockStatus;
+
+    @ApiModelProperty("实际入仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateStart;
+
+    @ApiModelProperty("实际入仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateEnd;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailApplicationService.java

@@ -85,4 +85,21 @@ public class ExecutionInMaterialDetailApplicationService {
         return inMaterialDetailDomainService.queryInOrderDetailList(queryOrderOverStockDO);
     }
 
+    /**
+     * 入库明细导出（全字段，口径同 queryInOrderDetailList，不分页）
+     */
+    public List<ExecutionInMaterialDetailWithOrderPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        List<ExecutionInMaterialDetailWithOrderPO> list = queryInOrderDetailList(queryOrderOverStockDO);
+        // 货物种类=挂载分类的父级分类名称：material_classify_name为分类路径(如"食品,饮料")，取倒数第二段；
+        // 仅一级分类(无父级)时取自身名称
+        for (ExecutionInMaterialDetailWithOrderPO po : list) {
+            String names = po.getMaterialClassifyName();
+            if (names != null && names.contains(",")) {
+                String[] parts = names.split(",");
+                po.setMaterialClassifyName(parts[parts.length - 2].trim());
+            }
+        }
+        return list;
+    }
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/entity/ExecutionOutMaterialDetail.java

@@ -518,4 +518,7 @@ public class ExecutionOutMaterialDetail extends BaseVOEntity {
     private String inLineNumGw;
     private String opWhLocGw;
     private String warehouseGw;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(业务单反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/po/ExecutionOutMaterialDetailWithOrderPO.java

@@ -1,6 +1,7 @@
 package com.mhd.oms.domain.executionOutMaterialDetail.repository.po;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -18,34 +19,49 @@ import java.util.Date;
 public class ExecutionOutMaterialDetailWithOrderPO extends ExecutionOutMaterialDetailPO {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty("出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
+    @ApiModelProperty("出库单流转状态(参考): 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接；WMS出库完成不回写此字段")
     private Integer outOrderStatus;
 
+    @ApiModelProperty("出库单展示状态: 0-已创建 2-已审核 3-已驳回 4-已出库（WMS出库完成/推送创建时回写，前端状态列绑定此字段）")
+    @Excel(name = "单据状态", readConverterExp = "0=已创建,2=已审核,3=已驳回,4=已出库")
+    private Integer issueStatus;
+
     @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
     private Integer outOrderAuditStatus;
 
     @ApiModelProperty("货主ID")
     private Long orderShipperId;
 
     @ApiModelProperty("货主编码")
+    @Excel(name = "货主编码")
     private String orderShipperCode;
 
     @ApiModelProperty("货主名称")
+    @Excel(name = "货主名称")
     private String orderShipperName;
 
     @ApiModelProperty("出仓日期")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderOutboundDate;
 
     @ApiModelProperty("出库时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出库时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderOutboundTime;
 
     @ApiModelProperty("保额")
+    @Excel(name = "保额")
     private BigDecimal insureAmount;
 
     @ApiModelProperty("货物类型:0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型", readConverterExp = "0=物料,1=半成品,2=成品")
     private Integer goodsType;
+
+    @ApiModelProperty("货物种类(物料分类名称，多个逗号分隔)")
+    @Excel(name = "货物种类")
+    private String materialClassifyName;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionOutMaterialDetail/repository/todo/ExecutionOutMaterialDetailQueryDTO.java

@@ -45,6 +45,12 @@ public class ExecutionOutMaterialDetailQueryDTO extends BaseVOEntity {
     @ApiModelProperty("出库单类型编码")
     private String outOrderTypeCode;
 
+    @ApiModelProperty("出库单类型编码(与outOrderTypeCode同义)")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称(模糊查询)")
+    private String orderTypeName;
+
     @ApiModelProperty("出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭")
     private Integer outStatus;
 
@@ -66,4 +72,10 @@ public class ExecutionOutMaterialDetailQueryDTO extends BaseVOEntity {
 
     @ApiModelProperty("物料名称")
     private String materialName;
+
+    @ApiModelProperty("实际出仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateStart;
+
+    @ApiModelProperty("实际出仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateEnd;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/entity/ExecutionStockInOrder.java

@@ -459,4 +459,21 @@ public class ExecutionStockInOrder extends BaseVOEntity {
 
     @ApiModelProperty("通知单备注")
     private String noticeRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/po/ExecutionStockInOrderPO.java

@@ -482,4 +482,21 @@ public class ExecutionStockInOrderPO extends BaseVOEntity {
     private String khdm;
     @ApiModelProperty("通知单备注")
     private String noticeRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDO.java

@@ -513,4 +513,21 @@ public class ExecutionStockInOrderDO extends BaseVOEntity {
     private String businessPriceWay;
     @ApiModelProperty("通知单备注")
     private String noticeRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/repository/todo/ExecutionStockInOrderDTO.java

@@ -510,4 +510,21 @@ public class ExecutionStockInOrderDTO extends ExecutionStockInOrderBaseDTO {
     private String businessPriceWay;
     @ApiModelProperty("通知单备注")
     private String noticeRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderApplicationService.java

@@ -263,7 +263,16 @@ public class ExecutionStockInOrderApplicationService {
      */
     public ExecutionStockInOrderPO getInfo(Long inOrderId)
     {
-        ExecutionStockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId);
+        return getInfo(inOrderId, false);
+    }
+
+    /**
+     * 获取入库执行单详情（getReverseAuditInfo 归档详情复用）
+     * @param archive true-查询【已反审】tab 归档数据
+     */
+    public ExecutionStockInOrderPO getInfo(Long inOrderId, boolean archive)
+    {
+        ExecutionStockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId, archive);
         String userNcCode = reservationStockInOrderMapper.getUserNcCode(info.getShipperId());
         info.setKhdm(userNcCode);
         List<ExecutionInMaterialDetailPO> materialDetailList = info.getMaterialDetailList();
@@ -276,6 +285,14 @@ public class ExecutionStockInOrderApplicationService {
         return info;
     }
 
+    /**
+     * 查询入库执行单【已反审】tab 归档详情（已软删+已反审标记的数据，含软删明细）
+     */
+    public ExecutionStockInOrderPO getReverseAuditInfo(Long inOrderId)
+    {
+        return getInfo(inOrderId, true);
+    }
+
 
 
     /**

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockInOrder/service/ExecutionStockInOrderDomainService.java

@@ -314,14 +314,31 @@ public class ExecutionStockInOrderDomainService {
      * 获取入库单详细信息
      */
     public ExecutionStockInOrderPO getInfo(Long inOrderId)
+    {
+        return getInfo(inOrderId, false);
+    }
+
+    /**
+     * 获取入库执行单详情
+     * @param archive true-查询【已反审】tab 归档数据（主单须为已软删+已反审标记，明细放行软删行）
+     */
+    public ExecutionStockInOrderPO getInfo(Long inOrderId, boolean archive)
     {
         ExecutionStockInOrderPO stockInOrderPO = stockInOrderService.getInfo(inOrderId);
+        if (archive && (stockInOrderPO.getDelFlag() == null || stockInOrderPO.getDelFlag() != 2
+                || !Integer.valueOf(1).equals(stockInOrderPO.getReverseAuditStatus()))) {
+            throw new ServiceException("入库执行单非已反审归档数据，无法查看归档详情");
+        }
         ExecutionInMaterialDetailDO inMaterialDetailDO = new ExecutionInMaterialDetailDO();
         String inOrderNumber = stockInOrderPO.getInOrderNumber();
         List<BusinessDocumentOrder> businessDocumentOrders = businessDocumentOrderMapper.selectList(new LambdaQueryWrapper<BusinessDocumentOrder>().eq(BusinessDocumentOrder::getInOrderNumber, inOrderNumber).notIn(BusinessDocumentOrder::getOrderStatus,4,5));
         stockInOrderPO.setBusinessDocumentOrderDOList(businessDocumentOrders);
         inMaterialDetailDO.setInOrderNumber(inOrderNumber);
         inMaterialDetailDO.setLevel(1);
+        if (archive) {
+            //归档明细已随主单软删(del_flag=2)，放行软删明细行
+            inMaterialDetailDO.setDelFlag(2);
+        }
         List<ExecutionInMaterialDetailPO> inMaterialDetailPOList = materialDetailService.queryList(inMaterialDetailDO);
         
         // 先通过入库单号查询收货单列表

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/entity/ExecutionStockOutOrder.java

@@ -516,4 +516,7 @@ public class ExecutionStockOutOrder extends BaseVOEntity {
     @ApiModelProperty("折扣")
     private BigDecimal discount;
 
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(业务单反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/QueryOrderOverStockDO.java

@@ -102,6 +102,12 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @Excel(name = "出库单类型编码")
     private String outOrderTypeCode;
 
+    @ApiModelProperty("出库单类型编码(与outOrderTypeCode同义)")
+    private String orderTypeCode;
+
+    @ApiModelProperty("出库单类型名称")
+    private String orderTypeName;
+
     @ApiModelProperty("出库单类型名称")
     @Excel(name = "出库单类型名称")
     private String outOrderTypeName;
@@ -137,4 +143,10 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
     @Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
     private Integer overStockStatus;
+
+    @ApiModelProperty("实际出仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateStart;
+
+    @ApiModelProperty("实际出仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateEnd;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java

@@ -456,4 +456,21 @@ public class ReservationStockInOrder extends BaseVOEntity {
 
     @ApiModelProperty("业务计价方式")
     private String businessPriceWay;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java

@@ -502,4 +502,21 @@ public class ReservationStockInOrderPO extends BaseVOEntity {
     @ApiModelProperty("业务计价方式")
     private String businessPriceWay;
     private String khdm;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java

@@ -513,4 +513,21 @@ public class ReservationStockInOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("业务计价方式")
     private String businessPriceWay;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java

@@ -507,4 +507,21 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO {
 
     @ApiModelProperty("业务计价方式")
     private String businessPriceWay;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -282,8 +282,7 @@ public class ReservationStockInOrderApplicationService {
      * @return Boolean
      */
     public Boolean auditState(ReservationStockInOrderDO stockInOrderDO){
-        Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);
-//        List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
+        Boolean b = stockInOrderDomainService.auditState(stockInOrderDO);//        List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
 //        if (inOrderIds != null && !inOrderIds.isEmpty()) {
 //            ReservationStockInOrder stockInOrder = reservationStockInOrderMapper.selectById(inOrderIds.get(0));
 //            Integer needCustomsDeclaration = stockInOrder.getNeedCustomsDeclaration();
@@ -302,6 +301,15 @@ public class ReservationStockInOrderApplicationService {
         return b;
     }
 
+    /**
+     * 反审入库业务单：业务单状态改为已驳回(issueStatus=3)并打已反审标记落入【已反审】tab，
+     * 入库执行单+明细逻辑删除，WMS侧整链回退（库存扣减+单据清理+反审异常记录），
+     * W入库单有出库记录时WMS侧拦截，已推送关务直接拦截
+     */
+    public Boolean reverseAudit(ReservationStockInOrderDO stockInOrderDO){
+        return stockInOrderDomainService.reverseAudit(stockInOrderDO);
+    }
+
     /**
      * @description 下发入库单
      * @author ZhouGY

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -13,6 +13,9 @@ import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.businessDocumentOrder.entity.BusinessDocumentOrder;
 import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper;
+import com.mhd.oms.domain.electronicSignature.entity.ElectronicSignature;
+import com.mhd.oms.domain.electronicSignature.repository.facade.IElectronicSignatureMaterialDetailService;
+import com.mhd.oms.domain.electronicSignature.repository.facade.IElectronicSignatureService;
 import com.mhd.oms.domain.executionInMaterialDetail.entity.ExecutionInMaterialDetail;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.facade.IExecutionInMaterialDetailService;
 import com.mhd.oms.domain.executionStockInOrder.entity.ExecutionStockInOrder;
@@ -91,6 +94,10 @@ public class ReservationStockInOrderDomainService {
     private ExecutionStockInOrderMapper executionStockInOrderMapper;
     @Autowired
     private ReserveStockInOrderMapper reserveStockInOrderMapper;
+    @Autowired
+    private IElectronicSignatureService electronicSignatureService;
+    @Autowired
+    private IElectronicSignatureMaterialDetailService electronicSignatureMaterialDetailService;
 
     /**
      * 分页查询入库单列表
@@ -767,6 +774,167 @@ public class ReservationStockInOrderDomainService {
         }
     }
 
+    /**
+     * 反审入库业务单（需求：已入库/已出库的单子客户通知需要回退的场景，单子回退到最原始状态）：
+     * 页面状态列按 issueStatus（0-已创建 1-进行中 2-已审核 3-已驳回 4-已入库 5-部分完成）展示，
+     * 反审条件按 issueStatus 判断——进行中(1)/已审核(2)/已入库(4)/部分完成(5)可反审，
+     * 已创建(0)无需反审、已驳回(3)可直接编辑；已取消/已关闭(status 6/7)兜底拦截。
+     * 反审动作（"审核不通过"同语义 + 全链路回退，补齐 auditState 审核不通过缺失的下游联动）：
+     * <ul>
+     *   <li>业务单状态改为"已驳回"(issueStatus=3)，打已反审标记(REVERSE_AUDIT_STATUS=1)落入【已反审】tab，
+     *       之后可「编辑」→重新「审核」→重新「下发」生成全新执行单</li>
+     *   <li>入库执行单+物料明细软删(del_flag=2)并打已反审标记——执行单【已反审】tab按
+     *       "已软删+已反审"查询归档数据；软删后不出现在正常tab，避免归档单被误「审核/下发」</li>
+     *   <li>清空WMS完成上架跨库回写的完成数据（业务单 IN_QUANTITY/STORAGE_TIME、明细 INBOUND_ITEMS/TOTAL_NET_WEIGHT）</li>
+     *   <li>WMS侧逐执行单回退（omsReverseInOrder）：W入库单有出库记录则拦截（按入库单号+动作"分配库存/出库"
+     *       查库存调整记录&gt;0）→ 库存还原扣减 → W入库单/W收货单/W上架单整链软删并打已反审标记
+     *       （数据划归W入库单/W收货单/W上架单【已反审】tab归档）→
+     *       写1条W入库异常【反审记录】用于记录跟踪</li>
+     * </ul>
+     * 已推送关务(pushStatus=3)直接拦截。WMS回退幂等，反审失败可安全重试。
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean reverseAudit(ReservationStockInOrderDO stockInOrderDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
+        String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
+                ? loginUser.getUserPo().getUserName()
+                : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
+
+        List<Long> inOrderIds = stockInOrderDO.getInOrderIds();
+        if (inOrderIds == null || inOrderIds.isEmpty()) {
+            throw new ServiceException("未选择反审的入库业务单");
+        }
+        Date now = new Date();
+        for (Long inOrderId : inOrderIds) {
+            ReservationStockInOrder businessOrder = stockInOrderService.getById(inOrderId);
+            if (businessOrder == null
+                    || (businessOrder.getDelFlag() != null && businessOrder.getDelFlag() != 1)) {
+                throw new ServiceException("入库业务单不存在或已被删除，无法反审");
+            }
+            String businessNumber = businessOrder.getInOrderNumber();
+            Integer issueStatus = businessOrder.getIssueStatus();
+            if (issueStatus == null || issueStatus == 0) {
+                throw new ServiceException("入库业务单[" + businessNumber + "]为已创建状态，无需反审");
+            }
+            if (issueStatus == 3) {
+                throw new ServiceException("入库业务单[" + businessNumber + "]已驳回，无需反审，可直接编辑后重新提交审核");
+            }
+            if (issueStatus != 1 && issueStatus != 2 && issueStatus != 4 && issueStatus != 5) {
+                throw new ServiceException("入库业务单[" + businessNumber + "]仅进行中/已审核/已入库状态可反审，当前状态值：" + issueStatus);
+            }
+            if (businessOrder.getStatus() != null && (businessOrder.getStatus() == 6 || businessOrder.getStatus() == 7)) {
+                throw new ServiceException("入库业务单[" + businessNumber + "]已取消/已关闭，无法反审");
+            }
+            if (businessOrder.getPushStatus() != null && businessOrder.getPushStatus() == 3) {
+                throw new ServiceException("入库业务单[" + businessNumber + "]已推送关务/NC，无法反审，请先在关务侧处理");
+            }
+
+            //该业务单下全部有效执行单：逐张调WMS回退后软删并打已反审标记
+            List<ExecutionStockInOrder> executionOrders = executionStockInOrderService.list(
+                    new LambdaQueryWrapper<ExecutionStockInOrder>()
+                            .eq(ExecutionStockInOrder::getBusinessInOrderNumber, businessNumber)
+                            .eq(ExecutionStockInOrder::getDelFlag, 1));
+            for (ExecutionStockInOrder executionOrder : executionOrders) {
+                String executionNumber = executionOrder.getInOrderNumber();
+                if (executionOrder.getPushStatus() != null && executionOrder.getPushStatus() == 3) {
+                    throw new ServiceException("执行入库单[" + executionNumber + "]已推送关务/NC，无法反审，请先在关务侧处理");
+                }
+                //WMS侧回退（对称收货/上架完成链路，见 WMS StockInOrderDomainService.reverseExecutionOrder）：
+                //有出库/库存已被分配时WMS报错，此处抛错整体回滚；WMS无数据时幂等成功（未下发执行单反审）
+                StockInOrder reverseParam = new StockInOrder();
+                reverseParam.setInOrderNumber(executionNumber);
+                reverseParam.setRemark("业务单号:" + businessNumber
+                        + (StringUtils.isNotEmpty(stockInOrderDO.getReverseAuditRemark())
+                        ? ",反审原因:" + stockInOrderDO.getReverseAuditRemark() : ""));
+                //组织三字段：WMS幂等跳过分支（未下发单反审）写反审记录时取不到W入库单，需经Feign透传
+                reverseParam.setOrganizationId(executionOrder.getOrganizationId());
+                reverseParam.setOrganizationName(executionOrder.getOrganizationName());
+                reverseParam.setTopOrganizationId(executionOrder.getTopOrganizationId());
+                reverseParam.setUpdateBy(loginUser.getUserid());
+                reverseParam.setUpdateByName(userRealName);
+                AjaxResult reverseResult = wmsServiceFeign.omsReverseInOrder(reverseParam);
+                if (reverseResult == null || !"200".equals(String.valueOf(reverseResult.get("code")))) {
+                    throw new ServiceException("反审失败：执行入库单[" + executionNumber + "]WMS回退失败："
+                            + (reverseResult == null ? "WMS服务不可用或已降级" : reverseResult.get("msg")));
+                }
+                //清理下发自动审核生成的待签名电子签名记录（signatureStatus=1，已签名记录保留作凭证）
+                cancelPendingSignature(executionNumber);
+                //执行单+物料明细软删(del_flag=2)并打已反审标记：
+                //执行单【已反审】tab按"已软删+已反审"(del_flag=2 and REVERSE_AUDIT_STATUS=1)查询归档数据；
+                //软删后不出现在正常tab，避免归档单被误「审核/下发」；业务单重新下发时生成全新执行单
+                executionInMaterialDetailService.update(new UpdateWrapper<ExecutionInMaterialDetail>().lambda()
+                        .set(ExecutionInMaterialDetail::getDelFlag, 2)
+                        .set(ExecutionInMaterialDetail::getUpdateBy, loginUser.getUserid())
+                        .set(ExecutionInMaterialDetail::getUpdateByName, userRealName)
+                        .set(ExecutionInMaterialDetail::getUpdateTime, now)
+                        .eq(ExecutionInMaterialDetail::getInOrderNumber, executionNumber)
+                        .eq(ExecutionInMaterialDetail::getDelFlag, 1));
+                executionStockInOrderService.update(new UpdateWrapper<ExecutionStockInOrder>().lambda()
+                        .set(ExecutionStockInOrder::getDelFlag, 2)
+                        .set(ExecutionStockInOrder::getReverseAuditStatus, 1)
+                        .set(ExecutionStockInOrder::getReverseAuditRemark, stockInOrderDO.getReverseAuditRemark())
+                        .set(ExecutionStockInOrder::getReverseAuditBy, loginUser.getUserid())
+                        .set(ExecutionStockInOrder::getReverseAuditByName, userRealName)
+                        .set(ExecutionStockInOrder::getReverseAuditTime, now)
+                        .set(ExecutionStockInOrder::getUpdateBy, loginUser.getUserid())
+                        .set(ExecutionStockInOrder::getUpdateByName, userRealName)
+                        .set(ExecutionStockInOrder::getUpdateTime, now)
+                        .eq(ExecutionStockInOrder::getInOrderId, executionOrder.getInOrderId())
+                        .eq(ExecutionStockInOrder::getDelFlag, 1));
+            }
+
+            //清空WMS完成上架跨库回写的业务单明细入库数量（INBOUND_ITEMS/TOTAL_NET_WEIGHT 上架时按上架量覆写过）
+            materialDetailService.update(new UpdateWrapper<ReservationInMaterialDetail>().lambda()
+                    .set(ReservationInMaterialDetail::getInboundQuantity, BigDecimal.ZERO)
+                    .set(ReservationInMaterialDetail::getTotalNetWeight, BigDecimal.ZERO)
+                    .eq(ReservationInMaterialDetail::getInOrderNumber, businessNumber)
+                    .eq(ReservationInMaterialDetail::getDelFlag, 1));
+        }
+
+        //业务单状态改为"已驳回"（与审核不通过同语义）+ 已反审标记落入【已反审】tab + 清空完成回写数据
+        return stockInOrderService.update(null, new UpdateWrapper<ReservationStockInOrder>().lambda()
+                .set(ReservationStockInOrder::getIssueStatus, 3)
+                //清空下发/执行时间（前端"是否执行"列按执行时间判断，不清会仍显示已执行，与取消下发 cancelIssueOrder 同口径）
+                .set(ReservationStockInOrder::getIssueTime, null)
+                .set(ReservationStockInOrder::getInQuantity, BigDecimal.ZERO)
+                .set(ReservationStockInOrder::getStorageTime, null)
+                .set(ReservationStockInOrder::getExecutionInOrderNumber, null)
+                //反审标记与反审痕迹（【已反审】tab 按 reverseAuditStatus=1 过滤；业务单本身不软删，保持可编辑重新下发）
+                .set(ReservationStockInOrder::getReverseAuditStatus, 1)
+                .set(ReservationStockInOrder::getReverseAuditRemark, stockInOrderDO.getReverseAuditRemark())
+                .set(ReservationStockInOrder::getReverseAuditBy, loginUser.getUserid())
+                .set(ReservationStockInOrder::getReverseAuditByName, userRealName)
+                .set(ReservationStockInOrder::getReverseAuditTime, now)
+                .set(ReservationStockInOrder::getUpdateBy, loginUser.getUserid())
+                .set(ReservationStockInOrder::getUpdateByName, userRealName)
+                .set(ReservationStockInOrder::getUpdateTime, now)
+                .in(ReservationStockInOrder::getInOrderId, inOrderIds));
+    }
+
+    /**
+     * 反审时清理下发自动审核生成的待签名电子签名记录（signatureStatus=1）及其明细，
+     * 已签名记录保留作凭证；清理失败仅记日志不阻断反审主流程（同取消下发）
+     */
+    private void cancelPendingSignature(String inOrderNumber) {
+        try {
+            List<ElectronicSignature> signatures = electronicSignatureService.list(
+                    new LambdaQueryWrapper<ElectronicSignature>()
+                            .eq(ElectronicSignature::getOrderNumber, inOrderNumber)
+                            .eq(ElectronicSignature::getOrderType, "IN")
+                            .eq(ElectronicSignature::getSignatureStatus, 1)
+                            .eq(ElectronicSignature::getDelFlag, 1));
+            for (ElectronicSignature signature : signatures) {
+                electronicSignatureMaterialDetailService.deleteBySignatureId(signature.getSignatureId());
+                electronicSignatureService.update(new UpdateWrapper<ElectronicSignature>().lambda()
+                        .set(ElectronicSignature::getDelFlag, 2)
+                        .eq(ElectronicSignature::getSignatureId, signature.getSignatureId()));
+            }
+        } catch (Exception e) {
+            log.error("反审清理电子签名记录失败，入库单号：{}", inOrderNumber, e);
+        }
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean executeAndIssue(ReservationStockInOrderDO stockInOrderDO) {
         // 防重复执行校验（与 issueOrder 的防重逻辑对齐）：issueTime 有值表示已下发/执行过。

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -515,4 +515,21 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @ApiModelProperty("折扣")
     private BigDecimal discount;
 
+    @ApiModelProperty("反审状态: 0-无 1-已反审(反审后status回退为1-已创建,重新审核通过自动复位0)")
+    private Integer reverseStatus;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseTime;
+
+    @ApiModelProperty("反审原因")
+    private String reverseRemark;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -538,4 +538,21 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("折扣")
     private BigDecimal discount;
 
+    @ApiModelProperty("反审状态: 0-无 1-已反审(反审后status回退为1-已创建,重新审核通过自动复位0)")
+    private Integer reverseStatus;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseTime;
+
+    @ApiModelProperty("反审原因")
+    private String reverseRemark;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -591,4 +591,19 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("折扣")
     private BigDecimal discount;
 
+    @ApiModelProperty("反审状态: 0-无 1-已反审(反审后status回退为1-已创建,重新审核通过自动复位0)")
+    private Integer reverseStatus;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseByName;
+
+    @ApiModelProperty("反审时间")
+    private Date reverseTime;
+
+    @ApiModelProperty("反审原因")
+    private String reverseRemark;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -580,4 +580,21 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @ApiModelProperty("折扣")
     private BigDecimal discount;
 
+    @ApiModelProperty("反审状态: 0-无 1-已反审(反审后status回退为1-已创建,重新审核通过自动复位0)")
+    private Integer reverseStatus;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseTime;
+
+    @ApiModelProperty("反审原因")
+    private String reverseRemark;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java

@@ -881,6 +881,14 @@ public class ReservationStockOutOrderApplicationService {
         return stockOutOrderDomainService.cancelIssueOrder(stockOutOrderDO);
     }
 
+    /**
+     * @description 反审出库业务单(已出库/已复核单据回退到已创建, WMS库存还原并生成反审异常记录)
+     * @date 2026/9/8
+     */
+    public Boolean reverseAudit(ReservationStockOutOrderDO stockOutOrderDO){
+        return stockOutOrderDomainService.reverseAudit(stockOutOrderDO);
+    }
+
     public Boolean executeAndIssue(ReservationStockOutOrderDO stockOutOrderDO){
         return stockOutOrderDomainService.executeAndIssue(stockOutOrderDO);
     }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -48,6 +48,8 @@ import com.mhd.oms.domain.reservationStockInOrder.repository.mapper.ReservationS
 import com.mhd.oms.domain.reservationStockInOrder.repository.po.MaterialBaseInfoPO;
 import com.mhd.oms.domain.reservationStockInOrder.repository.todo.ReservationStockInOrderDO;
 import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrder;
+import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.entity.ReservationInventoryAdjustmentRecord;
+import com.mhd.oms.domain.reservationInventoryAdjustmentRecord.repository.mapper.ReservationInventoryAdjustmentRecordMapper;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
@@ -118,6 +120,8 @@ public class ReservationStockOutOrderDomainService {
     private ReserveStockOutOrderMapper reserveStockOutOrderMapper;
     @Autowired
     private MaterialBaseInfoResolveService materialBaseInfoResolveService;
+    @Resource
+    private ReservationInventoryAdjustmentRecordMapper inventoryAdjustmentRecordMapper;
 
     /**
      * 分页查询出库单列表
@@ -409,7 +413,8 @@ public class ReservationStockOutOrderDomainService {
         String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
                 ? loginUser.getUserPo().getUserName()
                 : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
-        boolean updateResult = stockOutOrderService.update(null, new UpdateWrapper<ReservationStockOutOrder>().lambda()
+        boolean updateResult;
+        LambdaUpdateWrapper<ReservationStockOutOrder> auditUpdateWrapper = new UpdateWrapper<ReservationStockOutOrder>().lambda()
                 .set(ReservationStockOutOrder::getReservationAuditId, loginUser.getUserid())
                 .set(ReservationStockOutOrder::getReservationAuditName, userRealName)
                 .set(ReservationStockOutOrder::getReservationAuditTime, new Date())
@@ -417,7 +422,12 @@ public class ReservationStockOutOrderDomainService {
                 .set(ReservationStockOutOrder::getUpdateByName, userRealName)
                 .set(ReservationStockOutOrder::getUpdateTime, new Date())
                 .set(ReservationStockOutOrder::getIssueStatus, issueStatus)
-                .in(ReservationStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds()));
+                .in(ReservationStockOutOrder::getOutOrderId, stockOutOrderDO.getOutOrderIds());
+        // 重新审核通过时复位反审标记: 单据离开【已反审】页签回到正常流转
+        if (issueStatus == 2) {
+            auditUpdateWrapper.set(ReservationStockOutOrder::getReverseStatus, 0);
+        }
+        updateResult = stockOutOrderService.update(null, auditUpdateWrapper);
 
         //审核通过时同步线路/车次到关联的运输业务单
         if (issueStatus == 2) {
@@ -662,6 +672,121 @@ public class ReservationStockOutOrderDomainService {
         return update;
     }
 
+    /**
+     * @description 反审出库业务单(按前端展示字段 issueStatus 判断可反审范围: 2-已审核(未出库) / 4-已出库 均可反审;
+     * 0-已创建无需反审、3-已驳回可直接编辑; status 字段在出库完成后不一定同步为9, 故不作为判断依据,
+     * 仅兜底排除 10-已取消/11-已关闭)。
+     * 反审将单据回退到最原始状态(1-已创建, issueStatus=0)并打上反审标记:
+     * WMS 侧按出库单实际状态分支还原库存(已出库: 实物库存还原+推OMS; 未出库: 仅还原分配/冻结占用)、
+     * 清理执行单据(出库单/明细/拣货/复核/交接/配送, 软删+reverseFlag=1 划归【已反审】tab)、
+     * 每个执行出库单生成1条出库异常记录【反审记录】(out_order_abnormal, abnormalType=3);
+     * OMS 侧软删执行出库单及明细、软删预约库存调整记录。
+     * 反审后单据进入【已反审】页签(status=1 且 reverse_status=1), 可继续编辑/审核/撤销;
+     * 重新审核通过时 reverse_status 自动复位 0(见 auditState)。
+     * @date 2026/9/8
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean reverseAudit(ReservationStockOutOrderDO stockOutOrderDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        // 获取用户姓名（优先从UserPo获取，如果为空则使用realname，最后使用username作为兜底）
+        String userRealName = loginUser.getUserPo() != null && loginUser.getUserPo().getUserName() != null
+                ? loginUser.getUserPo().getUserName()
+                : (loginUser.getRealname() != null ? loginUser.getRealname() : loginUser.getUsername());
+        List<Long> outOrderIds = stockOutOrderDO.getOutOrderIds();
+        if (outOrderIds == null || outOrderIds.isEmpty()) {
+            throw new ServiceException("请选择需要反审的出库单");
+        }
+        String reverseRemark = stockOutOrderDO.getReverseRemark();
+
+        for (Long outOrderId : outOrderIds) {
+            ReservationStockOutOrder byId = stockOutOrderService.getById(outOrderId);
+            if (byId == null) {
+                throw new ServiceException("出库单不存在, outOrderId=" + outOrderId);
+            }
+            Integer status = byId.getStatus();
+            if (status != null && (status == 10 || status == 11)) {
+                throw new ServiceException("出库单[" + byId.getOutOrderNumber() + "]已取消/已关闭, 不能反审");
+            }
+            // 反审条件按前端展示字段 issueStatus 判断: 2-已审核(未出库) / 4-已出库 均可反审
+            Integer issueStatus = byId.getIssueStatus();
+            if (!Integer.valueOf(2).equals(issueStatus) && !Integer.valueOf(4).equals(issueStatus)) {
+                throw new ServiceException("出库单[" + byId.getOutOrderNumber() + "]当前状态(issueStatus=" + issueStatus
+                        + ")不支持反审, 仅已审核/已出库状态可反审");
+            }
+            // 逐个执行出库单调 WMS 反审: 还原实物库存+推送OMS库存、清理WMS单据、生成反审异常记录;
+            // 任一失败抛异常整体回滚, 避免单边反审
+            List<ExecutionStockOutOrder> executionOrders = executionStockOutOrderService.list(new QueryWrapper<ExecutionStockOutOrder>().lambda()
+                    .eq(ExecutionStockOutOrder::getBusinessOutOrderNumber, byId.getOutOrderNumber())
+                    .eq(ExecutionStockOutOrder::getDelFlag, 1));
+            for (ExecutionStockOutOrder executionStockOutOrder : executionOrders) {
+                String executionOutOrderNumber = executionStockOutOrder.getOutOrderNumber();
+                StockOutOrder wmsOutOrder = new StockOutOrder();
+                wmsOutOrder.setOutOrderNumber(executionOutOrderNumber);
+                // 反审原因经 remark 透传 WMS, 记入反审异常记录备注
+                wmsOutOrder.setRemark("业务单号:" + byId.getOutOrderNumber()
+                        + (reverseRemark != null && !reverseRemark.isEmpty() ? ",反审原因:" + reverseRemark : ""));
+                AjaxResult wmsResult = wmsServiceFeign.omsReverseExecutionOrder(wmsOutOrder);
+                if (wmsResult == null || !"200".equals(String.valueOf(wmsResult.get("code")))) {
+                    throw new ServiceException("执行出库单[" + executionOutOrderNumber + "]WMS反审失败："
+                            + (wmsResult == null ? "WMS服务不可用" : wmsResult.get("msg")));
+                }
+                // 软删执行出库单明细 + 执行出库单(与取消下发 cancelIssueOrder 一致)
+                List<ExecutionOutMaterialDetail> materialDetails = executionOutMaterialDetailService.list(new QueryWrapper<ExecutionOutMaterialDetail>().lambda()
+                        .eq(ExecutionOutMaterialDetail::getOutOrderNumber, executionOutOrderNumber)
+                        .eq(ExecutionOutMaterialDetail::getDelFlag, 1));
+                materialDetails.forEach(executionOutMaterialDetail -> {
+                    executionOutMaterialDetailService.update(null, new UpdateWrapper<ExecutionOutMaterialDetail>().lambda()
+                            .set(ExecutionOutMaterialDetail::getDelFlag, 2)
+                            .set(ExecutionOutMaterialDetail::getReverseFlag, 1)
+                            .eq(ExecutionOutMaterialDetail::getMaterialDetailId, executionOutMaterialDetail.getMaterialDetailId()));
+                });
+                executionStockOutOrderService.update(null, new UpdateWrapper<ExecutionStockOutOrder>().lambda()
+                        .set(ExecutionStockOutOrder::getDelFlag, 2)
+                        .set(ExecutionStockOutOrder::getReverseFlag, 1)
+                        .eq(ExecutionStockOutOrder::getOutOrderNumber, executionOutOrderNumber));
+                // 软删预约库存调整记录(下发分配时生成): 仅软删留痕, 库存数量由 WMS omsEdit 推送还原
+                inventoryAdjustmentRecordMapper.update(null, new UpdateWrapper<ReservationInventoryAdjustmentRecord>().lambda()
+                        .set(ReservationInventoryAdjustmentRecord::getDelFlag, 2)
+                        .eq(ReservationInventoryAdjustmentRecord::getExecutionOrderNumber, executionOutOrderNumber)
+                        .eq(ReservationInventoryAdjustmentRecord::getDelFlag, 1));
+            }
+        }
+
+        // 主单回退到已创建并打反审标记; 更新条件带 issueStatus in (2,4) + 排除已取消/已关闭 兜底防并发重复反审
+        // issueStatus 回退到 0-已创建(前端展示映射: 0-已创建 2-已审核 3-已驳回 4-已出库);
+        // 清空执行出库单号——执行单已随反审软删, 前端"是否执行"列由该字段有无值推导, 不清空会仍显示已执行
+        return stockOutOrderService.update(null, new UpdateWrapper<ReservationStockOutOrder>().lambda()
+                .set(ReservationStockOutOrder::getStatus, 1)
+                .set(ReservationStockOutOrder::getIssueStatus, 0)
+                .set(ReservationStockOutOrder::getExecutionOutOrderNumber, null)
+                .set(ReservationStockOutOrder::getIssueId, null)
+                .set(ReservationStockOutOrder::getIssueName, null)
+                .set(ReservationStockOutOrder::getIssueTime, null)
+                .set(ReservationStockOutOrder::getReservationAuditId, null)
+                .set(ReservationStockOutOrder::getReservationAuditName, null)
+                .set(ReservationStockOutOrder::getReservationAuditTime, null)
+                .set(ReservationStockOutOrder::getAllocationQuantity, BigDecimal.ZERO)
+                .set(ReservationStockOutOrder::getAlreadyAllocationQuantity, BigDecimal.ZERO)
+                .set(ReservationStockOutOrder::getPickingQuantity, BigDecimal.ZERO)
+                .set(ReservationStockOutOrder::getCheckQuantity, BigDecimal.ZERO)
+                .set(ReservationStockOutOrder::getCheckStatus, 1)
+                .set(ReservationStockOutOrder::getCheckTaskDistribution, 2)
+                .set(ReservationStockOutOrder::getCheckTaskDistributionTime, null)
+                .set(ReservationStockOutOrder::getCompleteTime, null)
+                .set(ReservationStockOutOrder::getOutboundTime, null)
+                .set(ReservationStockOutOrder::getReverseStatus, 1)
+                .set(ReservationStockOutOrder::getReverseBy, loginUser.getUserid())
+                .set(ReservationStockOutOrder::getReverseByName, userRealName)
+                .set(ReservationStockOutOrder::getReverseTime, new Date())
+                .set(ReservationStockOutOrder::getReverseRemark, reverseRemark)
+                .set(ReservationStockOutOrder::getUpdateBy, loginUser.getUserid())
+                .set(ReservationStockOutOrder::getUpdateByName, userRealName)
+                .set(ReservationStockOutOrder::getUpdateTime, new Date())
+                .in(ReservationStockOutOrder::getOutOrderId, outOrderIds)
+                .in(ReservationStockOutOrder::getIssueStatus, 2, 4)
+                .notIn(ReservationStockOutOrder::getStatus, 10, 11));
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public Boolean executeAndIssue(ReservationStockOutOrderDO stockOutOrderDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();

mhd_oms/src/main/java/com/mhd/oms/infrastructure/feign/ThirdPartyServiceFeign.java

@@ -22,7 +22,7 @@ import java.util.Map;
 /**
  * 三方服务 Feign
  */
-@FeignClient(contextId = "thirdPartyServiceFeign",url = "http://10.102.192.31:8012",  value = ServiceNameConstants.THIRDPARTY_CENTER, configuration = FeignAutoConfiguration.class)
+@FeignClient(contextId = "thirdPartyServiceFeign",url = "http://10.33.0.129:8012",  value = ServiceNameConstants.THIRDPARTY_CENTER, configuration = FeignAutoConfiguration.class)
 public interface ThirdPartyServiceFeign {
 
     //查询当前组织所有三方接口信息

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java

@@ -159,6 +159,17 @@ public class ReservationStockOutOrderApi extends BaseController {
         return AjaxResult.success(stockOutOrderApplicationService.cancelIssueOrder(stockOutOrderDO));
     }
 
+    /**
+     * 反审出库单: 已出库/已复核(issueStatus=2已审核)的单据回退到已创建并打反审标记,
+     * WMS还原实物库存并生成出库异常记录【反审记录】, 单据划归【已反审】页签
+     */
+    @ApiOperation("反审出库单")
+    @PostMapping(value = "/reverseAudit")
+    public AjaxResult reverseAudit(@RequestBody ReservationStockOutOrderDTO stockOutOrderDTO) {
+        ReservationStockOutOrderDO stockOutOrderDO = stockOutOrderAssembler.toDO(stockOutOrderDTO);
+        return AjaxResult.success(stockOutOrderApplicationService.reverseAudit(stockOutOrderDO));
+    }
+
     @ApiOperation("下发出库单")
     @PostMapping(value = "/executeAndIssue")
     public AjaxResult executeAndIssue(@RequestBody ReservationStockOutOrderDTO stockOutOrderDTO) {

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionInMaterialDetail/ExecutionInMaterialDetailApi.java

@@ -3,6 +3,7 @@ package com.mhd.oms.interfaces.facade.executionInMaterialDetail;
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.domain.AjaxResult;
 import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.core.utils.poi.ExcelUtil;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailWithOrderPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDO;
@@ -16,6 +17,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
 import java.util.List;
 
 /**
@@ -96,4 +99,24 @@ public class ExecutionInMaterialDetailApi extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 导出入库明细查询Excel（关联入库执行单，全量不分页；
+     * SQL固定只统计已入库(5)单据，可按单据类型(如退货入库tui_huo_ru_ku)与实际入仓日期区间过滤）
+     */
+    @ApiOperation("导出入库明细查询Excel")
+    @GetMapping("/exportWithOrder")
+    public void exportWithOrder(HttpServletResponse response, ExecutionInMaterialDetailQueryDTO queryDTO) throws Exception
+    {
+        //转换实体（不分页，导出全量）
+        QueryOrderOverStockDO queryDO = inMaterialDetailAssembler.toQueryDO(queryDTO);
+        List<ExecutionInMaterialDetailWithOrderPO> list = inMaterialDetailApplicationService.exportInOrderDetailList(queryDO);
+
+        String fileName = URLEncoder.encode("入库明细查询", "UTF-8").replaceAll("\\+", "%20");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        ExcelUtil<ExecutionInMaterialDetailWithOrderPO> util = new ExcelUtil<>(ExecutionInMaterialDetailWithOrderPO.class);
+        util.exportExcel(response, list, "入库明细查询");
+    }
+
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionOutMaterialDetail/ExecutionOutMaterialDetailApi.java

@@ -2,6 +2,7 @@ package com.mhd.oms.interfaces.facade.executionOutMaterialDetail;
 
 import com.mhd.common.core.web.controller.BaseController;
 import com.mhd.common.core.web.page.TableDataInfo;
+import com.mhd.common.core.utils.poi.ExcelUtil;
 import com.mhd.oms.domain.executionOutMaterialDetail.repository.po.ExecutionOutMaterialDetailWithOrderPO;
 import com.mhd.oms.domain.executionOutMaterialDetail.repository.todo.ExecutionOutMaterialDetailQueryDTO;
 import com.mhd.oms.domain.executionOutMaterialDetail.service.ExecutionOutMaterialDetailApplicationService;
@@ -14,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.net.URLEncoder;
 import java.util.List;
 
 /**
@@ -41,4 +44,23 @@ public class ExecutionOutMaterialDetailApi extends BaseController {
         List<ExecutionOutMaterialDetailWithOrderPO> list = outMaterialDetailApplicationService.queryOutOrderDetailList(queryDO);
         return getDataTable(list);
     }
+
+    /**
+     * 导出出库明细查询Excel（关联出库执行单，全量不分页；
+     * SQL固定只统计已出库(9/12/13)单据，可按单据类型与实际出仓日期区间过滤）
+     */
+    @ApiOperation("导出出库明细查询Excel")
+    @GetMapping("/exportWithOrder")
+    public void exportWithOrder(HttpServletResponse response, ExecutionOutMaterialDetailQueryDTO queryDTO) throws Exception {
+        //转换实体（不分页，导出全量）
+        QueryOrderOverStockDO queryDO = outMaterialDetailAssembler.toQueryDO(queryDTO);
+        List<ExecutionOutMaterialDetailWithOrderPO> list = outMaterialDetailApplicationService.queryOutOrderDetailList(queryDO);
+
+        String fileName = URLEncoder.encode("出库明细查询", "UTF-8").replaceAll("\\+", "%20");
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+        ExcelUtil<ExecutionOutMaterialDetailWithOrderPO> util = new ExcelUtil<>(ExecutionOutMaterialDetailWithOrderPO.class);
+        util.exportExcel(response, list, "出库明细查询");
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionStockInOrder/ExecutionStockInOrderApi.java

@@ -93,6 +93,16 @@ public class ExecutionStockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.getInfo(inOrderId));
     }
 
+    /**
+     * 查询入库执行单【已反审】tab 归档详情（已软删+已反审标记的数据，含软删明细）
+     */
+    @ApiOperation("查询入库执行单已反审归档详情")
+    @GetMapping(value = "/getReverseAuditInfo/{inOrderId}")
+    public AjaxResult getReverseAuditInfo(@PathVariable("inOrderId") Long inOrderId)
+    {
+        return AjaxResult.success(stockInOrderApplicationService.getReverseAuditInfo(inOrderId));
+    }
+
     /**
      * 导入入库单
      */

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java

@@ -122,6 +122,19 @@ public class ReservationStockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.auditState(stockInOrderDO));
     }
 
+    /**
+     * 反审入库业务单：已入库/已出库的单子客户通知需要回退的场景，单子回退到最原始状态——
+     * 业务单状态改为"已驳回"(issueStatus=3，与审核不通过同语义，可编辑→重新审核→重新下发)
+     * 并打已反审标记落入【已反审】tab；入库执行单+明细软删并打已反审标记；
+     * W入库单有出库记录时WMS侧拦截不允许反审；已推送关务(pushStatus=3)直接拦截
+     */
+    @ApiOperation("反审入库业务单")
+    @PostMapping(value = "/reverseAudit")
+    public AjaxResult reverseAudit(@RequestBody ReservationStockInOrderDTO stockInOrderDTO) {
+        ReservationStockInOrderDO stockInOrderDO = stockInOrderAssembler.toDO(stockInOrderDTO);
+        return AjaxResult.success(stockInOrderApplicationService.reverseAudit(stockInOrderDO));
+    }
+
     /**
      * 下发入库单
      */

mhd_oms/src/main/resources/bootstrap.yml

@@ -18,15 +18,15 @@ spring:
       discovery:
 #        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
       config:
 #        server-addr: 127.0.0.1:8848
         #         线上测试环境配置 容器名+端口号
-#        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.31:6848
+        server-addr: 10.33.0.129:6010
+#        server-addr: 10.102.192.31:6848
         username: nacos
         password: manhuoda@2023
         #线上正式环境

mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml

@@ -365,6 +365,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailWithOrderPO" id="InMaterialDetailWithOrderResult" extends="MaterialDetailResult">
         <result property="inOrderStatus"       column="in_order_status"       />
         <result property="inOrderAuditStatus"  column="in_order_audit_status" />
+        <result property="issueStatus"         column="issue_status"          />
+        <result property="materialClassifyName" column="material_classify_name" />
+        <result property="orderTypeCode"        column="order_type_code"        />
+        <result property="orderTypeName"        column="order_type_name"        />
         <result property="orderShipperId"      column="order_shipper_id"      />
         <result property="orderShipperCode"    column="order_shipper_code"    />
         <result property="orderShipperName"    column="order_shipper_name"    />
@@ -403,12 +407,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.single_volume, a.single_gross_weight, a.lot_no,
         a.drink_date, a.fire_insure_fee, a.unit_price,
         a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw, a.erp_curr_gw, a.erp_price_gw, a.amount_gw,
-        c.insure_amount, c.goods_type,
+        c.insure_amount, c.goods_type, c.material_classify_name,
         b.shipper_id as order_shipper_id,
         b.shipper_code as order_shipper_code,
         b.shipper_name as order_shipper_name,
+        b.order_type_code,
+        b.order_type_name,
         b.status as in_order_status,
         b.audit_status as in_order_audit_status,
+        b.issue_status as issue_status,
         b.warehouse_date
         from execution_in_material_detail a
         left join execution_stock_in_order b on a.in_order_number = b.in_order_number
@@ -450,15 +457,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="inOrderTypeCode != null  and inOrderTypeCode != ''">
                 and b.order_type_code = #{inOrderTypeCode}
             </if>
-            <if test="inStatus != null ">
-                and b.status = #{inStatus}
+            <if test="orderTypeCode != null  and orderTypeCode != ''">
+                and b.order_type_code = #{orderTypeCode}
             </if>
+            <if test="orderTypeName != null  and orderTypeName != ''">
+                and b.order_type_name like concat('%', #{orderTypeName}, '%')
+            </if>
+            <!-- 入库单展示状态issue_status: 0-已创建 2-已审核 3-已驳回 4-已入库(WMS回写status=5时同步为4)；
+                 "已入库"以issue_status=4为准（推送创建的单据直接置4，status不一定为5） -->
+            and b.issue_status = 4
             <if test="inOrderExpectStartTime != null">
                 and b.expect_time &gt;= #{inOrderExpectStartTime}
             </if>
             <if test="inOrderExpectEndTime != null">
                 and b.expect_time &lt;= #{inOrderExpectEndTime}
             </if>
+            <!-- 实际入仓日期区间（为空的历史单按建档时间兜底），用于统计当天入库 -->
+            <if test="warehouseDateStart != null and warehouseDateStart != ''">
+                and date_format(IFNULL(b.warehouse_date, b.create_time), '%Y-%m-%d') &gt;= #{warehouseDateStart}
+            </if>
+            <if test="warehouseDateEnd != null and warehouseDateEnd != ''">
+                and date_format(IFNULL(b.warehouse_date, b.create_time), '%Y-%m-%d') &lt;= #{warehouseDateEnd}
+            </if>
             and a.del_flag = 1
             and b.del_flag = 1
         </where>

mhd_oms/src/main/resources/mapper/executionOutMaterialDetail/ExecutionOutMaterialDetailMapper.xml

@@ -454,6 +454,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                id="OutMaterialDetailWithOrderResult" extends="MaterialDetailResult">
         <result property="outOrderStatus"      column="out_order_status"      />
         <result property="outOrderAuditStatus" column="out_order_audit_status" />
+        <result property="issueStatus"         column="issue_status"          />
+        <result property="materialClassifyName" column="material_classify_name" />
+        <result property="orderTypeCode"        column="order_type_code"        />
+        <result property="orderTypeName"        column="order_type_name"        />
         <result property="orderShipperId"      column="order_shipper_id"      />
         <result property="orderShipperCode"    column="order_shipper_code"    />
         <result property="orderShipperName"    column="order_shipper_name"    />
@@ -495,14 +499,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.stock_unit, a.stock_quantity, a.inventory_quantity,
             a.line_num_gw, a.spec_gw, a.unit_gw, a.qty_gw,
             a.erp_curr_gw, a.erp_price_gw, a.amount_gw, a.in_order_number_gw, a.in_line_num_gw,
-            c.insure_amount, c.goods_type,
+            c.insure_amount, c.goods_type, c.material_classify_name,
             b.shipper_id as order_shipper_id,
             b.shipper_code as order_shipper_code,
             b.shipper_name as order_shipper_name,
+            b.order_type_code,
+            b.order_type_name,
             b.OUTBOUND_DATE as order_outbound_date,
             b.OUTBOUND_TIME as order_outbound_time,
             b.status as out_order_status,
-            b.audit_status as out_order_audit_status
+            b.audit_status as out_order_audit_status,
+            b.issue_status as issue_status
         from execution_out_material_detail a
         left join execution_stock_out_order b on a.out_order_number = b.out_order_number
         left join NGWL_TEST_WMS.material_base_info c on a.material_base_info_id = c.material_base_info_id
@@ -543,15 +550,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="outOrderTypeCode != null  and outOrderTypeCode != ''">
                 and b.order_type_code = #{outOrderTypeCode}
             </if>
-            <if test="outStatus != null ">
-                and b.status = #{outStatus}
+            <if test="orderTypeCode != null  and orderTypeCode != ''">
+                and b.order_type_code = #{orderTypeCode}
             </if>
+            <if test="orderTypeName != null  and orderTypeName != ''">
+                and b.order_type_name like concat('%', #{orderTypeName}, '%')
+            </if>
+            <!-- 出库单展示状态issue_status: 0-已创建 2-已审核 3-已驳回 4-已出库；
+                 执行出库单status不随WMS出库完成流转(回写被注释)，"已出库"以issue_status=4为准 -->
+            and b.issue_status = 4
             <if test="outOrderExpectStartTime != null">
                 and b.expect_time &gt;= #{outOrderExpectStartTime}
             </if>
             <if test="outOrderExpectEndTime != null">
                 and b.expect_time &lt;= #{outOrderExpectEndTime}
             </if>
+            <!-- 出库时间区间（统计当天出库）：严格按出仓日期OUTBOUND_DATE过滤（页面所见即所筛） -->
+            <if test="outboundDateStart != null and outboundDateStart != ''">
+                and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') &gt;= #{outboundDateStart}
+            </if>
+            <if test="outboundDateEnd != null and outboundDateEnd != ''">
+                and date_format(b.OUTBOUND_DATE, '%Y-%m-%d') &lt;= #{outboundDateEnd}
+            </if>
             and a.del_flag = 1
             and b.del_flag = 1
         </where>

mhd_oms/src/main/resources/mapper/executionStockInOrder/ExecutionStockInOrderMapper.xml

@@ -108,6 +108,11 @@
         <result property="discount"    column="DISCOUNT"    />
         <result property="isFreeManpowerFee"    column="IS_FREE_MANPOWER_FEE"    />
         <result property="businessInOrderNumber"    column="BUSINESS_IN_ORDER_NUMBER"    />
+        <result property="reverseAuditStatus"    column="REVERSE_AUDIT_STATUS"    />
+        <result property="reverseAuditRemark"    column="REVERSE_AUDIT_REMARK"    />
+        <result property="reverseAuditBy"    column="REVERSE_AUDIT_BY"    />
+        <result property="reverseAuditByName"    column="REVERSE_AUDIT_BY_NAME"    />
+        <result property="reverseAuditTime"    column="REVERSE_AUDIT_TIME"    />
     </resultMap>
 
 
@@ -145,7 +150,8 @@
         a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
         ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity,
-        a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME
+        a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,
+        a.REVERSE_AUDIT_STATUS,a.REVERSE_AUDIT_REMARK,a.REVERSE_AUDIT_BY,a.REVERSE_AUDIT_BY_NAME,a.REVERSE_AUDIT_TIME
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -288,7 +294,7 @@
             and a.order_type_code = #{orderTypeCode}
         </if>
         <if test="orderTypeName != null  and orderTypeName != ''">
-            and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
+            and (a.ORDER_TYPE_NAME like concat('%', #{orderTypeName}, '%') or a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
         </if>
         <if test="supplierId != null ">
             and a.supplier_id = #{supplierId}
@@ -501,9 +507,18 @@
             </if>
             )
         </if>
+        <!-- 反审状态过滤：入库执行单【已反审】tab 传 reverseAuditStatus=1，查询已软删且打反审标记的归档数据 -->
         <choose>
-            <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
-            <otherwise> and a.del_flag = 1 </otherwise>
+            <when test="reverseAuditStatus != null">
+                and a.REVERSE_AUDIT_STATUS = #{reverseAuditStatus}
+                and a.del_flag = 2
+            </when>
+            <otherwise>
+                <choose>
+                    <when test="delFlag != null"> and a.del_flag = #{delFlag} </when>
+                    <otherwise> and a.del_flag = 1 </otherwise>
+                </choose>
+            </otherwise>
         </choose>
     </sql>
 

mhd_oms/src/main/resources/mapper/reservationStockInOrder/ReservationStockInOrderMapper.xml

@@ -109,6 +109,11 @@
         <result property="discount"    column="DISCOUNT"    />
         <result property="isFreeManpowerFee"    column="IS_FREE_MANPOWER_FEE"    />
         <result property="executionInOrderNumber"    column="EXECUTION_IN_ORDER_NUMBER"    />
+        <result property="reverseAuditStatus"    column="REVERSE_AUDIT_STATUS"    />
+        <result property="reverseAuditRemark"    column="REVERSE_AUDIT_REMARK"    />
+        <result property="reverseAuditBy"    column="REVERSE_AUDIT_BY"    />
+        <result property="reverseAuditByName"    column="REVERSE_AUDIT_BY_NAME"    />
+        <result property="reverseAuditTime"    column="REVERSE_AUDIT_TIME"    />
         <!-- 饮用有效日期：queryList联查明细表聚合带出，其他查询无此列时不填充 -->
         <result property="drinkDate"    column="drink_date"    />
     </resultMap>
@@ -155,7 +160,8 @@
         a.WAREHOUSE_DATE, a.COMPLETION_TIME, a.ORDER_DATE,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.RESERVATION_ORDER_SOURCE,a.tms_order_number
         ,a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.STORAGE_TIME,a.in_quantity,
-        a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.execution_in_order_number
+        a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.execution_in_order_number,
+        a.REVERSE_AUDIT_STATUS,a.REVERSE_AUDIT_REMARK,a.REVERSE_AUDIT_BY,a.REVERSE_AUDIT_BY_NAME,a.REVERSE_AUDIT_TIME
     </sql>
 
     <sql id="joinStockInOrderPo">
@@ -239,7 +245,7 @@
             and a.notice_number = #{noticeNumber}
         </if>
         <if test="inOrderNumber != null  and inOrderNumber != ''">
-            and a.in_order_number = #{inOrderNumber}
+            and a.in_order_number like concat('%', #{inOrderNumber}, '%')
         </if>
         <if test="status != null ">
             and a.status = #{status}
@@ -274,6 +280,10 @@
         <if test="issueStatus != null">
             and a.issue_status = #{issueStatus}
         </if>
+        <!-- 反审状态过滤：入库业务单【已反审】tab 传 reverseAuditStatus=1 -->
+        <if test="reverseAuditStatus != null">
+            and a.REVERSE_AUDIT_STATUS = #{reverseAuditStatus}
+        </if>
         <if test="warehouseId != null ">
             and a.warehouse_id = #{warehouseId}
         </if>
@@ -293,7 +303,7 @@
             and a.order_type_code = #{orderTypeCode}
         </if>
         <if test="orderTypeName != null  and orderTypeName != ''">
-            and (a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
+            and (a.ORDER_TYPE_NAME like concat('%', #{orderTypeName}, '%') or a.BUSINESS_TYPE like concat('%', #{orderTypeName}, '%') or a.ORDER_TYPE_CODE like concat('%', #{orderTypeName}, '%'))
         </if>
         <if test="supplierId != null ">
             and a.supplier_id = #{supplierId}

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -117,6 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="businessPriceWay"    column="BUSINESS_PRICE_WAY"    />
         <result property="discount"    column="DISCOUNT"    />
         <result property="totalOutboundQuantity"    column="TOTAL_OUTBOUND_QUANTITY"    />
+        <result property="reverseStatus"    column="REVERSE_STATUS"    />
+        <result property="reverseBy"    column="REVERSE_BY"    />
+        <result property="reverseByName"    column="REVERSE_BY_NAME"    />
+        <result property="reverseTime"    column="REVERSE_TIME"    />
+        <result property="reverseRemark"    column="REVERSE_REMARK"    />
     </resultMap>
 
 
@@ -136,7 +141,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
         a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RETURN_QUANTITY,a.DELIVERY_NAME,a.CUSTOMER_NUMBER,a.INVOICE_NUMBER,a.RETURN_ORDER_NUMBER,a.TOTAL_AMOUNT,
         a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.execution_out_order_number,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO,
-        a.TOTAL_WAREHOUSE_RENT,a.BUSINESS_CHARGE_TYPE,a.BUSINESS_PRICE_WAY,a.DISCOUNT
+        a.TOTAL_WAREHOUSE_RENT,a.BUSINESS_CHARGE_TYPE,a.BUSINESS_PRICE_WAY,a.DISCOUNT,
+        a.REVERSE_STATUS,a.REVERSE_BY,a.REVERSE_BY_NAME,a.REVERSE_TIME,a.REVERSE_REMARK
     </sql>
 
 
@@ -178,11 +184,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     <!-- 出库状态: 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中-->
                     and a.status IN (3, 4, 5, 6, 7, 8)
                 </when>
+                <when test="status == -2 "> <!-- 已反审 -->
+                    <!-- 反审后单据回退为 1-已创建 且打上反审标记, 与【已创建】页签互斥 -->
+                    and a.status = 1 and a.reverse_status = 1
+                </when>
+                <when test="status == 1 "> <!-- 已创建: 排除已反审的单据(已划归【已反审】页签) -->
+                    and a.status = 1 and (a.reverse_status is null or a.reverse_status = 0)
+                </when>
                 <otherwise>
                     and a.status = #{status}
                 </otherwise>
             </choose>
         </if>
+        <if test="reverseStatus != null ">
+            and a.reverse_status = #{reverseStatus}
+        </if>
         <!-- 出库状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-拣货中 6-波次中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 -->
         <if test="gtStatus != null ">
             and a.status &gt; #{gtStatus}

mhd_wms/src/main/java/com/mhd/wms/application/service/handoverTaskOrder/HandoverTaskOrderApplicationService.java

@@ -157,6 +157,14 @@ public class HandoverTaskOrderApplicationService {
         return handoverTaskOrderDomainService.getInfo(outTaskOrderId);
     }
 
+    /**
+     * 获取交接作业单归档详情(已反审): 反审时交接单已软删, 供【已反审】tab 查看归档详情
+     */
+    public HandoverTaskOrderPO getReverseInfo(Long outTaskOrderId)
+    {
+        return handoverTaskOrderDomainService.getReverseInfo(outTaskOrderId);
+    }
+
     /**
      * 按作业单号获取交接作业单详细信息（PDA 端）
      * 用于下发任务(taskType=7)中 trackingNumber 对应交接作业单的 taskNumber

mhd_wms/src/main/java/com/mhd/wms/application/service/inMaterialDetail/InMaterialDetailApplicationService.java

@@ -2,9 +2,12 @@ package com.mhd.wms.application.service.inMaterialDetail;
 
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailExportPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
 import com.mhd.wms.domain.inMaterialDetail.service.InMaterialDetailDomainService;
+import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -39,6 +42,51 @@ public class InMaterialDetailApplicationService {
         return inMaterialDetailDomainService.queryList(inMaterialDetailDO);
     }
 
+    /**
+     * 入库明细查询（关联入库单，只统计已入库(5)单据）
+     */
+    public List<InMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                queryOrderOverStockDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId());
+            }
+        }
+        return inMaterialDetailDomainService.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
+    /**
+     * 入库明细导出（专用列集，口径同 queryInOrderDetailList，不分页）
+     */
+    public List<InMaterialDetailExportPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        List<InMaterialDetailExportPO> list = inMaterialDetailDomainService.exportInOrderDetailList(setDataPermission(queryOrderOverStockDO));
+        // 货物种类=挂载分类的父级分类名称：material_classify_name为分类路径(如"食品,饮料")，取倒数第二段；
+        // 仅一级分类(无父级)时取自身名称
+        for (InMaterialDetailExportPO po : list) {
+            String names = po.getMaterialClassifyName();
+            if (names != null && names.contains(",")) {
+                String[] parts = names.split(",");
+                po.setMaterialClassifyName(parts[parts.length - 2].trim());
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 数据权限：非平台超管(1)按登录人一级组织过滤
+     */
+    private QueryOrderOverStockDO setDataPermission(QueryOrderOverStockDO queryOrderOverStockDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                queryOrderOverStockDO.setTopOrganizationId(topOrganizationId);
+            }
+        }
+        return queryOrderOverStockDO;
+    }
+
 
     /**
      * 新增物料明细

mhd_wms/src/main/java/com/mhd/wms/application/service/investigationManage/InvestigationManageApplicationService.java

@@ -168,6 +168,10 @@ public class InvestigationManageApplicationService {
         
         List<InvestigetionManageDetailPO> detailList = investigationManagePO.getInvestigetionManageDetailList();
 
+        // 物料编码相同的明细排在一起展示（稳定排序，同编码内保持原顺序；仅排序不聚合，各条明细独立）
+        detailList.sort(Comparator.comparing(InvestigetionManageDetailPO::getMaterialCode,
+                Comparator.nullsLast(Comparator.naturalOrder())));
+
         // 性能优化：批量获取批次属性，避免N+1查询问题
         // 1. 收集所有唯一的materialBaseInfoId
         Set<Long> materialBaseInfoIdSet = detailList.stream()
@@ -236,8 +240,9 @@ public class InvestigationManageApplicationService {
             
             if (materialBaseInfoId != null && batchDetailMap.containsKey(materialBaseInfoId)) {
                 List<BatchDetailFeignPO> batchDetailFeignPOList = batchDetailMap.get(materialBaseInfoId);
-                // 用于跟踪已添加到列表中的batchDetailId
+                // 用于跟踪已添加到列表中的batchDetailId（batchDetailId为空的配置行改用标签去重，不再丢弃）
                 Set<Long> addedBatchDetailIds = new HashSet<>();
+                Set<String> addedLabelKeys = new HashSet<>();
                 
                 for (BatchDetailFeignPO batchDetailFeignPO : batchDetailFeignPOList) {
                     MaterialMoreDetailPO materialMoreDetailPO = new MaterialMoreDetailPO();
@@ -249,33 +254,37 @@ public class InvestigationManageApplicationService {
                     materialMoreDetailPO.setAttributeOption(batchDetailFeignPO.getAttributeOption());
                     materialMoreDetailPO.setRemark(batchDetailFeignPO.getRemark());
                     
-                    // 确保添加到列表中（使用batchDetailId来避免重复）
+                    // 确保添加到列表中（按batchDetailId+标签双重去重，batchDetailId为空的配置行也保留）
                     Long batchDetailId = batchDetailFeignPO.getBatchDetailId();
-                    if (batchDetailId != null && !addedBatchDetailIds.contains(batchDetailId)) {
+                    String labelKey = batchDetailFeignPO.getBatchLabels() == null ? "" : batchDetailFeignPO.getBatchLabels().trim();
+                    boolean duplicated = addedLabelKeys.contains(labelKey)
+                            || (batchDetailId != null && addedBatchDetailIds.contains(batchDetailId));
+                    if (!duplicated) {
                         materialMoreDetailList.add(materialMoreDetailPO);
-                        addedBatchDetailIds.add(batchDetailId);
+                        addedLabelKeys.add(labelKey);
+                        if (batchDetailId != null) {
+                            addedBatchDetailIds.add(batchDetailId);
+                        }
                     }
                     
                     // 根据fieldName或batchLabels从库存表中获取对应的字段值
                     if (materialInventoryPO != null) {
                         String fieldValue = null;
-                        String usedFieldName = null;
                         // 优先使用fieldName（如果存在）
                         if (StringUtils.isNotBlank(batchDetailFeignPO.getFieldName())) {
-                            usedFieldName = batchDetailFeignPO.getFieldName();
+                            String usedFieldName = batchDetailFeignPO.getFieldName();
                             fieldValue = getFieldValueByFieldName(materialInventoryPO, usedFieldName);
                             log.info("批次属性 batchDetailId={}, fieldName={}, 从库存表获取到的值={}",
                                     batchDetailFeignPO.getBatchDetailId(), usedFieldName, fieldValue);
                         }
-                        // 如果fieldName为空，尝试根据batchLabels映射到字段名
-                        else if (StringUtils.isNotBlank(batchDetailFeignPO.getBatchLabels())) {
+                        // fieldName没取到值时，回退按batchLabels映射字段名再取一次（修复fieldName配置失效导致值永远为空）
+                        if (fieldValue == null && StringUtils.isNotBlank(batchDetailFeignPO.getBatchLabels())) {
                             String fieldNameByLabel = getFieldNameByBatchLabel(batchDetailFeignPO.getBatchLabels());
                             if (StringUtils.isNotBlank(fieldNameByLabel)) {
-                                usedFieldName = fieldNameByLabel;
-                                fieldValue = getFieldValueByFieldName(materialInventoryPO, usedFieldName);
+                                fieldValue = getFieldValueByFieldName(materialInventoryPO, fieldNameByLabel);
                                 log.info("批次属性 batchDetailId={}, batchLabels={}, 映射字段名={}, 从库存表获取到的值={}",
                                         batchDetailFeignPO.getBatchDetailId(), batchDetailFeignPO.getBatchLabels(),
-                                        usedFieldName, fieldValue);
+                                        fieldNameByLabel, fieldValue);
                             }
                         }
                         // 只有当获取到值时才更新attributeValue
@@ -306,22 +315,29 @@ public class InvestigationManageApplicationService {
             return null;
         }
         
-        // 批次标签到字段名的映射关系
-        Map<String, String> labelToFieldNameMap = new HashMap<>();
-        labelToFieldNameMap.put("Invoice No.", "invoiceNo");
-        labelToFieldNameMap.put("Invoice No", "invoiceNo");
-        labelToFieldNameMap.put("发票号", "invoiceNo");
+        // 批次标签到字段名的映射关系（LinkedHashMap保证匹配优先级稳定；长key放前面，避免短标签模糊匹配被抢先误匹配）
+        Map<String, String> labelToFieldNameMap = new LinkedHashMap<>();
         labelToFieldNameMap.put("Batch Ref NO's", "batchRefNo");
+        labelToFieldNameMap.put("Sheet Ref NO's", "sheetRefNo");
+        labelToFieldNameMap.put("箱号/卡板号", "boxPalletNo");
+        labelToFieldNameMap.put("Invoice No.", "invoiceNo");
+        labelToFieldNameMap.put("发票号", "invoiceNo");
         labelToFieldNameMap.put("Batch Ref NO", "batchRefNo");
         labelToFieldNameMap.put("批次参考号", "batchRefNo");
-        labelToFieldNameMap.put("Sheet Ref NO's", "sheetRefNo");
         labelToFieldNameMap.put("Sheet Ref NO", "sheetRefNo");
         labelToFieldNameMap.put("单据参考号", "sheetRefNo");
-        labelToFieldNameMap.put("箱号/卡板号", "boxPalletNo");
         labelToFieldNameMap.put("箱号", "boxPalletNo");
         labelToFieldNameMap.put("卡板号", "boxPalletNo");
+        labelToFieldNameMap.put("Batch Number", "batchNumber");
+        labelToFieldNameMap.put("Production Date", "productionDate");
         labelToFieldNameMap.put("生产日期", "productionDate");
+        labelToFieldNameMap.put("Expiry Date", "expiryDate");
+        labelToFieldNameMap.put("EXP Date", "expiryDate");
         labelToFieldNameMap.put("过期日期", "expiryDate");
+        labelToFieldNameMap.put("Batch No", "batchNumber");
+        labelToFieldNameMap.put("批次号", "batchNumber");
+        labelToFieldNameMap.put("入库日期", "createTime");
+        labelToFieldNameMap.put("入库时间", "createTime");
         labelToFieldNameMap.put("存货日期", "inventoryDate");
         labelToFieldNameMap.put("扩展字段1", "extAttr1");
         labelToFieldNameMap.put("扩展字段2", "extAttr2");
@@ -334,14 +350,16 @@ public class InvestigationManageApplicationService {
             return fieldName;
         }
         
-        // 模糊匹配（包含关系）
+        // 模糊匹配（包含关系）：多个key命中时取最长的key，保证同一标签映射结果稳定
+        String bestMatchKey = null;
         for (Map.Entry<String, String> entry : labelToFieldNameMap.entrySet()) {
             if (batchLabel.contains(entry.getKey()) || entry.getKey().contains(batchLabel)) {
-                return entry.getValue();
+                if (bestMatchKey == null || entry.getKey().length() > bestMatchKey.length()) {
+                    bestMatchKey = entry.getKey();
+                }
             }
         }
-        
-        return null;
+        return bestMatchKey != null ? labelToFieldNameMap.get(bestMatchKey) : null;
     }
     
     /**

mhd_wms/src/main/java/com/mhd/wms/application/service/outMaterialDetail/OutMaterialDetailApplicationService.java

@@ -0,0 +1,54 @@
+package com.mhd.wms.application.service.outMaterialDetail;
+
+import com.mhd.common.security.utils.SecurityUtils;
+import com.mhd.system.api.model.LoginUser;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailExportPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailWithOrderPO;
+import com.mhd.wms.domain.outMaterialDetail.service.OutMaterialDetailDomainService;
+import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 出库物料明细ApplicationService
+ *
+ * @author rcx
+ * @date 2026-09-09
+ */
+@Service
+@Slf4j
+public class OutMaterialDetailApplicationService {
+    @Autowired
+    private OutMaterialDetailDomainService outMaterialDetailDomainService;
+
+    /**
+     * 出库明细查询（关联出库单，只统计已出库(9/12/13)单据）
+     */
+    public List<OutMaterialDetailWithOrderPO> queryOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailDomainService.queryOutOrderDetailList(setDataPermission(queryOrderOverStockDO));
+    }
+
+    /**
+     * 出库明细导出（专用列集，口径同 queryOutOrderDetailList，不分页）
+     */
+    public List<OutMaterialDetailExportPO> exportOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailDomainService.exportOutOrderDetailList(setDataPermission(queryOrderOverStockDO));
+    }
+
+    /**
+     * 数据权限：非平台超管(1)按登录人一级组织过滤
+     */
+    private QueryOrderOverStockDO setDataPermission(QueryOrderOverStockDO queryOrderOverStockDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null){
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1){
+                queryOrderOverStockDO.setTopOrganizationId(topOrganizationId);
+            }
+        }
+        return queryOrderOverStockDO;
+    }
+}

mhd_wms/src/main/java/com/mhd/wms/application/service/pickingOrder/PickingOrderApplicationService.java

@@ -288,6 +288,13 @@ public class PickingOrderApplicationService {
         return pickingOrderPO;
     }
 
+    /**
+     * 获取拣货单归档详情(已反审): 反审时拣货单已软删(del_flag=2), 供【已反审】tab 查看归档详情
+     */
+    public PickingOrderPO getReverseInfoByIdAndType(Long pickingOrderId, Integer type) {
+        return pickingOrderDomainService.getReverseInfoByIdAndType(pickingOrderId, type);
+    }
+    
     /**
      * 递归为物料明细设置更多属性
      * @param pickingMaterialDetailPOList 物料明细列表

mhd_wms/src/main/java/com/mhd/wms/application/service/reviewOrder/ReviewOrderApplicationService.java

@@ -187,6 +187,27 @@ public class ReviewOrderApplicationService {
         return header;
     }
 
+    /**
+     * 获取复核单归档详情(已反审): 反审时复核单/明细均已软删(del_flag=2), 供【已反审】tab 查看归档详情
+     */
+    public ReviewOrderPO getReverseDetailByReviewOrderId(Long reviewOrderId) {
+        if (reviewOrderId == null) {
+            throw new ServiceException("复核单ID不能为空");
+        }
+        ReviewOrderPO header = reviewOrderMapper.selectHeaderByReviewOrderIdReverse(reviewOrderId);
+        if (header == null) {
+            throw new ServiceException("复核单不存在");
+        }
+        List<ReviewMaterialDetailPO> details = reviewOrderMapper.queryDetailByReviewOrderIdReverse(reviewOrderId);
+        fillDisplayQtyFields(details);
+        Map<Long, List<BatchDetailFeignPO>> batchDetailMap = loadDisplayBatchDetailMap(details);
+        fillDynamicBatchDisplayFields(details, batchDetailMap);
+        buildReviewMaterialMoreDetailListLikeShelf(details, batchDetailMap);
+        fillHeaderSummary(header, details);
+        header.setMaterialDetailList(details);
+        return header;
+    }
+    
 
     public ReviewOrderPO getDetailByReviewOrderNumber(String reviewOrderNumber) {
         if (StringUtils.isEmpty(reviewOrderNumber)) {

mhd_wms/src/main/java/com/mhd/wms/application/service/stockInOrder/StockInOrderApplicationService.java

@@ -667,7 +667,16 @@ public class StockInOrderApplicationService {
      */
     public StockInOrderPO getInfo(Long inOrderId)
     {
-        StockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId);
+        return getInfo(inOrderId, false);
+    }
+
+    /**
+     * 获取入库单详情
+     * @param archive true-查询【已反审】tab 归档数据（已软删+已反审标记，明细放行软删行）
+     */
+    public StockInOrderPO getInfo(Long inOrderId, boolean archive)
+    {
+        StockInOrderPO info = stockInOrderDomainService.getInfo(inOrderId, archive);
         String userNcCode = stockOutOrderMapper.getUserNcCode(info.getShipperId());
         info.setKhdm(userNcCode);
         List<InMaterialDetailPO> materialDetailList = info.getMaterialDetailList();
@@ -762,6 +771,14 @@ public class StockInOrderApplicationService {
         return info;
     }
 
+    /**
+     * 查询入库单【已反审】tab 归档详情（已软删+已反审标记的数据，含软删明细/收货单/上架单）
+     */
+    public StockInOrderPO getReverseAuditInfo(Long inOrderId)
+    {
+        return getInfo(inOrderId, true);
+    }
+
 
 
     /**
@@ -955,6 +972,14 @@ public class StockInOrderApplicationService {
         stockInOrderDomainService.cancelExecutionOrder(stockInOrder);
     }
 
+    /**
+     * OMS入库业务单反审：WMS侧回退已完成单据（出库拦截 -> 回退库存 ->
+     * 逻辑删除收货/上架链路 -> 写入库异常【反审记录】），已产生出库则报错拦截
+     */
+    public void omsReverseInOrder(StockInOrder stockInOrder){
+        stockInOrderDomainService.reverseExecutionOrder(stockInOrder);
+    }
+
     /**
      * @description 取消入库单
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/application/service/stockOutOrder/StockOutOrderApplicationService.java

@@ -501,6 +501,14 @@ public class StockOutOrderApplicationService {
         return stockOutOrderPO;
     }
 
+    /**
+     * 获取出库单归档详情(已反审): 反审时单据已软删, 供【已反审】tab 查看归档详情
+     */
+    public StockOutOrderPO getReverseInfoChildren(Long outOrderId)
+    {
+        return stockOutOrderDomainService.getReverseInfoChildren(outOrderId);
+    }
+
     /**
      * 出库交接场景：递归过滤 pickingQuantity 为 0 的明细（与交接详情一致）
      * @param detailList 物料明细树
@@ -1950,6 +1958,13 @@ public class StockOutOrderApplicationService {
         stockOutOrderDomainService.cancelExecutionOrder(stockOutOrder);
     }
 
+    /**
+     * oms出库执行单反审(已出库单据回退): 还原实物库存并推送OMS、清理单据、生成反审异常记录
+     */
+    public void reverseExecutionOrder(StockOutOrder stockOutOrder){
+        stockOutOrderDomainService.reverseExecutionOrder(stockOutOrder);
+    }
+
     public void omsOrderAddDetail(List<OutMaterialDetail> outMaterialDetails){
         stockOutOrderDomainService.omsOrderAddDetail(outMaterialDetails);
     }

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/entity/HandoverTaskOrder.java

@@ -144,4 +144,7 @@ public class HandoverTaskOrder extends BaseVOEntity {
     private String operatorsName;
     @ApiModelProperty("计费信息")
     private String billingJson;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/po/HandoverTaskOrderPO.java

@@ -146,4 +146,7 @@ public class HandoverTaskOrderPO extends BaseVOEntity {
     private List<TaskHandoverMaterialDetailPO> materialDetailList;
     @ApiModelProperty("计费信息")
     private String billingJson;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/repository/todo/HandoverTaskOrderDO.java

@@ -146,4 +146,7 @@ public class HandoverTaskOrderDO extends BaseVOEntity {
     private String pictureApp;
 
     private String billingJson;
+
+    @ApiModelProperty("反审标记: 1-已反审(查询【已反审】tab时与delFlag=2一起传入)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/handoverTaskOrder/service/HandoverTaskOrderDomainService.java

@@ -44,6 +44,7 @@ import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryM
 import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryParamDO;
 import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
 import com.mhd.wms.domain.outMaterialDetail.repository.mapper.OutMaterialDetailMapper;
+import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail;
 import com.mhd.wms.domain.pickingMaterialDetail.repository.mapper.PickingMaterialDetailMapper;
 import com.mhd.wms.domain.pickingMaterialDetail.repository.po.PickingMaterialDetailPO;
 import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
@@ -242,6 +243,90 @@ public class HandoverTaskOrderDomainService {
         return handoverTaskOrderPO;
     }
 
+    /**
+     * 获取交接作业单归档详情(已反审): 出库单反审时交接单及关联出库明细均已软删(del_flag=2),
+     * 本方法镜像 getInfo 按 del_flag=2 查归档数据, 供交接单【已反审】tab 查看详情。
+     */
+    public HandoverTaskOrderPO getReverseInfo(Long outTaskOrderId)
+    {
+        HandoverTaskOrderPO handoverTaskOrderPO = handoverTaskOrderService.getInfo(outTaskOrderId);
+        if (handoverTaskOrderPO == null) {
+            return null;
+        }
+        String orderNumber = handoverTaskOrderPO.getOrderNumber();
+        if (orderNumber != null && !orderNumber.trim().isEmpty()) {
+            StockOutOrder stockOutOrder = stockOutOrderMapper.selectOne(new QueryWrapper<StockOutOrder>().lambda()
+                    .eq(StockOutOrder::getOutOrderNumber, orderNumber)
+                    .eq(StockOutOrder::getDelFlag, 2));
+            Integer review = stockOutOrder != null ? stockOutOrder.getReview() : null;
+            // 归档明细: 出库明细已随反审软删, 按 del_flag=2 查
+            LambdaQueryWrapper<OutMaterialDetail> omdQuery = new QueryWrapper<OutMaterialDetail>().lambda()
+                    .eq(OutMaterialDetail::getOutOrderNumber, orderNumber)
+                    .eq(OutMaterialDetail::getDelFlag, 2);
+            List<OutMaterialDetail> outMaterialDetailList = outMaterialDetailMapper.selectList(omdQuery);
+            List<TaskHandoverMaterialDetailPO> materialDetailList = new ArrayList<>();
+            for (OutMaterialDetail omd : outMaterialDetailList) {
+                BigDecimal handoverQuantity;
+                BigDecimal pickQty;
+                if (Integer.valueOf(1).equals(review)) {
+                    // 需要复核时：仅限复核单上的明细（picking_material_detail 有拣货的 unique_id）
+                    List<PickingMaterialDetail> pmdList = pickingMaterialDetailMapper.selectList(new QueryWrapper<PickingMaterialDetail>().lambda()
+                            .eq(PickingMaterialDetail::getOutUniqueId, omd.getUniqueId())
+                            .eq(PickingMaterialDetail::getDelFlag, 2)
+                            .gt(PickingMaterialDetail::getPickingQuantity, BigDecimal.ZERO));
+                    if (pmdList == null || pmdList.isEmpty()) {
+                        continue;
+                    }
+                    if (omd.getCheckQuantity() == null || omd.getCheckQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+                        continue;
+                    }
+                    PickingMaterialDetailPO pickingSummary = pickingMaterialDetailMapper.queryTotalsByOutNumberAndBaseId(omd.getUniqueId());
+                    pickQty = (pickingSummary != null && pickingSummary.getPickingQuantity() != null) ? pickingSummary.getPickingQuantity() : BigDecimal.ZERO;
+                    if (pickQty.compareTo(BigDecimal.ZERO) <= 0) {
+                        continue;
+                    }
+                    handoverQuantity = omd.getCheckQuantity();
+                } else {
+                    BigDecimal qty = omd.getPickingQuantity() != null ? omd.getPickingQuantity() : omd.getQuantity();
+                    if (qty == null || qty.compareTo(BigDecimal.ZERO) <= 0) {
+                        continue;
+                    }
+                    pickQty = qty;
+                    handoverQuantity = qty;
+                }
+                TaskHandoverMaterialDetailPO detail = new TaskHandoverMaterialDetailPO();
+                detail.setMaterialDetailId(omd.getMaterialDetailId());
+                detail.setUniqueId(omd.getUniqueId());
+                detail.setTaskNumber(handoverTaskOrderPO.getTaskNumber());
+                detail.setOrganizationId(omd.getOrganizationId());
+                detail.setOrganizationName(omd.getOrganizationName());
+                detail.setTopOrganizationId(omd.getTopOrganizationId());
+                detail.setMaterialBaseInfoId(omd.getMaterialBaseInfoId());
+                detail.setMaterialCode(omd.getMaterialCode() != null ? omd.getMaterialCode() : omd.getMaterialNo());
+                detail.setMaterialName(omd.getMaterialName() != null ? omd.getMaterialName() : omd.getCommodityName());
+                detail.setBarCode(omd.getBarCode());
+                detail.setWeightLimit(omd.getWeightLimit());
+                detail.setVolumeLimit(omd.getVolumeLimit());
+                detail.setQuantity(omd.getQuantity());
+                detail.setPickingQuantity(pickQty);
+                detail.setCheckQuantity(handoverQuantity);
+                detail.setPackId(omd.getPackId());
+                detail.setPackCode(omd.getPackCode());
+                detail.setPackName(omd.getPackName());
+                detail.setPackDetailId(omd.getPackDetailId() != null ? String.valueOf(omd.getPackDetailId()) : null);
+                detail.setUnitCode(omd.getUnitCode());
+                detail.setUnitName(omd.getUnitName());
+                detail.setUnitNumber(omd.getUnitNumber());
+                detail.setMaterialWarehouseControlId(omd.getMaterialWarehouseControlId());
+                detail.setSerialNumberManage(omd.getSerialNumberManage());
+                detail.setRemark(omd.getRemark());
+                materialDetailList.add(detail);
+            }
+            handoverTaskOrderPO.setMaterialDetailList(materialDetailList);
+        }
+        return handoverTaskOrderPO;
+    }
+
 
     /**
      * @description 分配月台

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/facade/IInMaterialDetailService.java

@@ -2,7 +2,9 @@ package com.mhd.wms.domain.inMaterialDetail.repository.facade;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailExportPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailBaseDO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
@@ -27,6 +29,16 @@ public interface IInMaterialDetailService extends IService<InMaterialDetail>
 
     public List<InMaterialDetailPO> queryInOrderList(QueryOrderOverStockDO queryOrderOverStockDO);
 
+    /**
+     * 入库明细查询（关联入库单，只统计已入库(5)单据）
+     */
+    public List<InMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
+    /**
+     * 入库明细导出（专用列集，口径同 queryInOrderDetailList，不分页）
+     */
+    public List<InMaterialDetailExportPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
     /**
      * 分页查询物料明细列表
      */

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/mapper/InMaterialDetailMapper.java

@@ -2,7 +2,9 @@ package com.mhd.wms.domain.inMaterialDetail.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailExportPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
 import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
@@ -28,6 +30,16 @@ public interface InMaterialDetailMapper extends BaseMapper<InMaterialDetail>
      */
     public List<InMaterialDetailPO> queryInOrderList(QueryOrderOverStockDO queryOrderOverStockDO);
 
+    /**
+     * 入库明细查询（关联入库单，只统计已入库(5)单据）
+     */
+    public List<InMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
+    /**
+     * 入库明细导出（专用列集，口径同 queryInOrderDetailList，不分页）
+     */
+    public List<InMaterialDetailExportPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
     /**
      * 入库列表页：按入库单号批量取去重后的 Invoice No（仅 level=1）
      */

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/persistence/InMaterialDetailImpl.java

@@ -13,7 +13,9 @@ import com.mhd.system.api.model.LoginUser;
 import com.mhd.wms.domain.inMaterialDetail.entity.InMaterialDetail;
 import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService;
 import com.mhd.wms.domain.inMaterialDetail.repository.mapper.InMaterialDetailMapper;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailExportPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InStockListMaterialAgg;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailBaseDO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
@@ -72,6 +74,22 @@ public class InMaterialDetailImpl extends ServiceImpl<InMaterialDetailMapper, In
         return inMaterialDetailMapper.queryInOrderList(queryOrderOverStockDO);
     }
 
+    /**
+     * 入库明细查询（关联入库单，只统计已入库(5)单据）
+     */
+    @Override
+    public List<InMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return inMaterialDetailMapper.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
+    /**
+     * 入库明细导出（专用列集，口径同 queryInOrderDetailList，不分页）
+     */
+    @Override
+    public List<InMaterialDetailExportPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return inMaterialDetailMapper.exportInOrderDetailList(queryOrderOverStockDO);
+    }
+
     /**
      * 查询物料明细列表
      */

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailExportPO.java

@@ -0,0 +1,112 @@
+package com.mhd.wms.domain.inMaterialDetail.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 入库明细导出专用PO（仅含客户要求的导出列，列顺序即导出顺序；
+ * 火险保费 WMS 库暂无数据来源，先占位导出空列；
+ * 单件净重(KG) 入库明细表无单件净重列，先占位导出空列）
+ *
+ * @author rcx
+ * @date 2026-09-09
+ */
+@Data
+public class InMaterialDetailExportPO {
+
+    @Excel(name = "客户编号", sort = 1)
+    private String customerCode;
+
+    @Excel(name = "客户名称", sort = 2)
+    private String customerName;
+
+    @Excel(name = "入库单号", sort = 3)
+    private String inOrderNumber;
+
+    @Excel(name = "入库日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 4)
+    private Date warehouseDate;
+
+    @Excel(name = "LOT编号", sort = 5)
+    private String lotNo;
+
+    @Excel(name = "客户预约名称", sort = 6)
+    private String customerOrderNumber;
+
+    @Excel(name = "物料名称", sort = 7)
+    private String materialName;
+
+    @Excel(name = "物料编码", sort = 8)
+    private String materialCode;
+
+    @Excel(name = "库存单位", sort = 9)
+    private String unitName;
+
+    @Excel(name = "件数", sort = 10)
+    private BigDecimal pieceCount;
+
+    @Excel(name = "仓库", sort = 11)
+    private String warehouseName;
+
+    @Excel(name = "饮用日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 12)
+    private Date drinkDate;
+
+    @Excel(name = "库位", sort = 13)
+    private String storageLocationName;
+
+    @Excel(name = "单件净重(KG)", sort = 14)
+    private BigDecimal netWeight;
+
+    @Excel(name = "单件体积(CBM)", sort = 15)
+    private BigDecimal singleVolume;
+
+    @Excel(name = "单价", sort = 16)
+    private BigDecimal unitPrice;
+
+    @Excel(name = "总价", sort = 17)
+    private BigDecimal totalPrice;
+
+    @Excel(name = "折扣(%)", sort = 18)
+    private BigDecimal discountRate;
+
+    @Excel(name = "每月仓租", sort = 19)
+    private BigDecimal monthlyWarehouseFee;
+
+    @Excel(name = "半月仓租", sort = 20)
+    private BigDecimal halfMonthWhFee;
+
+    @Excel(name = "合同收费", sort = 21)
+    private BigDecimal contractFee;
+
+    @Excel(name = "火险保费", sort = 22)
+    private BigDecimal fireInsureFee;
+
+    @Excel(name = "备注", sort = 23)
+    private String remark;
+
+    @Excel(name = "货物种类", sort = 24)
+    private String materialClassifyName;
+
+    @Excel(name = "总重量", sort = 25)
+    private BigDecimal totalGrossWeight;
+
+    @Excel(name = "每件保额", sort = 26)
+    private BigDecimal insureAmount;
+
+    @Excel(name = "仓位/库位", sort = 27)
+    private String storageName;
+
+    @Excel(name = "收费标准", sort = 28)
+    private BigDecimal chargeStandard;
+
+    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd", sort = 29)
+    private Date expiryDate;
+
+    @Excel(name = "单据状态", sort = 30, readConverterExp = "5=已入库")
+    private Integer inOrderStatus;
+
+    @Excel(name = "业务单据类型", sort = 31)
+    private String orderTypeName;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/repository/po/InMaterialDetailWithOrderPO.java

@@ -0,0 +1,47 @@
+package com.mhd.wms.domain.inMaterialDetail.repository.po;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 入库明细查询结果（关联入库单，只统计已入库单据）
+ *
+ * @author rcx
+ * @date 2026-09-09
+ */
+@Data
+public class InMaterialDetailWithOrderPO extends InMaterialDetailPO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
+    @Excel(name = "入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
+    private Integer inOrderStatus;
+
+    @ApiModelProperty("入库单状态(与inOrderStatus同值，便于前端按status字段名绑定)")
+    private Integer status;
+
+    @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer inOrderAuditStatus;
+
+    @ApiModelProperty("入仓日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    @Excel(name = "入仓日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date warehouseDate;
+
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty("货物类型: 0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型: 0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+
+    @ApiModelProperty("货物种类(物料分类名称，多个逗号分隔)")
+    private String materialClassifyName;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/inMaterialDetail/service/InMaterialDetailDomainService.java

@@ -1,8 +1,11 @@
 package com.mhd.wms.domain.inMaterialDetail.service;
 
 import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailService;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailExportPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
+import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
+import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,20 @@ public class InMaterialDetailDomainService {
         return materialDetailService.queryList(inMaterialDetailDO);
     }
 
+    /**
+     * 入库明细查询（关联入库单，只统计已入库(5)单据）
+     */
+    public List<InMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return materialDetailService.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
+    /**
+     * 入库明细导出（专用列集，口径同 queryInOrderDetailList，不分页）
+     */
+    public List<InMaterialDetailExportPO> exportInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return materialDetailService.exportInOrderDetailList(queryOrderOverStockDO);
+    }
+
 
     /**
      * 新增物料明细

mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/entity/InOrderAbnormal.java

@@ -53,8 +53,8 @@ public class InOrderAbnormal extends BaseVOEntity {
     @Excel(name = "上架单号")
     private String shelfOrderNumber;
 
-    @ApiModelProperty("类型：1-收货 2-上架")
-    @Excel(name = "类型：1-收货 2-上架")
+    @ApiModelProperty("类型：1-收货 2-上架 3-反审")
+    @Excel(name = "类型：1-收货 2-上架 3-反审")
     private Integer type;
 
     @ApiModelProperty("计划数量")
@@ -73,8 +73,8 @@ public class InOrderAbnormal extends BaseVOEntity {
     @Excel(name = "异常数量")
     private BigDecimal abnormalActualQuantity;
 
-    @ApiModelProperty("异常类型: 1-上架异常 2-收货异常 3-收货异常（允许超收没超出超收比例） 4-收货异常（不允许超收）5-收货异常（允许超收但超出超收比例）")
-    @Excel(name = "异常类型: 1-上架异常 2-收货异常 3-收货异常", readConverterExp = "允=许超收但不允许超出超收比例")
+    @ApiModelProperty("异常类型: 1-上架异常 2-收货异常 3-收货异常（允许超收没超出超收比例） 4-收货异常（不允许超收）5-收货异常（允许超收但超出超收比例） 6-反审记录")
+    @Excel(name = "异常类型: 1-上架异常 2-收货异常 6-反审记录", readConverterExp = "允=许超收但不允许超出超收比例")
     private Integer abnormalType;
 
     @ApiModelProperty("异常原因")

mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/repository/facade/IInOrderAbnormalService.java

@@ -51,4 +51,11 @@ public interface IInOrderAbnormalService extends IService<InOrderAbnormal>
      * @return Boolean
      */
     Boolean genInOrderAbnormal(InOrderAbnormalBaseDO inOrderAbnormalBaseDO, Integer type);
+
+    /**
+     * 生成入库异常【反审记录】（入库业务单反审时调用，用于记录跟踪）
+     * 单号自动生成（FSYC 前缀，与出库反审记录一致），固定 type=3（反审）、abnormalType=6（反审记录），
+     * 其余字段（inOrderNumber/abnormalReason/quantity/remark/createBy 等）由调用方填充
+     */
+    Boolean genReverseAuditAbnormal(InOrderAbnormal inOrderAbnormal);
 }

mhd_wms/src/main/java/com/mhd/wms/domain/inOrderAbnormal/repository/persistence/InOrderAbnormalImpl.java

@@ -174,6 +174,25 @@ public class InOrderAbnormalImpl extends ServiceImpl<InOrderAbnormalMapper, InOr
         return true;
     }
 
+    /**
+     * 生成入库异常【反审记录】（入库业务单反审时调用，用于记录跟踪）
+     * 与出库反审记录共用 FSYC 单号前缀；type=3（反审）、abnormalType=6（反审记录）
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean genReverseAuditAbnormal(InOrderAbnormal inOrderAbnormal) {
+        if (inOrderAbnormal == null || !StringUtils.hasText(inOrderAbnormal.getInOrderNumber())) {
+            throw new ServiceException("生成反审记录失败：入库单号为空");
+        }
+        inOrderAbnormal.setAbnormalNumber(OrderSequence.getOrderCode("FSYC"));
+        inOrderAbnormal.setType(3);
+        inOrderAbnormal.setAbnormalType(6);
+        if (inOrderAbnormal.getCreateTime() == null) {
+            inOrderAbnormal.setCreateTime(new Date());
+        }
+        return this.save(inOrderAbnormal);
+    }
+
     /**
      * @description 收货数量与计划数量不符，完成收货会生成收货异常记录
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/entity/OutMaterialDetail.java

@@ -541,4 +541,7 @@ public class OutMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("出库数量")
     @Excel(name = "出库数量")
     private BigDecimal outQuantity;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/facade/IOutMaterialDetailService.java

@@ -3,7 +3,9 @@ package com.mhd.wms.domain.outMaterialDetail.repository.facade;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialCheckPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailExportPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutStockListMaterialAgg;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailBaseDO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
@@ -32,6 +34,16 @@ public interface IOutMaterialDetailService extends IService<OutMaterialDetail>
      */
     public List<OutMaterialDetailPO> queryOutOrderList(QueryOrderOverStockDO queryOrderOverStockDO);
 
+    /**
+     * 出库明细查询（关联出库单，只统计已出库(9/12/13)单据）
+     */
+    public List<OutMaterialDetailWithOrderPO> queryOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
+    /**
+     * 出库明细导出（专用列集，口径同 queryOutOrderDetailList，不分页）
+     */
+    public List<OutMaterialDetailExportPO> exportOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
 
 
     public List<OutMaterialDetailPO> queryListChildren(OutMaterialDetailDO outMaterialDetailDO);

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/mapper/OutMaterialDetailMapper.java

@@ -2,7 +2,9 @@ package com.mhd.wms.domain.outMaterialDetail.repository.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailExportPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutStockListMaterialAgg;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
 import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
@@ -28,6 +30,16 @@ public interface OutMaterialDetailMapper extends BaseMapper<OutMaterialDetail>
      */
     public List<OutMaterialDetailPO> queryOutOrderList(QueryOrderOverStockDO queryOrderOverStockDO);
 
+    /**
+     * 出库明细查询（关联出库单，只统计已出库(9/12/13)单据）
+     */
+    public List<OutMaterialDetailWithOrderPO> queryOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
+    /**
+     * 出库明细导出（专用列集，口径同 queryOutOrderDetailList，不分页）
+     */
+    public List<OutMaterialDetailExportPO> exportOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
 
     /**
      * @description 批量修改指定物料明细分配数量

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/persistence/OutMaterialDetailImpl.java

@@ -34,7 +34,9 @@ import com.mhd.wms.domain.outMaterialDetail.entity.OutMaterialDetail;
 import com.mhd.wms.domain.outMaterialDetail.repository.facade.IOutMaterialDetailService;
 import com.mhd.wms.domain.outMaterialDetail.repository.mapper.OutMaterialDetailMapper;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialCheckPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailExportPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutStockListMaterialAgg;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailBaseDO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
@@ -107,6 +109,22 @@ public class OutMaterialDetailImpl extends ServiceImpl<OutMaterialDetailMapper,
         return outMaterialDetailMapper.queryOutOrderList(queryOrderOverStockDO);
     }
 
+    /**
+     * 出库明细查询（关联出库单，只统计已出库(9/12/13)单据）
+     */
+    @Override
+    public List<OutMaterialDetailWithOrderPO> queryOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailMapper.queryOutOrderDetailList(queryOrderOverStockDO);
+    }
+
+    /**
+     * 出库明细导出（专用列集，口径同 queryOutOrderDetailList，不分页）
+     */
+    @Override
+    public List<OutMaterialDetailExportPO> exportOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailMapper.exportOutOrderDetailList(queryOrderOverStockDO);
+    }
+
     /**
      * 查询物料明细列表
      */

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailExportPO.java

@@ -0,0 +1,111 @@
+package com.mhd.wms.domain.outMaterialDetail.repository.po;
+
+import com.mhd.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 出库明细导出专用PO（仅含客户要求的导出列，列顺序即导出顺序；
+ * 火险保费 WMS 库暂无数据来源，先占位导出空列）
+ *
+ * @author rcx
+ * @date 2026-09-09
+ */
+@Data
+public class OutMaterialDetailExportPO {
+
+    @Excel(name = "出库单号", sort = 1)
+    private String outOrderNumber;
+
+    @Excel(name = "出库日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 2)
+    private Date outboundDate;
+
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 3)
+    private Date createTime;
+
+    @Excel(name = "客户编号", sort = 4)
+    private String customerCode;
+
+    @Excel(name = "客户名称", sort = 5)
+    private String customerName;
+
+    @Excel(name = "LOT编号", sort = 6)
+    private String lotNo;
+
+    @Excel(name = "客户预约名称", sort = 7)
+    private String customerOrderNumber;
+
+    @Excel(name = "物料名称", sort = 8)
+    private String materialName;
+
+    @Excel(name = "物料编码", sort = 9)
+    private String materialCode;
+
+    @Excel(name = "库存单位", sort = 10)
+    private String stockUnit;
+
+    @Excel(name = "件数", sort = 11)
+    private BigDecimal pieceCount;
+
+    @Excel(name = "仓库", sort = 12)
+    private String warehouseName;
+
+    @Excel(name = "饮用日期", width = 30, dateFormat = "yyyy-MM-dd", sort = 13)
+    private Date drinkDate;
+
+    @Excel(name = "库位", sort = 14)
+    private String storageLocationName;
+
+    @Excel(name = "单件净重(KG)", sort = 15)
+    private BigDecimal weightLimit;
+
+    @Excel(name = "单件体积(CBM)", sort = 16)
+    private BigDecimal singleVolume;
+
+    @Excel(name = "单价", sort = 17)
+    private BigDecimal unitPrice;
+
+    @Excel(name = "总价", sort = 18)
+    private BigDecimal totalPrice;
+
+    @Excel(name = "折扣(%)", sort = 19)
+    private BigDecimal discountRate;
+
+    @Excel(name = "每月仓租", sort = 20)
+    private BigDecimal monthlyWarehouseFee;
+
+    @Excel(name = "半月仓租", sort = 21)
+    private BigDecimal halfMonthWhFee;
+
+    @Excel(name = "合同收费", sort = 22)
+    private BigDecimal contractFee;
+
+    @Excel(name = "火险保费", sort = 23)
+    private BigDecimal fireInsureFee;
+
+    @Excel(name = "备注", sort = 24)
+    private String remark;
+
+    @Excel(name = "总重量(KG)", sort = 25)
+    private BigDecimal totalGrossWeight;
+
+    @Excel(name = "仓位/库位", sort = 26)
+    private String storageName;
+
+    @Excel(name = "入库单号", sort = 27)
+    private String inOrderNumber;
+
+    @Excel(name = "种类", sort = 28)
+    private String materialClassifyName;
+
+    @Excel(name = "总价值", sort = 29)
+    private BigDecimal totalAmount;
+
+    @Excel(name = "单据状态", sort = 30, readConverterExp = "9=已出库,12=已复核,13=已交接")
+    private Integer outOrderStatus;
+
+    @Excel(name = "业务单据类型", sort = 31)
+    private String orderTypeName;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/repository/po/OutMaterialDetailWithOrderPO.java

@@ -0,0 +1,66 @@
+package com.mhd.wms.domain.outMaterialDetail.repository.po;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 出库明细查询结果（关联出库单，只统计已出库单据）
+ *
+ * @author rcx
+ * @date 2026-09-09
+ */
+@Data
+public class OutMaterialDetailWithOrderPO extends OutMaterialDetailPO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("客户id")
+    @Excel(name = "客户id")
+    private Long customerId;
+
+    @ApiModelProperty("客户编码")
+    @Excel(name = "客户编码")
+    private String customerCode;
+
+    @ApiModelProperty("客户名称")
+    @Excel(name = "客户名称")
+    private String customerName;
+
+    @ApiModelProperty("出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
+    @Excel(name = "出库单状态: 1-已创建 2-已审核 3-部分分配 4-已分配 5-波次中 6-拣货中 7-拣货完成 8-复核中 9-已出库 10-已取消 11-已关闭 12-已复核 13-已交接")
+    private Integer outOrderStatus;
+
+    @ApiModelProperty("出库单状态(与outOrderStatus同值，便于前端按status字段名绑定)")
+    private Integer status;
+
+    @ApiModelProperty("货物种类(物料分类名称，多个逗号分隔)")
+    private String materialClassifyName;
+
+    @ApiModelProperty("出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    @Excel(name = "出库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer outOrderAuditStatus;
+
+    @ApiModelProperty("出仓日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出仓日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date outboundDate;
+
+    @ApiModelProperty("完成时间（出库完成时间，Excel导入/录单时填写）")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date completeTime;
+
+    @ApiModelProperty("保额")
+    @Excel(name = "保额")
+    private BigDecimal insureAmount;
+
+    @ApiModelProperty("货物类型: 0-物料 1-半成品 2-成品")
+    @Excel(name = "货物类型: 0-物料 1-半成品 2-成品")
+    private Integer goodsType;
+}

mhd_wms/src/main/java/com/mhd/wms/domain/outMaterialDetail/service/OutMaterialDetailDomainService.java

@@ -1,8 +1,11 @@
 package com.mhd.wms.domain.outMaterialDetail.service;
 
 import com.mhd.wms.domain.outMaterialDetail.repository.facade.IOutMaterialDetailService;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailExportPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
+import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailWithOrderPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
+import com.mhd.wms.domain.overStock.repository.todo.QueryOrderOverStockDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +33,20 @@ public class OutMaterialDetailDomainService {
         return outMaterialDetailService.queryList(outMaterialDetailDO);
     }
 
+    /**
+     * 出库明细查询（关联出库单，只统计已出库(9/12/13)单据）
+     */
+    public List<OutMaterialDetailWithOrderPO> queryOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailService.queryOutOrderDetailList(queryOrderOverStockDO);
+    }
+
+    /**
+     * 出库明细导出（专用列集，口径同 queryOutOrderDetailList，不分页）
+     */
+    public List<OutMaterialDetailExportPO> exportOutOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return outMaterialDetailService.exportOutOrderDetailList(queryOrderOverStockDO);
+    }
+
 
     /**
      * 新增物料明细

mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/entity/OutOrderAbnormal.java

@@ -53,8 +53,8 @@ public class OutOrderAbnormal extends BaseVOEntity {
     @Excel(name = "拣货作业单号")
     private String outTaskOrderNumber;
 
-    @ApiModelProperty("类型：1-拣货 2-复核")
-    @Excel(name = "类型：1-拣货 2-复核")
+    @ApiModelProperty("类型：1-拣货 2-复核 3-反审记录")
+    @Excel(name = "类型：1-拣货 2-复核 3-反审记录")
     private Integer type;
 
     @ApiModelProperty("计划数量")
@@ -69,8 +69,8 @@ public class OutOrderAbnormal extends BaseVOEntity {
     @Excel(name = "异常数量 = 作业数量 -  计划数量")
     private BigDecimal abnormalActualQuantity;
 
-    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常")
-    @Excel(name = "异常类型: 1-拣货异常 2-复核异常")
+    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常 3-反审记录")
+    @Excel(name = "异常类型: 1-拣货异常 2-复核异常 3-反审记录")
     private Integer abnormalType;
 
     @ApiModelProperty("异常原因")

mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/po/OutOrderAbnormalPO.java

@@ -53,8 +53,8 @@ public class OutOrderAbnormalPO extends BaseVOEntity {
     @Excel(name = "拣货作业单号")
     private String outTaskOrderNumber;
 
-    @ApiModelProperty("类型：1-拣货 2-复核")
-    @Excel(name = "类型：1-拣货 2-复核")
+    @ApiModelProperty("类型：1-拣货 2-复核 3-反审记录")
+    @Excel(name = "类型：1-拣货 2-复核 3-反审记录")
     private Integer type;
 
     @ApiModelProperty("计划数量：拣货异常=分配数量；复核异常=拣货数量")
@@ -69,8 +69,8 @@ public class OutOrderAbnormalPO extends BaseVOEntity {
     @Excel(name = "异常数量 = 作业数量 - 计划数量")
     private BigDecimal abnormalActualQuantity;
 
-    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常")
-    @Excel(name = "异常类型: 1-拣货异常 2-复核异常")
+    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常 3-反审记录")
+    @Excel(name = "异常类型: 1-拣货异常 2-复核异常 3-反审记录")
     private Integer abnormalType;
 
     @ApiModelProperty("异常原因")

mhd_wms/src/main/java/com/mhd/wms/domain/outOrderAbnormal/repository/todo/OutOrderAbnormalDO.java

@@ -51,8 +51,8 @@ public class OutOrderAbnormalDO extends BaseVOEntity {
     @Excel(name = "拣货作业单号")
     private String outTaskOrderNumber;
 
-    @ApiModelProperty("类型：1-拣货 2-复核")
-    @Excel(name = "类型：1-拣货 2-复核")
+    @ApiModelProperty("类型：1-拣货 2-复核 3-反审记录")
+    @Excel(name = "类型：1-拣货 2-复核 3-反审记录")
     private Integer type;
 
     @ApiModelProperty("计划数量")
@@ -67,8 +67,8 @@ public class OutOrderAbnormalDO extends BaseVOEntity {
     @Excel(name = "异常数量 = 作业数量 -  计划数量")
     private BigDecimal abnormalActualQuantity;
 
-    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常")
-    @Excel(name = "异常类型: 1-拣货异常 2-复核异常")
+    @ApiModelProperty("异常类型: 1-拣货异常 2-复核异常 3-反审记录")
+    @Excel(name = "异常类型: 1-拣货异常 2-复核异常 3-反审记录")
     private Integer abnormalType;
 
     @ApiModelProperty("异常原因")

mhd_wms/src/main/java/com/mhd/wms/domain/overStock/repository/todo/QueryOrderOverStockDO.java

@@ -78,6 +78,12 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @Excel(name = "入库单类型编码")
     private String inOrderTypeCode;
 
+    @ApiModelProperty("入库单类型编码(与inOrderTypeCode同义)")
+    private String orderTypeCode;
+
+    @ApiModelProperty("入库单类型名称")
+    private String orderTypeName;
+
     @ApiModelProperty("入库单类型名称")
     @Excel(name = "入库单类型名称")
     private String inOrderTypeName;
@@ -137,4 +143,16 @@ public class QueryOrderOverStockDO extends BaseVOEntity {
     @ApiModelProperty("越库单状态 0：无状态 1：处理中 2：越库完成")
     @Excel(name = "越库单状态 0：无状态 1：处理中 2：越库完成")
     private Integer overStockStatus;
+
+    @ApiModelProperty("实际入仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateStart;
+
+    @ApiModelProperty("实际入仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String warehouseDateEnd;
+
+    @ApiModelProperty("实际出仓日期 开始（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateStart;
+
+    @ApiModelProperty("实际出仓日期 结束（yyyy-MM-dd，为空按建档时间兜底）")
+    private String outboundDateEnd;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingMaterialDetail/entity/PickingMaterialDetail.java

@@ -321,4 +321,7 @@ public class PickingMaterialDetail extends BaseVOEntity {
     private String bondInvtNoGw;
     private String whNoGw;
     private String seatNoGw;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/entity/PickingOrder.java

@@ -133,4 +133,7 @@ public class PickingOrder extends BaseVOEntity {
     private String pushByName;
 
 
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/facade/IPickingOrderService.java

@@ -58,6 +58,11 @@ public interface IPickingOrderService extends IService<PickingOrder>
      */
     public PickingOrderPO getInfoByIdAndType(Long pickingOrderId, Integer type);
 
+    /**
+     * @description 根据id和类型获取指定拣货单信息(归档: 已反审软删 del_flag=2, 供【已反审】tab 详情)
+     */
+    public PickingOrderPO getInfoByIdAndTypeReverse(Long pickingOrderId, Integer type);
+
 
     /**
      * @description 根据单号和类型获取指定拣货单信息

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/mapper/PickingOrderMapper.java

@@ -25,12 +25,22 @@ public interface PickingOrderMapper extends BaseMapper<PickingOrder>
      */
     public PickingOrderPO queryOutOrderById(Long pickingOrderId);
 
+    /**
+     * 根据Id关联出库单查询(归档: 已反审软删 del_flag=2, 供【已反审】tab 详情)
+     */
+    public PickingOrderPO queryOutOrderByIdReverse(Long pickingOrderId);
+
 
     /**
      * 根据Id关联波次单查询
      */
     public PickingOrderPO queryWaveOrderById(Long pickingOrderId);
 
+    /**
+     * 根据Id关联波次单查询(归档: 已反审软删 del_flag=2)
+     */
+    public PickingOrderPO queryWaveOrderByIdReverse(Long pickingOrderId);
+
     /**
      * 根据单号关联出库单查询
      */

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/persistence/PickingOrderImpl.java

@@ -146,6 +146,23 @@ public class PickingOrderImpl extends ServiceImpl<PickingOrderMapper, PickingOrd
         return pickingOrderPO;
     }
 
+    /**
+     * 归档(已反审): 按 del_flag=2 查软删的拣货单, 供【已反审】tab 详情
+     */
+    @Override
+    public PickingOrderPO getInfoByIdAndTypeReverse(Long pickingOrderId, Integer type) {
+        PickingOrderPO pickingOrderPO = null;
+        if (type == 1){
+            pickingOrderPO = pickingOrderMapper.queryOutOrderByIdReverse(pickingOrderId);
+        }else {
+            pickingOrderPO = pickingOrderMapper.queryWaveOrderByIdReverse(pickingOrderId);
+        }
+        if (pickingOrderPO == null){
+            throw new ServiceException("拣货单不存在");
+        }
+        return pickingOrderPO;
+    }
+
     /**
      * @description 根据单号和类型获取指定拣货单信息
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/po/PickingOrderPO.java

@@ -171,4 +171,7 @@ public class PickingOrderPO extends StockOutOrderBasePO {
     private String specificationModel;
     @ApiModelProperty("货物类型 0-物料  1-半成品  2-成品")
     private Integer goodsType;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/repository/todo/PickingOrderDO.java

@@ -228,4 +228,7 @@ public class PickingOrderDO extends BaseVOEntity {
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTimeTo;
+
+    @ApiModelProperty("反审标记: 1-已反审(查询【已反审】tab时与delFlag=2一起传入)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/pickingOrder/service/PickingOrderDomainService.java

@@ -312,6 +312,34 @@ public class PickingOrderDomainService {
         return pickingOrderPO;
     }
 
+    /**
+     * 获取拣货单归档详情(已反审): 反审时拣货单/拣货明细均已软删(del_flag=2),
+     * 主表走 Reverse 查询(del_flag=2), 明细通过 DO.delFlag=2 查归档数据,
+     * 供拣货单【已反审】tab 查看详情。
+     */
+    public PickingOrderPO getReverseInfoByIdAndType(Long pickingOrderId, Integer type) {
+        PickingOrderPO pickingOrderPO = pickingOrderService.getInfoByIdAndTypeReverse(pickingOrderId, type);
+        if (pickingOrderPO == null) {
+            throw new ServiceException("拣货单不存在");
+        }
+        PickingMaterialDetailDO pickingMaterialDetailDO = new PickingMaterialDetailDO();
+        pickingMaterialDetailDO.setPickingOrderNumber(pickingOrderPO.getPickingOrderNumber());
+        pickingMaterialDetailDO.setDelFlag(2);
+        List<PickingMaterialDetailPO> pickingMaterialDetailPOList = pickingMaterialDetailService.queryList(pickingMaterialDetailDO);
+        for (PickingMaterialDetailPO pickingMaterialDetailPO : pickingMaterialDetailPOList) {
+            Long materialBaseInfoId = pickingMaterialDetailPO.getMaterialBaseInfoId();
+            MaterialBaseInfo materialBaseInfo = materialBaseInfoMapper.selectById(materialBaseInfoId);
+            if(materialBaseInfo!=null){
+                pickingMaterialDetailPO.setMaterialCode(materialBaseInfo.getMaterialCode());
+                pickingMaterialDetailPO.setMaterialName(materialBaseInfo.getMaterialName());
+                pickingMaterialDetailPO.setCopyCode(materialBaseInfo.getCopyCode());
+            }
+        }
+        copyCodeReferenceDomainService.fillWeightListOnPickingMaterialDetails(pickingMaterialDetailPOList);
+        pickingOrderPO.setMaterialDetailList(pickingMaterialDetailPOList);
+        return pickingOrderPO;
+    }
+
     /**
      * @description 整单下发
      * @author ZhouGY

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewMaterialDetail.java

@@ -120,4 +120,7 @@ public class ReviewMaterialDetail extends BaseVOEntity {
     @ApiModelProperty("包装详情id")
     @Excel(name = "包装详情id")
     private String packDetailId;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/entity/ReviewOrder.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
@@ -58,4 +59,7 @@ public class ReviewOrder extends BaseVOEntity {
     private Date receiveTime;
 
     private String remark;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/mapper/ReviewOrderMapper.java

@@ -24,6 +24,16 @@ public interface ReviewOrderMapper extends BaseMapper<ReviewOrder> {
      */
     ReviewOrderPO selectHeaderByReviewOrderId(@Param("reviewOrderId") Long reviewOrderId);
 
+    /**
+     * 详情-主表（按主键，归档: 已反审软删 del_flag=2，供【已反审】tab 详情）
+     */
+    ReviewOrderPO selectHeaderByReviewOrderIdReverse(@Param("reviewOrderId") Long reviewOrderId);
+
+    /**
+     * 详情-明细行（按复核单主键，归档: 已反审软删 del_flag=2）
+     */
+    List<ReviewMaterialDetailPO> queryDetailByReviewOrderIdReverse(@Param("reviewOrderId") Long reviewOrderId);
+
     /**
      * 详情-主表（按复核单号）
      */

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/po/ReviewOrderPO.java

@@ -106,4 +106,7 @@ public class ReviewOrderPO extends BaseVOEntity {
     /** 详情与上架单一致：头字段扁平 + 明细列表 */
     @ApiModelProperty("复核明细")
     private List<ReviewMaterialDetailPO> materialDetailList;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/reviewOrder/repository/todo/ReviewOrderDO.java

@@ -86,4 +86,7 @@ public class ReviewOrderDO extends BaseVOEntity {
      */
     @ApiModelProperty("仅已接收：1-是（receive_time 非空）")
     private Integer onlyReceived;
+
+    @ApiModelProperty("反审标记: 1-已反审(查询【已反审】tab时与delFlag=2一起传入)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java

@@ -410,4 +410,21 @@ public class StockInOrder extends BaseVOEntity {
 
     @ApiModelProperty("签名备注")
     private String signatureRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审(已反审tab过滤)")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java

@@ -477,4 +477,21 @@ public class StockInOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("签名备注")
     private String signatureRemark;
+
+    @ApiModelProperty("反审状态: 0-无 1-已反审(已反审tab过滤)")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java

@@ -470,6 +470,23 @@ public class StockInOrderDO extends BaseVOEntity {
     @ApiModelProperty("签名备注")
     private String signatureRemark;
 
+    @ApiModelProperty("反审状态: 0-无 1-已反审(已反审tab过滤)")
+    private Integer reverseAuditStatus;
+
+    @ApiModelProperty("反审原因")
+    private String reverseAuditRemark;
+
+    @ApiModelProperty("反审人id")
+    private Long reverseAuditBy;
+
+    @ApiModelProperty("反审人姓名")
+    private String reverseAuditByName;
+
+    @ApiModelProperty("反审时间")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reverseAuditTime;
+
     /**
      * PDA入库签名列表专用：作业任务人员模糊查询字段（与 workUserName LIKE 同义，
      * 单独提供是为了避免和现有 workUserName（精确/等值）逻辑冲突）。

mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/service/StockInOrderDomainService.java

@@ -30,10 +30,20 @@ import com.mhd.wms.domain.inMaterialDetail.repository.facade.IInMaterialDetailSe
 import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailBaseDO;
 import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
+import com.mhd.wms.domain.inOrderAbnormal.entity.InOrderAbnormal;
+import com.mhd.wms.domain.inOrderAbnormal.repository.facade.IInOrderAbnormalService;
+import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord;
+import com.mhd.wms.domain.inventoryAdjustmentRecord.repository.facade.IInventoryAdjustmentRecordService;
+import com.mhd.wms.domain.inventoryStandingDetail.entity.InventoryStandingDetail;
+import com.mhd.wms.domain.inventoryStandingDetail.repository.facade.IInventoryStandingDetailService;
 import com.mhd.wms.domain.materialBaseInfo.repository.facade.IMaterialBaseInfoService;
 import com.mhd.wms.domain.materialBaseInfo.repository.po.MaterialBaseInfoPO;
 import com.mhd.wms.domain.materialGoodsRule.repository.facade.IMaterialGoodsRuleService;
 import com.mhd.wms.domain.materialGoodsRule.repository.po.MaterialGoodsRulePO;
+import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
+import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventoryService;
+import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryDO;
+import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryParentDO;
 import com.mhd.wms.domain.materialWarehouseControl.repository.facade.IMaterialWarehouseControlService;
 import com.mhd.wms.domain.materialWarehouseControl.repository.po.MaterialWarehouseControlPO;
 import com.mhd.wms.domain.qualityInspection.repository.facade.IQualityInspectionService;
@@ -53,6 +63,10 @@ import com.mhd.wms.domain.stockInOrder.repository.po.StockInOrderPO;
 import com.mhd.wms.domain.stockInOrder.repository.todo.StockInOrderDO;
 import com.mhd.wms.domain.stockInTaskOrder.entity.StockInTaskOrder;
 import com.mhd.wms.domain.stockInTaskOrder.repository.facade.IStockInTaskOrderService;
+import com.mhd.wms.domain.taskShelfMaterialDetail.entity.TaskShelfMaterialDetail;
+import com.mhd.wms.domain.taskShelfMaterialDetail.repository.facade.ITaskShelfMaterialDetailService;
+import com.mhd.wms.domain.taskShelfMaterialDetail.entity.TaskShelfMaterialDetail;
+import com.mhd.wms.domain.taskShelfMaterialDetail.repository.facade.ITaskShelfMaterialDetailService;
 import com.mhd.wms.domain.stockReceiptOrder.entity.StockReceiptOrder;
 import com.mhd.wms.domain.stockReceiptOrder.repository.facade.IStockReceiptOrderService;
 import com.mhd.wms.domain.stockReceiptOrder.repository.po.StockReceiptOrderPO;
@@ -127,6 +141,16 @@ public class StockInOrderDomainService {
     @Autowired
     private ITaskReceiptMaterialDetailService taskReceiptMaterialDetailService;
     @Autowired
+    private ITaskShelfMaterialDetailService taskShelfMaterialDetailService;
+    @Autowired
+    private IInventoryAdjustmentRecordService inventoryAdjustmentRecordService;
+    @Autowired
+    private IInventoryStandingDetailService inventoryStandingDetailService;
+    @Autowired
+    private IMaterialInventoryService materialInventoryService;
+    @Autowired
+    private IInOrderAbnormalService inOrderAbnormalService;
+    @Autowired
     private IdGenerator idGenerator;
 
     /**
@@ -521,21 +545,44 @@ public class StockInOrderDomainService {
      * 获取入库单详细信息
      */
     public StockInOrderPO getInfo(Long inOrderId)
+    {
+        return getInfo(inOrderId, false);
+    }
+
+    /**
+     * 获取入库单详情
+     * @param archive true-查询【已反审】tab 归档数据（主单须为已软删+已反审标记，收货/上架单及明细放行软删行）
+     */
+    public StockInOrderPO getInfo(Long inOrderId, boolean archive)
     {
         StockInOrderPO stockInOrderPO = stockInOrderService.getInfo(inOrderId);
+        if (archive && (stockInOrderPO.getDelFlag() == null || stockInOrderPO.getDelFlag() != 2
+                || !Integer.valueOf(1).equals(stockInOrderPO.getReverseAuditStatus()))) {
+            throw new ServiceException("入库单非已反审归档数据，无法查看归档详情");
+        }
         InMaterialDetailDO inMaterialDetailDO = new InMaterialDetailDO();
         inMaterialDetailDO.setInOrderNumber(stockInOrderPO.getInOrderNumber());
         inMaterialDetailDO.setLevel(1);
+        if (archive) {
+            //归档明细已随主单软删，放行软删行
+            inMaterialDetailDO.setDelFlag(2);
+        }
         List<InMaterialDetailPO> inMaterialDetailPOList = materialDetailService.queryList(inMaterialDetailDO);
 
         // 先通过入库单号查询收货单列表
         StockReceiptOrderDO stockReceiptOrderDO = new StockReceiptOrderDO();
         stockReceiptOrderDO.setInOrderNumber(stockInOrderPO.getInOrderNumber());
+        if (archive) {
+            stockReceiptOrderDO.setDelFlag(2);
+        }
         List<StockReceiptOrderPO> stockReceiptOrderPOList = stockReceiptOrderDomainService.queryList(stockReceiptOrderDO);
 
         // 先通过入库单号查询上架单列表
         StockShelfOrderDO stockShelfOrderDO = new StockShelfOrderDO();
         stockShelfOrderDO.setInOrderNumber(stockInOrderPO.getInOrderNumber());
+        if (archive) {
+            stockShelfOrderDO.setDelFlag(2);
+        }
         List<StockShelfOrderPO> stockShelfOrderPOList = stockShelfOrderDomainService.queryList(stockShelfOrderDO);
 
         // 查询收货单明细，用于填充收货数量和更新毛重、净重、面积、体积
@@ -548,6 +595,9 @@ public class StockInOrderDomainService {
             if (!CollectionUtils.isEmpty(receiptOrderNumberList)) {
                 ReceiptMaterialDetailDO receiptMaterialDetailDO = new ReceiptMaterialDetailDO();
                 receiptMaterialDetailDO.setReceiptOrderNumberList(receiptOrderNumberList);
+                if (archive) {
+                    receiptMaterialDetailDO.setDelFlag(2);
+                }
                 receiptMaterialDetailPOList = receiptMaterialDetailService.queryList(receiptMaterialDetailDO);
             }
         }
@@ -559,6 +609,9 @@ public class StockInOrderDomainService {
                 if (StringUtils.isNotBlank(stockShelfOrderPO.getShelfOrderNumber())) {
                     ShelfMaterialDetailDO shelfMaterialDetailDO = new ShelfMaterialDetailDO();
                     shelfMaterialDetailDO.setShelfOrderNumber(stockShelfOrderPO.getShelfOrderNumber());
+                    if (archive) {
+                        shelfMaterialDetailDO.setDelFlag(2);
+                    }
                     List<ShelfMaterialDetailPO> shelfDetails = shelfMaterialDetailService.queryList(shelfMaterialDetailDO);
                     if (!CollectionUtils.isEmpty(shelfDetails)) {
                         shelfMaterialDetailPOList.addAll(shelfDetails);
@@ -844,6 +897,321 @@ public class StockInOrderDomainService {
                 .eq(StockInOrder::getDelFlag, 1));
     }
 
+    /**
+     * OMS入库业务单反审：WMS侧一个事务内把已完成单据回退到最原始状态（供 Feign /stockInOrderApi/omsReverseInOrder 调用）。
+     *
+     * <p>与 {@link #cancelExecutionOrder(StockInOrder)}（取消下发，仅限未开始收货）不同，本方法处理
+     * 已开始收货/上架/已入库(status&gt;=3)的单据，回退动作与"完成收货/完成上架"链路对称：</p>
+     * <ul>
+     *   <li>出库拦截：按"入库单号+动作(分配库存/出库)"查库存调整记录&gt;0 即有出库记录；另校验库存冻结量
+     *       （入库单有出库就不能反审）</li>
+     *   <li>回退库存：按本单库存行整行扣回（上架时 inventory_quantity 与 allocation_quantity 同量增加、
+     *       重量体积一并累加，此处对称扣回，复用统一扣减服务 GREATEST(x-n,0) 兜底）；
+     *       扣减前校验"库存行合计=已上架完成量"，不一致说明发生过库存合并/人工调整，拦截人工核实</li>
+     *   <li>W入库单/W收货单/W上架单整链软删(del_flag=2)并打已反审标记(REVERSE_AUDIT_STATUS=1)，
+     *       各页面【已反审】tab按"已软删+已反审"(del_flag=2 and reverse_audit_status=1)查询归档数据；
+     *       物料明细/作业单/任务/质检单一并软删留痕，台账节点物理删除保持与回退后库存一致</li>
+     *   <li>写1条入库异常【反审记录】(in_order_abnormal type=3/abnormalType=6) 用于记录跟踪</li>
+     * </ul>
+     * <p>WMS无该单数据时幂等返回成功（OMS未下发单反审仅落1条反审记录留痕，不产生其他WMS数据）；任何校验失败抛错经
+     * Feign 返回，OMS侧整体回滚。反审可重试，本方法幂等。</p>
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void reverseExecutionOrder(StockInOrder stockInOrder) {
+        String inOrderNumber = stockInOrder.getInOrderNumber();
+        if (StringUtils.isEmpty(inOrderNumber)) {
+            throw new ServiceException("反审失败：入库单号为空");
+        }
+        //反审原因/反审人由OMS经Feign传入（不依赖Feign链路的登录上下文）
+        String reverseReason = stockInOrder.getRemark();
+        String reverseByName = stockInOrder.getUpdateByName();
+
+        List<StockInOrder> stockInOrders = stockInOrderService.list(new LambdaQueryWrapper<StockInOrder>()
+                .eq(StockInOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockInOrder::getDelFlag, 1));
+        if (CollectionUtils.isEmpty(stockInOrders)) {
+            //幂等：WMS无该单数据（未下发单反审或已反审过/重试），直接成功，保证OMS反审可重试；
+            //反审记录仍落一条留痕（入库异常页面可查），同单号已有反审记录时不再重复写（重试幂等）
+            saveReverseAuditAbnormalIfAbsent(stockInOrder, BigDecimal.ZERO, "未下发WMS，无WMS链路数据需回退");
+            return;
+        }
+        StockInOrder wmsOrder = stockInOrders.get(0);
+
+        // ========== 1. 出库拦截：入库单有出库就不能反审 ==========
+        //按"入库单号+动作(分配库存/出库)"查询库存调整记录：出库分配/交接出库时都会写入调整记录，
+        //>0 即证明该入库单的库存已发生出库流转；取消分配时调整记录随之软删，不会误拦
+        List<InventoryAdjustmentRecord> outboundRecords = inventoryAdjustmentRecordService.list(
+                new LambdaQueryWrapper<InventoryAdjustmentRecord>()
+                        .eq(InventoryAdjustmentRecord::getInOrderNumber, inOrderNumber)
+                        .in(InventoryAdjustmentRecord::getAdjustAction, "分配库存", "出库")
+                        .eq(InventoryAdjustmentRecord::getDelFlag, 1));
+        if (!CollectionUtils.isEmpty(outboundRecords)) {
+            throw new ServiceException("入库单[" + inOrderNumber + "]已产生出库记录，无法反审");
+        }
+        //本单库存行（反审要扣回的库存）
+        List<MaterialInventory> inventoryRows = materialInventoryService.list(new LambdaQueryWrapper<MaterialInventory>()
+                .eq(MaterialInventory::getInOrderNumber, inOrderNumber));
+        for (MaterialInventory row : inventoryRows) {
+            if (row.getFreezeQuantity() != null && row.getFreezeQuantity().compareTo(BigDecimal.ZERO) > 0) {
+                throw new ServiceException("入库单[" + inOrderNumber + "]库存已被出库分配，无法反审");
+            }
+        }
+
+        // ========== 2. 回退库存（对称"完成上架"写入） ==========
+        List<StockShelfOrder> shelfOrders = stockShelfOrderService.list(new LambdaQueryWrapper<StockShelfOrder>()
+                .eq(StockShelfOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockShelfOrder::getDelFlag, 1));
+        List<String> shelfOrderNumbers = shelfOrders.stream()
+                .map(StockShelfOrder::getShelfOrderNumber)
+                .filter(StringUtils::isNotEmpty)
+                .distinct()
+                .collect(Collectors.toList());
+        BigDecimal inventoryTotal = inventoryRows.stream()
+                .map(row -> row.getInventoryQuantity() == null ? BigDecimal.ZERO : row.getInventoryQuantity())
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        if (inventoryTotal.compareTo(BigDecimal.ZERO) > 0) {
+            //扣减前校验：库存行合计必须等于"已完成上架单"的上架量，否则整行扣回会误伤合并进来的其他来源库存。
+            //只统计已完成(status=3)的上架单——库存只在完成上架时写入，上架中未完成的单不产生库存
+            BigDecimal shelfDoneTotal = BigDecimal.ZERO;
+            List<String> doneShelfOrderNumbers = shelfOrders.stream()
+                    .filter(shelfOrder -> shelfOrder.getStatus() != null && shelfOrder.getStatus() == 3)
+                    .map(StockShelfOrder::getShelfOrderNumber)
+                    .filter(StringUtils::isNotEmpty)
+                    .distinct()
+                    .collect(Collectors.toList());
+            if (!doneShelfOrderNumbers.isEmpty()) {
+                List<ShelfMaterialDetail> shelfDetails = shelfMaterialDetailService.list(new LambdaQueryWrapper<ShelfMaterialDetail>()
+                        .in(ShelfMaterialDetail::getShelfOrderNumber, doneShelfOrderNumbers)
+                        .eq(ShelfMaterialDetail::getDelFlag, 1));
+                for (ShelfMaterialDetail shelfDetail : shelfDetails) {
+                    BigDecimal shelved = shelfDetail.getAlreadyShelvesQuantity() != null
+                            ? shelfDetail.getAlreadyShelvesQuantity()
+                            : (shelfDetail.getShelvesQuantity() != null ? shelfDetail.getShelvesQuantity() : BigDecimal.ZERO);
+                    shelfDoneTotal = shelfDoneTotal.add(shelved);
+                }
+            }
+            if (shelfDoneTotal.compareTo(BigDecimal.ZERO) <= 0 || inventoryTotal.compareTo(shelfDoneTotal) != 0) {
+                throw new ServiceException("入库单[" + inOrderNumber + "]库存(" + inventoryTotal.stripTrailingZeros().toPlainString()
+                        + ")与上架完成量(" + shelfDoneTotal.stripTrailingZeros().toPlainString()
+                        + ")不一致，可能已发生出库或库存合并，请人工核实后再反审");
+            }
+            List<MaterialInventoryDO> subtractList = new ArrayList<>();
+            for (MaterialInventory row : inventoryRows) {
+                if (row.getInventoryQuantity() == null || row.getInventoryQuantity().compareTo(BigDecimal.ZERO) <= 0) {
+                    continue;
+                }
+                MaterialInventoryDO subtractDO = new MaterialInventoryDO();
+                subtractDO.setMaterialInventoryId(row.getMaterialInventoryId());
+                subtractDO.setInventoryQuantity(row.getInventoryQuantity());
+                //SQL按 GREATEST(x-#{item.n},0) 扣减，DM/Oracle下 GREATEST 遇 null 返回 null，数值字段一律兜底0
+                subtractDO.setNetWeight(row.getNetWeight() == null ? BigDecimal.ZERO : row.getNetWeight());
+                subtractDO.setGrossWeight(row.getGrossWeight() == null ? BigDecimal.ZERO : row.getGrossWeight());
+                subtractDO.setVolume(row.getVolume() == null ? BigDecimal.ZERO : row.getVolume());
+                subtractDO.setArea(row.getArea() == null ? BigDecimal.ZERO : row.getArea());
+                subtractList.add(subtractDO);
+            }
+            if (!CollectionUtils.isEmpty(subtractList)) {
+                //直接走统一批量扣减(GREATEST(x-n,0)兜底)并显式传更新人：不经 updateMaterialInventoryInfo，
+                //其内部 subtractMaterialInventory 取 SecurityUtils 登录上下文，OMS经Feign调用时可能无登录态(会抛异常)
+                MaterialInventoryParentDO subtractParent = new MaterialInventoryParentDO();
+                subtractParent.setMaterialInventoryDOList(subtractList);
+                subtractParent.setUpdateBy(stockInOrder.getUpdateBy() == null ? 0L : stockInOrder.getUpdateBy());
+                subtractParent.setUpdateByName(StringUtils.isEmpty(reverseByName) ? "system" : reverseByName);
+                subtractParent.setUpdateTime(new Date());
+                materialInventoryService.batchSubtractInventoryQuantity(subtractParent);
+            }
+        }
+
+        // ========== 3. 软删下游全链 + W入库单/W收货单/W上架单打"已反审"标记 ==========
+        //三单软删(del_flag=2)并打已反审标记(REVERSE_AUDIT_STATUS=1)，各页面【已反审】tab按
+        //"已软删+已反审"(del_flag=2 and reverse_audit_status=1)查询归档数据；
+        //物料明细/收货上架作业单/任务/质检单/台账一并软删留痕，重新下发时生成全新数据
+        String reverseRemarkForWms = StringUtils.isEmpty(reverseReason) ? "入库单反审" : "入库单反审：" + reverseReason;
+        Long reverseAuditUserId = stockInOrder.getUpdateBy() == null ? 0L : stockInOrder.getUpdateBy();
+        String reverseAuditUserName = StringUtils.isEmpty(reverseByName) ? "system" : reverseByName;
+        Date reverseAuditDate = new Date();
+        //收货单（含历史重复下发产生的多张同号收货单，全部查出统一清理，避免按单号取一条漏删/报错）
+        List<StockReceiptOrder> receiptOrders = stockReceiptOrderService.list(new LambdaQueryWrapper<StockReceiptOrder>()
+                .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockReceiptOrder::getDelFlag, 1));
+        List<String> receiptOrderNumbers = receiptOrders.stream()
+                .map(StockReceiptOrder::getReceiptOrderNumber)
+                .filter(StringUtils::isNotEmpty)
+                .distinct()
+                .collect(Collectors.toList());
+        //收货/上架作业单（type=1收货 type=2上架；上架作业单兜底按上架单号再查一道防 in_order_number 为空）
+        //上架单复用第2节已查出的 shelfOrders/shelfOrderNumbers
+        List<StockInTaskOrder> taskOrders = stockInTaskOrderService.list(new LambdaQueryWrapper<StockInTaskOrder>()
+                .eq(StockInTaskOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockInTaskOrder::getDelFlag, 1));
+        if (!shelfOrderNumbers.isEmpty()) {
+            Set<String> existTaskNumbers = taskOrders.stream()
+                    .map(StockInTaskOrder::getTaskNumber)
+                    .collect(Collectors.toSet());
+            List<StockInTaskOrder> shelfTaskOrders = stockInTaskOrderService.list(new LambdaQueryWrapper<StockInTaskOrder>()
+                    .in(StockInTaskOrder::getShelfOrderNumber, shelfOrderNumbers)
+                    .eq(StockInTaskOrder::getDelFlag, 1));
+            for (StockInTaskOrder shelfTaskOrder : shelfTaskOrders) {
+                if (shelfTaskOrder.getTaskNumber() != null && !existTaskNumbers.contains(shelfTaskOrder.getTaskNumber())) {
+                    taskOrders.add(shelfTaskOrder);
+                }
+            }
+        }
+        List<String> taskNumbers = taskOrders.stream()
+                .map(StockInTaskOrder::getTaskNumber)
+                .filter(StringUtils::isNotEmpty)
+                .distinct()
+                .collect(Collectors.toList());
+        //1.收货/上架作业单明细
+        if (!taskNumbers.isEmpty()) {
+            taskReceiptMaterialDetailService.update(new UpdateWrapper<TaskReceiptMaterialDetail>().lambda()
+                    .set(TaskReceiptMaterialDetail::getDelFlag, 2)
+                    .in(TaskReceiptMaterialDetail::getTaskNumber, taskNumbers)
+                    .eq(TaskReceiptMaterialDetail::getDelFlag, 1));
+            taskShelfMaterialDetailService.update(new UpdateWrapper<TaskShelfMaterialDetail>().lambda()
+                    .set(TaskShelfMaterialDetail::getDelFlag, 2)
+                    .in(TaskShelfMaterialDetail::getTaskNumber, taskNumbers)
+                    .eq(TaskShelfMaterialDetail::getDelFlag, 1));
+        }
+        //2.收货/上架作业单
+        if (!taskNumbers.isEmpty()) {
+            stockInTaskOrderService.update(new UpdateWrapper<StockInTaskOrder>().lambda()
+                    .set(StockInTaskOrder::getDelFlag, 2)
+                    .eq(StockInTaskOrder::getInOrderNumber, inOrderNumber)
+                    .eq(StockInTaskOrder::getDelFlag, 1));
+            if (!shelfOrderNumbers.isEmpty()) {
+                stockInTaskOrderService.update(new UpdateWrapper<StockInTaskOrder>().lambda()
+                        .set(StockInTaskOrder::getDelFlag, 2)
+                        .in(StockInTaskOrder::getShelfOrderNumber, shelfOrderNumbers)
+                        .eq(StockInTaskOrder::getDelFlag, 1));
+            }
+        }
+        //3.收货/上架任务（tracking_number=收货/上架单号；补"RV-"+入库单号兜底历史同号收货单）
+        if (!receiptOrderNumbers.isEmpty() || !shelfOrderNumbers.isEmpty()) {
+            Set<String> trackingNumbers = new HashSet<>(receiptOrderNumbers);
+            trackingNumbers.addAll(shelfOrderNumbers);
+            trackingNumbers.add("RV-" + inOrderNumber);
+            deliveTaskService.update(new UpdateWrapper<DeliveTask>().lambda()
+                    .set(DeliveTask::getDelFlag, 2)
+                    .in(DeliveTask::getTrackingNumber, trackingNumbers)
+                    .in(DeliveTask::getTaskType, 1, 2)
+                    .eq(DeliveTask::getDelFlag, 1));
+        }
+        //4.质检单
+        qualityInspectionService.update(new UpdateWrapper<com.mhd.wms.domain.qualityInspection.entity.QualityInspection>().lambda()
+                .set(com.mhd.wms.domain.qualityInspection.entity.QualityInspection::getDelFlag, 2)
+                .eq(com.mhd.wms.domain.qualityInspection.entity.QualityInspection::getInOrderNumber, inOrderNumber)
+                .eq(com.mhd.wms.domain.qualityInspection.entity.QualityInspection::getDelFlag, 1));
+        //5.收货单明细
+        if (!receiptOrderNumbers.isEmpty()) {
+            receiptMaterialDetailService.update(new UpdateWrapper<ReceiptMaterialDetail>().lambda()
+                    .set(ReceiptMaterialDetail::getDelFlag, 2)
+                    .in(ReceiptMaterialDetail::getReceiptOrderNumber, receiptOrderNumbers)
+                    .eq(ReceiptMaterialDetail::getDelFlag, 1));
+        }
+        //6.收货单（软删+打已反审标记，收货单【已反审】tab 可查归档数据）
+        stockReceiptOrderService.update(new UpdateWrapper<StockReceiptOrder>().lambda()
+                .set(StockReceiptOrder::getDelFlag, 2)
+                .set(StockReceiptOrder::getReverseAuditStatus, 1)
+                .set(StockReceiptOrder::getReverseAuditRemark, reverseRemarkForWms)
+                .set(StockReceiptOrder::getReverseAuditBy, reverseAuditUserId)
+                .set(StockReceiptOrder::getReverseAuditByName, reverseAuditUserName)
+                .set(StockReceiptOrder::getReverseAuditTime, reverseAuditDate)
+                .set(StockReceiptOrder::getUpdateBy, reverseAuditUserId)
+                .set(StockReceiptOrder::getUpdateByName, reverseAuditUserName)
+                .set(StockReceiptOrder::getUpdateTime, reverseAuditDate)
+                .eq(StockReceiptOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockReceiptOrder::getDelFlag, 1));
+        //7.上架单明细
+        if (!shelfOrderNumbers.isEmpty()) {
+            shelfMaterialDetailService.update(new UpdateWrapper<ShelfMaterialDetail>().lambda()
+                    .set(ShelfMaterialDetail::getDelFlag, 2)
+                    .in(ShelfMaterialDetail::getShelfOrderNumber, shelfOrderNumbers)
+                    .eq(ShelfMaterialDetail::getDelFlag, 1));
+        }
+        //8.上架单（软删+打已反审标记，上架单【已反审】tab 可查归档数据）
+        stockShelfOrderService.update(new UpdateWrapper<StockShelfOrder>().lambda()
+                .set(StockShelfOrder::getDelFlag, 2)
+                .set(StockShelfOrder::getReverseAuditStatus, 1)
+                .set(StockShelfOrder::getReverseAuditRemark, reverseRemarkForWms)
+                .set(StockShelfOrder::getReverseAuditBy, reverseAuditUserId)
+                .set(StockShelfOrder::getReverseAuditByName, reverseAuditUserName)
+                .set(StockShelfOrder::getReverseAuditTime, reverseAuditDate)
+                .set(StockShelfOrder::getUpdateBy, reverseAuditUserId)
+                .set(StockShelfOrder::getUpdateByName, reverseAuditUserName)
+                .set(StockShelfOrder::getUpdateTime, reverseAuditDate)
+                .eq(StockShelfOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockShelfOrder::getDelFlag, 1));
+        //9.收货/上架节点库存台账（trackingNumber=收货/上架单号；台账无逻辑删除标志，物理删除保持台账与回退后库存一致）
+        Set<String> standingTrackingNumbers = new HashSet<>(receiptOrderNumbers);
+        standingTrackingNumbers.addAll(shelfOrderNumbers);
+        if (!standingTrackingNumbers.isEmpty()) {
+            inventoryStandingDetailService.remove(new LambdaQueryWrapper<InventoryStandingDetail>()
+                    .in(InventoryStandingDetail::getTrackingNumber, standingTrackingNumbers)
+                    .in(InventoryStandingDetail::getNodeStatus, 1, 2));
+        }
+        //10.入库单明细
+        materialDetailService.update(new UpdateWrapper<InMaterialDetail>().lambda()
+                .set(InMaterialDetail::getDelFlag, 2)
+                .eq(InMaterialDetail::getInOrderNumber, inOrderNumber)
+                .eq(InMaterialDetail::getDelFlag, 1));
+        //11.入库单（软删+打已反审标记，入库单【已反审】tab 可查归档数据）
+        stockInOrderService.update(new UpdateWrapper<StockInOrder>().lambda()
+                .set(StockInOrder::getDelFlag, 2)
+                .set(StockInOrder::getReverseAuditStatus, 1)
+                .set(StockInOrder::getReverseAuditRemark, reverseRemarkForWms)
+                .set(StockInOrder::getReverseAuditBy, reverseAuditUserId)
+                .set(StockInOrder::getReverseAuditByName, reverseAuditUserName)
+                .set(StockInOrder::getReverseAuditTime, reverseAuditDate)
+                .set(StockInOrder::getUpdateBy, reverseAuditUserId)
+                .set(StockInOrder::getUpdateByName, reverseAuditUserName)
+                .set(StockInOrder::getUpdateTime, reverseAuditDate)
+                .eq(StockInOrder::getInOrderNumber, inOrderNumber)
+                .eq(StockInOrder::getDelFlag, 1));
+
+        // ========== 4. 写1条入库异常【反审记录】用于记录跟踪（组织信息取自W入库单） ==========
+        StockInOrder abnormalParam = new StockInOrder();
+        abnormalParam.setInOrderNumber(inOrderNumber);
+        abnormalParam.setOrganizationId(wmsOrder.getOrganizationId());
+        abnormalParam.setOrganizationName(wmsOrder.getOrganizationName());
+        abnormalParam.setTopOrganizationId(wmsOrder.getTopOrganizationId());
+        abnormalParam.setRemark(reverseReason);
+        abnormalParam.setUpdateBy(stockInOrder.getUpdateBy());
+        abnormalParam.setUpdateByName(reverseByName);
+        saveReverseAuditAbnormalIfAbsent(abnormalParam, inventoryTotal,
+                "回退库存" + inventoryTotal.stripTrailingZeros().toPlainString() + "，清理收货/上架链路数据");
+    }
+
+    /**
+     * 写入库异常【反审记录】（type=3/abnormalType=6，FSYC单号）。
+     * 同单号已存在有效反审记录时跳过，保证"OMS重试/重复反审"不产生重复记录（幂等）。
+     *
+     * @param stockInOrder 载荷：入库单号/反审原因(remark)/操作人(updateBy,updateByName)/组织三字段
+     * @param quantity     本次反审回退的库存量（未下发WMS无库存回退时传0）
+     * @param sceneRemark  场景补充说明，拼入记录备注
+     */
+    private void saveReverseAuditAbnormalIfAbsent(StockInOrder stockInOrder, BigDecimal quantity, String sceneRemark) {
+        long existing = inOrderAbnormalService.count(new LambdaQueryWrapper<InOrderAbnormal>()
+                .eq(InOrderAbnormal::getInOrderNumber, stockInOrder.getInOrderNumber())
+                .eq(InOrderAbnormal::getAbnormalType, 6)
+                .eq(InOrderAbnormal::getDelFlag, 1));
+        if (existing > 0) {
+            return;
+        }
+        InOrderAbnormal reverseAbnormal = new InOrderAbnormal();
+        reverseAbnormal.setOrganizationId(stockInOrder.getOrganizationId());
+        reverseAbnormal.setOrganizationName(stockInOrder.getOrganizationName());
+        reverseAbnormal.setTopOrganizationId(stockInOrder.getTopOrganizationId());
+        reverseAbnormal.setInOrderNumber(stockInOrder.getInOrderNumber());
+        reverseAbnormal.setAbnormalReason(StringUtils.isEmpty(stockInOrder.getRemark())
+                ? "入库业务单反审" : "入库业务单反审：" + stockInOrder.getRemark());
+        reverseAbnormal.setQuantity(quantity == null ? BigDecimal.ZERO : quantity);
+        reverseAbnormal.setRemark("入库业务单反审：" + (StringUtils.isEmpty(sceneRemark) ? "" : sceneRemark));
+        reverseAbnormal.setCreateBy(stockInOrder.getUpdateBy() == null ? 0L : stockInOrder.getUpdateBy());
+        reverseAbnormal.setCreateByName(StringUtils.isEmpty(stockInOrder.getUpdateByName()) ? "system" : stockInOrder.getUpdateByName());
+        inOrderAbnormalService.genReverseAuditAbnormal(reverseAbnormal);
+    }
+
     /**
      * OMS下发入库单明细保存后自动审核通过（生成收货单并更新审核状态）
      */

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/entity/StockOutOrder.java

@@ -461,4 +461,7 @@ public class StockOutOrder extends BaseVOEntity {
 
     @ApiModelProperty("签名备注")
     private String signatureRemark;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/po/StockOutOrderPO.java

@@ -497,4 +497,7 @@ public class StockOutOrderPO extends BaseVOEntity {
 
     @ApiModelProperty("签名备注")
     private String signatureRemark;
+
+    @ApiModelProperty("反审标记: 0-无 1-已反审(反审时软删del_flag=2并打标记)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/repository/todo/StockOutOrderDO.java

@@ -538,4 +538,7 @@ public class StockOutOrderDO extends BaseVOEntity {
     /** PDA出库签名列表专用：作业任务人员模糊查询字段 */
     @ApiModelProperty("作业任务人员模糊查询")
     private String workUserNameLike;
+
+    @ApiModelProperty("反审标记: 1-已反审(查询【已反审】tab时与delFlag=2一起传入)")
+    private Integer reverseFlag;
 }

mhd_wms/src/main/java/com/mhd/wms/domain/stockOutOrder/service/StockOutOrderDomainService.java

@@ -48,6 +48,7 @@ import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
 import com.mhd.wms.domain.materialInventory.repository.facade.IMaterialInventoryService;
 import com.mhd.wms.domain.materialInventory.repository.mapper.MaterialInventoryMapper;
 import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
+import com.mhd.wms.domain.materialInventory.repository.todo.MaterialInventoryParamDO;
 import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
 import com.mhd.wms.domain.materialWarehouseControl.repository.facade.IMaterialWarehouseControlService;
 import com.mhd.wms.domain.materialWarehouseControl.repository.po.MaterialWarehouseControlPO;
@@ -63,6 +64,7 @@ import com.mhd.wms.domain.outMaterialDetail.repository.po.OutMaterialDetailPO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailBaseDO;
 import com.mhd.wms.domain.outMaterialDetail.repository.todo.OutMaterialDetailDO;
 import com.mhd.wms.domain.outOrderAbnormal.repository.facade.IOutOrderAbnormalService;
+import com.mhd.wms.domain.outOrderAbnormal.entity.OutOrderAbnormal;
 import com.mhd.wms.domain.outOrderAbnormal.repository.todo.OutOrderAbnormalBaseDO;
 import com.mhd.wms.domain.pickingMaterialDetail.entity.PickingMaterialDetail;
 import com.mhd.wms.domain.pickingMaterialDetail.repository.facade.IPickingMaterialDetailService;
@@ -888,6 +890,34 @@ public class StockOutOrderDomainService {
         return stockOutOrderPO;
     }
 
+    /**
+     * 获取出库单归档详情(已反审): 出库单反审时主表/明细均已软删(del_flag=2),
+     * 主表 getInfo 走 getById 不滤 del_flag, 明细通过 DO.delFlag=2 查归档数据
+     * (out_material_detail queryList XML 支持 delFlag 参数), 供【已反审】tab 查看详情。
+     */
+    public StockOutOrderPO getReverseInfoChildren(Long outOrderId) {
+        StockOutOrderPO stockOutOrderPO = stockOutOrderService.getInfo(outOrderId);
+        if (stockOutOrderPO == null || stockOutOrderPO.getOutOrderNumber() == null) {
+            throw new ServiceException("出库单不存在");
+        }
+        OutMaterialDetailDO outMaterialDetailDO = new OutMaterialDetailDO();
+        outMaterialDetailDO.setOutOrderNumber(stockOutOrderPO.getOutOrderNumber());
+        outMaterialDetailDO.setDelFlag(2);
+        List<OutMaterialDetailPO> materialDetailPOList = outMaterialDetailService.queryListChildren(outMaterialDetailDO);
+        for (OutMaterialDetailPO outMaterialDetailPO : materialDetailPOList) {
+            String materialNo = outMaterialDetailPO.getMaterialNo();
+            List<MaterialBaseInfo> materialBaseInfos = materialBaseInfoMapper.selectList(new QueryWrapper<MaterialBaseInfo>().lambda().eq(MaterialBaseInfo::getMaterialCode, materialNo));
+            if (!CollectionUtils.isEmpty(materialBaseInfos) && materialBaseInfos.size() > 0) {
+                outMaterialDetailPO.setCommodityName(materialBaseInfos.get(0).getMaterialName());
+                outMaterialDetailPO.setMaterialCode(materialBaseInfos.get(0).getMaterialCode());
+                outMaterialDetailPO.setMaterialName(materialBaseInfos.get(0).getMaterialName());
+                outMaterialDetailPO.setCopyCode(materialBaseInfos.get(0).getCopyCode());
+            }
+        }
+        stockOutOrderPO.setMaterialDetailList(materialDetailPOList);
+        return stockOutOrderPO;
+    }
+
     /**
      * 获取出库单详细信息（PDA复核管理查询详情）
      * 复核场景下与PC端getCheckInfo保持一致，返回拣货下发时的完整数据（树形结构、拣货汇总、批次属性等）
@@ -2625,6 +2655,191 @@ public class StockOutOrderDomainService {
         }
     }
 
+    /**
+     * @description oms出库执行单反审(业务单反审时逐执行单调用; 业务单侧仅允许"已审核未出库"单据反审):
+     * 按WMS出库单状态分支还原库存:
+     * 1.未出库(状态非9, 常规场景): 还原分配占用(可用+、冻结-, 与 cancelExecutionOrder 取消分配同口径),
+     *   不动实物库存、不推OMS——实物未被扣减, 加回会虚增库存; 软删库存调整记录。
+     * 2.已出库(状态9, 防御分支, 业务单侧已拦截): 镜像交接扣减 doStockOutDeduct(实物/可用加回, 冻结不动),
+     *   生成库存调整记录【出库反审】并 omsEdit 推送还原OMS预约库存。
+     * 3.逻辑删除出库链路单据(软删+reverseFlag=1, 划归【已反审】tab): 配送明细/出库明细/出库单/拣货单及明细/复核单及明细/交接作业单。
+     * 4.生成1条出库异常记录【反审记录】(abnormalType=3), 单号前缀 FSYC, 供记录跟踪。
+     * 反审原因经入参 remark 透传(OMS侧拼接业务单号+反审原因)。
+     * @date 2026/9/8
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void reverseExecutionOrder(StockOutOrder stockOutOrder) {
+        String outOrderNumber = stockOutOrder.getOutOrderNumber();
+        StockOutOrder stockOutOrderDB = stockOutOrderService.getOne(new LambdaQueryWrapper<StockOutOrder>()
+                .eq(StockOutOrder::getOutOrderNumber, outOrderNumber)
+                .eq(StockOutOrder::getDelFlag, 1));
+        if (stockOutOrderDB == null) {
+            // 幂等: OMS普通「下发」生成的执行单不推WMS(仅「执行并下发」才推), WMS无此单属正常场景,
+            // 直接返回成功(无数据可清), 由OMS侧完成OMS侧清理——与入库侧反审"WMS无数据时幂等成功"同口径
+            log.info("出库反审幂等：WMS无活动出库单[{}]，无需清理", outOrderNumber);
+            return;
+        }
+        // OMS经Feign调用时可能无登录上下文(SecurityUtils会抛异常), 容错获取, 兜底用出库单创建人
+        LoginUser loginUser;
+        try {
+            loginUser = SecurityUtils.getLoginUser();
+        } catch (Exception e) {
+            loginUser = new LoginUser();
+            loginUser.setUserid(stockOutOrderDB.getCreateBy() != null ? stockOutOrderDB.getCreateBy() : 0L);
+            loginUser.setUsername(stockOutOrderDB.getCreateByName() != null ? stockOutOrderDB.getCreateByName() : "system");
+        }
+        String reverseRemark = stockOutOrder.getRemark();
+        //逻辑删除配送明细(所有清理路径统一先清, 与 cancelExecutionOrder 一致)
+        deliveryDetailsLinkService.update(new UpdateWrapper<com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink>().lambda()
+                .set(com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink::getDelFlag, 2)
+                .eq(com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink::getOrderNumber, outOrderNumber)
+                .eq(com.mhd.wms.domain.deliveryDetailsLink.entity.DeliveryDetailsLink::getDelFlag, 1));
+        List<OutMaterialDetail> materialDetails = outMaterialDetailService.list(new LambdaQueryWrapper<OutMaterialDetail>()
+                .eq(OutMaterialDetail::getOutOrderNumber, outOrderNumber)
+                .eq(OutMaterialDetail::getDelFlag, 1));
+        // 出库/未出库分支: 未出库单据(WMS状态非9)实物库存未被扣减, 只还原分配占用(可用+冻结-),
+        // 不做实物还原也不推OMS——否则会虚增库存; 已出库(9)分支还原实物并推OMS(防御保留, 业务单反审已拦截已出库单)
+        boolean shipped = stockOutOrderDB.getStatus() != null && stockOutOrderDB.getStatus() == 9;
+        for (OutMaterialDetail materialDetail : materialDetails) {
+            MaterialInventory materialInventory = materialInventoryMapper.selectById(materialDetail.getMaterialInventoryId());
+            if (!shipped) {
+                // ===== 未出库: 还原分配占用(与 cancelExecutionOrder 的取消分配同口径) =====
+                BigDecimal allocationQuantity = materialDetail.getAllocationQuantity();
+                if (materialInventory != null && allocationQuantity != null && allocationQuantity.compareTo(BigDecimal.ZERO) > 0) {
+                    materialInventory.setAllocationQuantity((materialInventory.getAllocationQuantity() == null ? BigDecimal.ZERO : materialInventory.getAllocationQuantity()).add(allocationQuantity));
+                    materialInventory.setFreezeQuantity((materialInventory.getFreezeQuantity() == null ? BigDecimal.ZERO : materialInventory.getFreezeQuantity()).subtract(allocationQuantity));
+                    materialInventory.setUpdateTime(new Date());
+                    materialInventoryMapper.updateById(materialInventory);
+                }
+                //逻辑删除库存调整记录
+                Long uniqueId = materialDetail.getUniqueId();
+                String relateNo = outOrderNumber + "#" + uniqueId;
+                inventoryAdjustmentRecordService.update(new InventoryAdjustmentRecord(), new LambdaUpdateWrapper<InventoryAdjustmentRecord>()
+                        .set(InventoryAdjustmentRecord::getDelFlag, 2)
+                        .eq(InventoryAdjustmentRecord::getRelateNo, relateNo));
+            } else {
+                // ===== 已出库: 还原实物库存并推送OMS(防御分支) =====
+                //还原数量与交接扣减一致: 需复核取复核数量, 否则取拣货数量(为空取计划数量), 见 doStockOutDeduct
+                BigDecimal effectiveQuantity = Integer.valueOf(1).equals(stockOutOrderDB.getReview())
+                        ? materialDetail.getCheckQuantity()
+                        : (materialDetail.getPickingQuantity() != null ? materialDetail.getPickingQuantity() : materialDetail.getQuantity());
+                Long materialInventoryId = materialDetail.getMaterialInventoryId();
+                if (materialInventoryId == null || effectiveQuantity == null || effectiveQuantity.compareTo(BigDecimal.ZERO) <= 0) {
+                    //无可还原库存(未交接或漏传), 仍继续清理单据
+                    materialDetail.setDelFlag(2);
+                    materialDetail.setReverseFlag(1);
+                    outMaterialDetailService.updateById(materialDetail);
+                    continue;
+                }
+                if (materialInventory != null && !"yang_pin_chu_ku".equals(stockOutOrderDB.getBusinessType())) {
+                    //样品出库交接不扣库存(与 doStockOutDeduct 一致), 反审同样跳过还原
+                    BigDecimal area = materialDetail.getCheckArea() != null ? materialDetail.getCheckArea() : BigDecimal.ZERO;
+                    BigDecimal volume = materialDetail.getCheckVolume() != null ? materialDetail.getCheckVolume() : BigDecimal.ZERO;
+                    BigDecimal grossWeight = materialDetail.getCheckGrossWeight() != null ? materialDetail.getCheckGrossWeight() : BigDecimal.ZERO;
+                    BigDecimal netWeight = materialDetail.getCheckNetWeight() != null ? materialDetail.getCheckNetWeight() : BigDecimal.ZERO;
+                    MaterialInventoryParamDO restoreParam = new MaterialInventoryParamDO();
+                    restoreParam.setMaterialInventoryId(materialInventoryId);
+                    restoreParam.setMaterialBaseInfoId(materialInventory.getMaterialBaseInfoId());
+                    restoreParam.setOrganizationId(materialInventory.getOrganizationId());
+                    restoreParam.setOrganizationName(materialInventory.getOrganizationName());
+                    restoreParam.setTopOrganizationId(materialInventory.getTopOrganizationId());
+                    restoreParam.setWarehouseId(materialInventory.getWarehouseId());
+                    restoreParam.setWarehouseCode(materialInventory.getWarehouseCode());
+                    restoreParam.setWarehouseName(materialInventory.getWarehouseName());
+                    restoreParam.setQuantity(effectiveQuantity);
+                    restoreParam.setArea(area);
+                    restoreParam.setVolume(volume);
+                    restoreParam.setGrossWeight(grossWeight);
+                    restoreParam.setNetWeight(netWeight);
+                    restoreParam.setLotNumber(materialInventory.getLotNumber());
+                    restoreParam.setBatchNumber(materialInventory.getBatchNumber());
+                    restoreParam.setInOrderNumber(materialInventory.getInOrderNumber());
+                    restoreParam.setProductionDate(materialInventory.getProductionDate());
+                    restoreParam.setExpiryDate(materialInventory.getExpiryDate());
+                    //库存调整记录【出库反审】(kctzjl 内部取调整前快照, 与交接扣减先记录后改库存的顺序一致)
+                    restoreParam.setRelateNo(outOrderNumber + "#" + materialDetail.getUniqueId());
+                    materialInventoryService.kctzjl(restoreParam, "出库反审", loginUser);
+                    //type=1 上架还原: 实物库存/可用数量加回, 冻结数量不动
+                    restoreParam.setType("1");
+                    materialInventoryService.xgkc(restoreParam);
+                    //推送OMS还原预约库存(type=1: OMS侧实物/可用加回, 与交接 omsEdit 扣减互逆)
+                    MaterialInventoryOmsParamDO omsParam = new MaterialInventoryOmsParamDO();
+                    BeanUtils.copyProperties(restoreParam, omsParam);
+                    omsParam.setKctzType("出库反审");
+                    omsParam.setLoginUser(loginUser);
+                    omsServiceFeign.omsEdit(omsParam);
+                }
+            }
+            //逻辑删除出库单明细
+            materialDetail.setDelFlag(2);
+            materialDetail.setReverseFlag(1);
+            outMaterialDetailService.updateById(materialDetail);
+        }
+        //逻辑删除出库单(用按单号查出的DB对象更新: 传入对象无主键, 直接updateById不生效, 与 cancelExecutionOrder 一致)
+        stockOutOrderDB.setDelFlag(2);
+        stockOutOrderDB.setReverseFlag(1);
+        stockOutOrderService.updateById(stockOutOrderDB);
+        //逻辑删除拣货单及拣货明细
+        PickingOrder pickingOrder = pickingOrderService.getOne(new LambdaQueryWrapper<PickingOrder>()
+                .eq(PickingOrder::getDelFlag, 1)
+                .eq(PickingOrder::getOrderNumber, outOrderNumber));
+        if (pickingOrder != null) {
+            String pickingOrderNumber = pickingOrder.getPickingOrderNumber();
+            List<PickingMaterialDetail> pickingDetails = pickingMaterialDetailService.list(new LambdaQueryWrapper<PickingMaterialDetail>()
+                    .eq(PickingMaterialDetail::getPickingOrderNumber, pickingOrderNumber)
+                    .eq(PickingMaterialDetail::getDelFlag, 1));
+            for (PickingMaterialDetail pickingMaterialDetail : pickingDetails) {
+                pickingMaterialDetail.setDelFlag(2);
+                pickingMaterialDetail.setReverseFlag(1);
+                pickingMaterialDetailService.updateById(pickingMaterialDetail);
+            }
+            pickingOrder.setDelFlag(2);
+            pickingOrder.setReverseFlag(1);
+            pickingOrderService.updateById(pickingOrder);
+        }
+        //逻辑删除复核单及复核明细(已复核单据反审时存在)
+        List<ReviewOrder> reviewOrders = reviewOrderMapper.selectList(new LambdaQueryWrapper<ReviewOrder>()
+                .eq(ReviewOrder::getDelFlag, 1)
+                .eq(ReviewOrder::getOutOrderNumber, outOrderNumber));
+        for (ReviewOrder reviewOrder : reviewOrders) {
+            reviewMaterialDetailMapper.update(null, new LambdaUpdateWrapper<ReviewMaterialDetail>()
+                    .set(ReviewMaterialDetail::getDelFlag, 2)
+                    .set(ReviewMaterialDetail::getReverseFlag, 1)
+                    .eq(ReviewMaterialDetail::getReviewOrderId, reviewOrder.getReviewOrderId())
+                    .eq(ReviewMaterialDetail::getDelFlag, 1));
+            reviewOrder.setDelFlag(2);
+            reviewOrder.setReverseFlag(1);
+            reviewOrderMapper.updateById(reviewOrder);
+        }
+        //逻辑删除交接作业单(不需复核单据出库完成时生成)
+        List<HandoverTaskOrder> handoverTaskOrders = handoverTaskOrderService.list(new LambdaQueryWrapper<HandoverTaskOrder>()
+                .eq(HandoverTaskOrder::getDelFlag, 1)
+                .eq(HandoverTaskOrder::getOrderNumber, outOrderNumber));
+        for (HandoverTaskOrder handoverTaskOrder : handoverTaskOrders) {
+            handoverTaskOrder.setDelFlag(2);
+            handoverTaskOrder.setReverseFlag(1);
+            handoverTaskOrderService.updateById(handoverTaskOrder);
+        }
+        //生成1条出库异常记录【反审记录】, 供记录跟踪
+        OutOrderAbnormal reverseAbnormal = new OutOrderAbnormal();
+        reverseAbnormal.setOrganizationId(stockOutOrderDB.getOrganizationId());
+        reverseAbnormal.setOrganizationName(stockOutOrderDB.getOrganizationName());
+        reverseAbnormal.setTopOrganizationId(stockOutOrderDB.getTopOrganizationId());
+        reverseAbnormal.setAbnormalNumber(OrderSequence.getOrderCode("FSYC"));
+        reverseAbnormal.setOutOrderNumber(outOrderNumber);
+        reverseAbnormal.setType(3);
+        reverseAbnormal.setAbnormalType(3);
+        reverseAbnormal.setQuantity(stockOutOrderDB.getQuantity());
+        reverseAbnormal.setActualQuantity(stockOutOrderDB.getPickingQuantity());
+        reverseAbnormal.setAbnormalActualQuantity(BigDecimal.ZERO);
+        reverseAbnormal.setAbnormalReason("出库单反审");
+        reverseAbnormal.setRemark(reverseRemark);
+        reverseAbnormal.setCreateBy(loginUser.getUserid());
+        reverseAbnormal.setCreateByName(loginUser.getUsername());
+        reverseAbnormal.setCreateTime(new Date());
+        outOrderAbnormalService.save(reverseAbnormal);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void omsOrderAddDetail(List<OutMaterialDetail> outMaterialDetails) {
         if (CollectionUtils.isEmpty(outMaterialDetails)) {