From 60bc14019555b8316073f8196b7fa0fd74a0c5d1 Mon Sep 17 00:00:00 2001
From: zhaoqing <3160641494@qq.com>
Date: Fri, 24 Jul 2026 10:10:57 +0800
Subject: [PATCH] =?UTF-8?q?feat(oms):=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IExecutionInMaterialDetailService.java    |   6 ++
 .../ExecutionInMaterialDetailMapper.java      |   6 ++
 .../ExecutionInMaterialDetailImpl.java        |   9 ++
 .../ExecutionInMaterialDetailWithOrderPO.java |  21 ++++
 .../ExecutionInMaterialDetailQueryDTO.java    |  69 ++++++++++++
 ...ionInMaterialDetailApplicationService.java |  16 +++
 .../ExecutionInMaterialDetailAssembler.java   |  11 ++
 ...xecutionInMaterialDetailDomainService.java |   9 ++
 .../ExecutionInMaterialDetailApi.java         |  16 +++
 .../executionInMaterialDetailMapper.xml       | 101 ++++++++++++++++++
 10 files changed, 264 insertions(+)
 create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
 create mode 100644 mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/ExecutionInMaterialDetailQueryDTO.java

diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/facade/IExecutionInMaterialDetailService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/facade/IExecutionInMaterialDetailService.java
index ffa353bb7..6fc5b8f08 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/facade/IExecutionInMaterialDetailService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/facade/IExecutionInMaterialDetailService.java
@@ -3,6 +3,7 @@ package com.mhd.oms.domain.executionInMaterialDetail.repository.facade;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mhd.oms.domain.executionInMaterialDetail.entity.ExecutionInMaterialDetail;
 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.InventoryAdjustmentRecordPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailBaseDO;
@@ -65,4 +66,9 @@ public interface IExecutionInMaterialDetailService extends IService<ExecutionInM
     public ExecutionInMaterialDetailPO getInfo(Long materialDetailId);
 
     public List<InventoryAdjustmentRecordPO> getkctzjl(Long materialBaseInfoId, String orderNumber, String adjustType);
+
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    public List<ExecutionInMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/mapper/ExecutionInMaterialDetailMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/mapper/ExecutionInMaterialDetailMapper.java
index c9fbc4970..caa15f2f5 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/mapper/ExecutionInMaterialDetailMapper.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/mapper/ExecutionInMaterialDetailMapper.java
@@ -3,6 +3,7 @@ package com.mhd.oms.domain.executionInMaterialDetail.repository.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mhd.oms.domain.executionInMaterialDetail.entity.ExecutionInMaterialDetail;
 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.InventoryAdjustmentRecordPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDO;
@@ -30,4 +31,9 @@ public interface ExecutionInMaterialDetailMapper extends BaseMapper<ExecutionInM
 
     public List<InventoryAdjustmentRecordPO> getkctzjl(@Param("materialBaseInfoId") Long materialBaseInfoId, @Param("orderNumber") String orderNumber, @Param("adjustType") String adjustType);
 
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    public List<ExecutionInMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO);
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/persistence/ExecutionInMaterialDetailImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/persistence/ExecutionInMaterialDetailImpl.java
index c013de9dd..986c5b728 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/persistence/ExecutionInMaterialDetailImpl.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/persistence/ExecutionInMaterialDetailImpl.java
@@ -12,6 +12,7 @@ import com.mhd.oms.domain.executionInMaterialDetail.entity.ExecutionInMaterialDe
 import com.mhd.oms.domain.executionInMaterialDetail.repository.facade.IExecutionInMaterialDetailService;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.mapper.ExecutionInMaterialDetailMapper;
 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.InventoryAdjustmentRecordPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailBaseDO;
@@ -309,4 +310,12 @@ public class ExecutionInMaterialDetailImpl extends ServiceImpl<ExecutionInMateri
         return inMaterialDetailMapper.getkctzjl(materialBaseInfoId, orderNumber, adjustType);
     }
 
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    @Override
+    public List<ExecutionInMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return inMaterialDetailMapper.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
new file mode 100644
index 000000000..8a88a3e24
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/po/ExecutionInMaterialDetailWithOrderPO.java
@@ -0,0 +1,21 @@
+package com.mhd.oms.domain.executionInMaterialDetail.repository.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 入库明细查询结果（关联入库执行单）
+ *
+ * @author gen
+ * @date 2024-07-24
+ */
+@Data
+public class ExecutionInMaterialDetailWithOrderPO extends ExecutionInMaterialDetailPO {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("入库单状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
+    private Integer inOrderStatus;
+
+    @ApiModelProperty("入库单审核状态: 1-未审核 2-审核不通过 3-审核通过")
+    private Integer inOrderAuditStatus;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/ExecutionInMaterialDetailQueryDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/ExecutionInMaterialDetailQueryDTO.java
new file mode 100644
index 000000000..b48723a4f
--- /dev/null
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/repository/todo/ExecutionInMaterialDetailQueryDTO.java
@@ -0,0 +1,69 @@
+package com.mhd.oms.domain.executionInMaterialDetail.repository.todo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mhd.common.core.web.domain.BaseVOEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+ * 入库明细查询参数 DTO
+ *
+ * @author gen
+ * @date 2024-07-24
+ */
+@Data
+public class ExecutionInMaterialDetailQueryDTO extends BaseVOEntity {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("组织表ID")
+    private Long organizationId;
+
+    @ApiModelProperty("一级组织表ID")
+    private Long topOrganizationId;
+
+    @ApiModelProperty("入库单号")
+    private String inOrderNumber;
+
+    @ApiModelProperty("仓库id")
+    private Long warehouseId;
+
+    @ApiModelProperty("仓库编码")
+    private String warehouseCode;
+
+    @ApiModelProperty("仓库名称")
+    private String warehouseName;
+
+    @ApiModelProperty("货主id")
+    private Long shipperId;
+
+    @ApiModelProperty("货主名称")
+    private String shipperName;
+
+    @ApiModelProperty("入库单类型编码")
+    private String inOrderTypeCode;
+
+    @ApiModelProperty("入库状态: 1-已创建 2-已审核 3-收货中 4-上架中 5-已入库 6-已取消 7-已关闭")
+    private Integer inStatus;
+
+    @ApiModelProperty("预计到货时间 开始")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inOrderExpectStartTime;
+
+    @ApiModelProperty("预计到货时间 结束")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date inOrderExpectEndTime;
+
+    @ApiModelProperty("物料基础信息id")
+    private Long materialBaseInfoId;
+
+    @ApiModelProperty("物料编码")
+    private String materialCode;
+
+    @ApiModelProperty("物料名称")
+    private String materialName;
+}
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailApplicationService.java
index 96a9749d3..5e03ad47a 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailApplicationService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailApplicationService.java
@@ -2,7 +2,9 @@ package com.mhd.oms.domain.executionInMaterialDetail.service;
 
 import com.mhd.common.security.utils.SecurityUtils;
 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;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.system.api.model.LoginUser;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,4 +71,18 @@ public class ExecutionInMaterialDetailApplicationService {
         return inMaterialDetailDomainService.getInfo(materialDetailId);
     }
 
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    public List<ExecutionInMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null) {
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                queryOrderOverStockDO.setTopOrganizationId(topOrganizationId);
+            }
+        }
+        return inMaterialDetailDomainService.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailAssembler.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailAssembler.java
index cdd1ab53b..03bae5c68 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailAssembler.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailAssembler.java
@@ -8,6 +8,8 @@ import com.mhd.common.core.utils.bean.BeanUtils;
 import com.mhd.common.security.utils.SecurityUtils;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDTO;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailQueryDTO;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.system.api.model.LoginUser;
 import org.springframework.stereotype.Component;
 
@@ -62,4 +64,13 @@ public class ExecutionInMaterialDetailAssembler {
         return inMaterialDetailDO;
     }
 
+    /**
+     * 入库明细查询 DTO → QueryOrderOverStockDO
+     */
+    public QueryOrderOverStockDO toQueryDO(ExecutionInMaterialDetailQueryDTO queryDTO) {
+        QueryOrderOverStockDO queryDO = new QueryOrderOverStockDO();
+        BeanUtils.copyProperties(queryDTO, queryDO, IgnoreNullUtil.getNullPropertyNames(queryDTO));
+        return queryDO;
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailDomainService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailDomainService.java
index 7bc0a922b..318545fcd 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailDomainService.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/domain/executionInMaterialDetail/service/ExecutionInMaterialDetailDomainService.java
@@ -2,7 +2,9 @@ package com.mhd.oms.domain.executionInMaterialDetail.service;
 
 import com.mhd.oms.domain.executionInMaterialDetail.repository.facade.IExecutionInMaterialDetailService;
 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;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -62,4 +64,11 @@ public class ExecutionInMaterialDetailDomainService {
     }
 
 
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    public List<ExecutionInMaterialDetailWithOrderPO> queryInOrderDetailList(QueryOrderOverStockDO queryOrderOverStockDO) {
+        return materialDetailService.queryInOrderDetailList(queryOrderOverStockDO);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionInMaterialDetail/ExecutionInMaterialDetailApi.java b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionInMaterialDetail/ExecutionInMaterialDetailApi.java
index 1ec474347..56546052e 100644
--- a/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionInMaterialDetail/ExecutionInMaterialDetailApi.java
+++ b/mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/executionInMaterialDetail/ExecutionInMaterialDetailApi.java
@@ -4,8 +4,11 @@ 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.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailPO;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.po.ExecutionInMaterialDetailWithOrderPO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDO;
 import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailDTO;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.ExecutionInMaterialDetailQueryDTO;
+import com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO;
 import com.mhd.oms.domain.executionInMaterialDetail.service.ExecutionInMaterialDetailApplicationService;
 import com.mhd.oms.domain.executionInMaterialDetail.service.ExecutionInMaterialDetailAssembler;
 import io.swagger.annotations.ApiOperation;
@@ -80,4 +83,17 @@ public class ExecutionInMaterialDetailApi extends BaseController {
     }
 
 
+    /**
+     * 入库明细查询（关联入库执行单）
+     */
+    @ApiOperation("入库明细查询（关联入库执行单）")
+    @GetMapping("/listWithOrder")
+    public TableDataInfo listWithOrder(ExecutionInMaterialDetailQueryDTO queryDTO)
+    {
+        QueryOrderOverStockDO queryDO = inMaterialDetailAssembler.toQueryDO(queryDTO);
+        startPage();
+        List<ExecutionInMaterialDetailWithOrderPO> list = inMaterialDetailApplicationService.queryInOrderDetailList(queryDO);
+        return getDataTable(list);
+    }
+
 }
\ No newline at end of file
diff --git a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
index 7a0150499..3d4d610e4 100644
--- a/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
+++ b/mhd_oms/src/main/resources/mapper/executionInMaterialDetail/executionInMaterialDetailMapper.xml
@@ -358,4 +358,105 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getkctzjl" resultType="com.mhd.oms.domain.executionInMaterialDetail.repository.todo.InventoryAdjustmentRecordPO">
         select * from "NGWL_TEST_WMS".INVENTORY_ADJUSTMENT_RECORD where MATERIAL_BASE_INFO_ID = #{materialBaseInfoId} and RELATE_NO = #{orderNumber} and ADJUST_TYPE = #{adjustType}
     </select>
+
+    <!-- ========== 入库明细查询（关联入库执行单） ========== -->
+    <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" />
+    </resultMap>
+
+    <select id="queryInOrderDetailList" parameterType="com.mhd.oms.domain.executionInMaterialDetail.repository.todo.QueryOrderOverStockDO"
+            resultMap="InMaterialDetailWithOrderResult">
+        select
+        a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id,
+        a.in_order_number, a.material_base_info_id, a.material_code, a.material_name, a.bar_code,
+        a.quantity, a.receipt_quantity, a.shelves_quantity,
+        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,
+        a.pack_detail_id, a.unit_code, a.unit_name, a.unit_number, a.material_warehouse_control_id,
+        a.serial_number_manage, a.quality_inspection_manage, a.quality_inspection_stage,
+        a.quality_inspection_rule, a.quality_inspection_ratio, a.quality_inspection_term,
+        a.quality_inspection_results, a.allow_overcharge, a.overcharge_ratio,
+        a.batch_number, a.material_status_code, a.material_status_name,
+        a.distribute_rule_id, a.distribute_rule_code, a.distribute_rule_name,
+        a.container_id, a.container_code, a.container_type, a.container_type_name,
+        a.warehouse_id, a.warehouse_code, a.warehouse_name,
+        a.storage_section_id, a.storage_code, a.storage_name,
+        a.storage_location_id, a.storage_location_code, a.storage_location_name,
+        a.level, a.parent_unique_id,
+        a.remark, a.create_time, a.create_by, a.create_by_name,
+        a.update_time, a.update_by, a.update_by_name, a.del_flag,
+        a.over_stock_id, a.over_stock_status, a.over_stock_type,
+        a.SPECIFICATION_MODEL, a.SKU_CODE, a.INVOICE_NO, a.LITER, a.DIMENSIONS,
+        a.DECLARATION_UNIT, a.BATCH_REF_NO, a.SHEET_REF_NO,
+        a.ORIGIN_COUNTRY, a.BOX_PALLET_NO, a.CURRENCY, a.UNIT,
+        a.DECLARED_QUANTITY, a.BOX_COUNT, a.PIECE_COUNT, a.INBOUND_QUANTITY,
+        a.TOTAL_NET_WEIGHT, a.TOTAL_GROSS_WEIGHT, a.TOTAL_VOLUME, a.TOTAL_AREA, a.TOTAL_PRICE,
+        a.PRODUCTION_DATE, a.EXPIRY_DATE, a.INVENTORY_DATE,
+        a.EXT_ATTR_1, a.EXT_ATTR_2, a.EXT_ATTR_3, a.EXT_ATTR_4,
+        a.contract_fee, a.monthly_warehouse_fee, a.half_month_wh_fee, a.discount_rate,
+        a.single_volume, a.single_gross_weight, a.lot_no,
+        a.drink_date, a.fire_insure_fee, a.unit_price,
+        a.inventory_before_quantity, a.allocation_before_quantity, a.freeze_before_quantity,
+        a.inventory_after_quantity, a.allocation_after_quantity, a.freeze_after_quantity,
+        a.net_weight, a.gross_weight, a.volume, a.area,
+        a.adjusted_net_weight, a.adjusted_gross_weight, a.adjusted_volume, a.adjusted_area,
+        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.lot_number, a.in_order_number_gw, a.in_line_num_gw,
+        b.status as in_order_status,
+        b.audit_status as in_order_audit_status
+        from execution_in_material_detail a
+        left join execution_stock_in_order b on a.in_order_number = b.in_order_number
+        <where>
+            <if test="organizationId != null ">
+                and a.organization_id = #{organizationId}
+            </if>
+            <if test="topOrganizationId != null ">
+                and a.top_organization_id = #{topOrganizationId}
+            </if>
+            <if test="materialBaseInfoId != null ">
+                and a.material_base_info_id = #{materialBaseInfoId}
+            </if>
+            <if test="materialCode != null  and materialCode != ''">
+                and a.material_code = #{materialCode}
+            </if>
+            <if test="materialName != null  and materialName != ''">
+                and a.material_name like concat('%', #{materialName}, '%')
+            </if>
+            <if test="inOrderNumber != null  and inOrderNumber != ''">
+                and b.in_order_number like concat('%', #{inOrderNumber}, '%')
+            </if>
+            <if test="warehouseId != null ">
+                and b.warehouse_id = #{warehouseId}
+            </if>
+            <if test="warehouseCode != null  and warehouseCode != ''">
+                and b.warehouse_code = #{warehouseCode}
+            </if>
+            <if test="warehouseName != null  and warehouseName != ''">
+                and b.warehouse_name like concat('%', #{warehouseName}, '%')
+            </if>
+            <if test="shipperId != null ">
+                and b.shipper_id = #{shipperId}
+            </if>
+            <if test="shipperName != null  and shipperName != ''">
+                and b.shipper_name like concat('%', #{shipperName}, '%')
+            </if>
+            <if test="inOrderTypeCode != null  and inOrderTypeCode != ''">
+                and b.order_type_code = #{inOrderTypeCode}
+            </if>
+            <if test="inStatus != null ">
+                and b.status = #{inStatus}
+            </if>
+            <if test="inOrderExpectStartTime != null">
+                and b.expect_time &gt;= #{inOrderExpectStartTime}
+            </if>
+            <if test="inOrderExpectEndTime != null">
+                and b.expect_time &lt;= #{inOrderExpectEndTime}
+            </if>
+            and a.del_flag = 1
+            and b.del_flag = 1
+        </where>
+        order by a.create_time desc
+    </select>
+
+
 </mapper>
\ No newline at end of file