From 82733ad3ffd8f71315b16e934106f124c4eae356 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期五, 12 四月 2024 15:47:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
index 5293cf6..611e82d 100644
--- a/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
+++ b/north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml
@@ -4,6 +4,37 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.example.erp.mapper.mm.MaterialInventoryMapper">
 
+    <resultMap id="selectMaterialOutboundDetail" type="com.example.erp.entity.mm.MaterialOutboundDetail" >
+        <id column="id" property="id"/>
+        <result column="material_outbound_id" property="materialOutboundId"/>
+        <result column="material_outbound_number" property="materialOutboundNumber"/>
+        <result column="inventory_id" property="inventoryId"/>
+        <result column="inventory_organization" property="inventoryOrganization"/>
+        <result column="material_code" property="materialCode"/>
+        <result column="material_name" property="materialName"/>
+        <result column="use_id" property="useId"/>
+        <result column="producer" property="producer"/>
+        <result column="unit" property="unit"/>
+        <result column="width" property="width"/>
+        <result column="height" property="height"/>
+        <result column="thickness" property="thickness"/>
+        <result column="outbound_quantity" property="outboundQuantity"/>
+        <result column="single_piece_area" property="singlePieceArea"/>
+        <result column="inventory_area" property="inventoryArea"/>
+        <result column="date_of_manufacture" property="dateOfManufacture"/>
+        <result column="remarks" property="remarks"/>
+
+        <result column="material_requisition_personnel" property="materialOutbound.materialRequisitionPersonnel"/>
+        <result column="material_requisition_team" property="materialOutbound.materialRequisitionTeam"/>
+        <result column="order_id" property="materialOutbound.orderId"/>
+        <result column="outbound_type" property="materialOutbound.outboundType"/>
+        <result column="warehouse_manager" property="materialOutbound.warehouseManager"/>
+        <result column="material_requisition_date" property="materialOutbound.materialRequisitionDate"/>
+        <result column="reviewed" property="materialOutbound.reviewed"/>
+        <result column="reviewed_time" property="materialOutbound.reviewedTime"/>
+
+    </resultMap>
+
 
 
     <select id="getSelectMaterialInventoryDate">

--
Gitblit v1.8.0