From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 13 七月 2025 16:05:01 +0800
Subject: [PATCH] *

---
 src/main/resources/mapper/MatMapper.xml |   90 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 82 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index fc07fed..09a8d0a 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -6,23 +6,36 @@
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.Mat">
         <id column="id" property="id" />
         <result column="uuid" property="uuid" />
-        <result column="node_id" property="nodeId" />
         <result column="tag_id" property="tagId" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
         <result column="name" property="name" />
         <result column="specs" property="specs" />
         <result column="model" property="model" />
-        <result column="batch" property="batch" />
+        <result column="color" property="color" />
+        <result column="brand" property="brand" />
         <result column="unit" property="unit" />
-        <result column="barcode" property="barcode" />
-        <result column="doc_id" property="docId" />
-        <result column="doc_num" property="docNum" />
-        <result column="cust_name" property="custName" />
-        <result column="item_num" property="itemNum" />
-        <result column="count" property="count" />
         <result column="price" property="price" />
+        <result column="sku" property="sku" />
+        <result column="units" property="units" />
+        <result column="barcode" property="barcode" />
+        <result column="origin" property="origin" />
+        <result column="manu" property="manu" />
+        <result column="manu_date" property="manuDate" />
+        <result column="item_num" property="itemNum" />
+        <result column="safe_qty" property="safeQty" />
         <result column="weight" property="weight" />
+        <result column="length" property="length" />
+        <result column="volume" property="volume" />
+        <result column="three_code" property="threeCode" />
+        <result column="supp" property="supp" />
+        <result column="supp_code" property="suppCode" />
+        <result column="be_batch" property="beBatch" />
+        <result column="dead_time" property="deadTime" />
+        <result column="dead_warn" property="deadWarn" />
+        <result column="source" property="source" />
+        <result column="inspect" property="inspect" />
+        <result column="danger" property="danger" />
         <result column="status" property="status" />
         <result column="create_by" property="createBy" />
         <result column="create_time" property="createTime" />
@@ -47,6 +60,7 @@
             group by matnr
         ) as mld on mld.matnr = mm.matnr
         WHERE 1=1
+        and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
         AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
         <if test="matnr != null and matnr != ''">
             and mm.matnr like concat('%',#{matnr},'%')
@@ -57,7 +71,67 @@
         ORDER BY mm.create_time DESC
     </select>
 
+    <select id="listByPage2" resultMap="BaseResultMap">
+        SELECT
+        isnull(mld.amount,0) as stock,
+        mm.*
+        FROM man_mat mm
+        LEFT JOIN man_tag mt ON mm.tag_id = mt.id
+        LEFT JOIN (
+        select
+        matnr,
+        sum(anfme) as amount
+        from man_loc_detl
+        group by matnr
+        ) as mld on mld.matnr = mm.matnr
+        WHERE 1=1
+        and (mm.memo is null or mm.memo != '鎵撳寘涓婄嚎')
+        AND (CHARINDEX(','+#{tagId}+',', ','+mt.path+',') > 0 OR mt.id = #{tagId})
+        <if test="matnr != null and matnr != ''">
+            and mm.matnr like concat('%',#{matnr},'%')
+        </if>
+        <if test="maktx != null and maktx != ''">
+            and mm.maktx like concat('%',#{maktx},'%')
+        </if>
+        <if test="specs != null and specs != ''">
+            and mm.specs like concat('%',#{specs},'%')
+        </if>
+        ORDER BY mm.create_time DESC
+    </select>
+
     <select id="selectByMatnr" resultMap="BaseResultMap">
         select top 1 * from man_mat where 1=1 and matnr = #{matnr}
     </select>
+
+    <select id="selectByMatnrLink" resultMap="BaseResultMap">
+        select * from man_mat
+        where 1=1
+        <if test="matnr != null and matnr != ''">
+            and mm.matnr like concat('%',#{matnr},'%')
+        </if>
+    </select>
+
+    <select id="getMatTurnPage" resultMap="BaseResultMap">
+        select * from
+        (
+        select top 16
+        ROW_NUMBER() over (order by a.matnr) as matNo,
+        a.*
+        from man_mat a
+        where 1=1
+        <if test="matnr!=null and matnr!='' ">
+            and a.matnr like concat('%',#{matnr},'%')
+        </if>
+        ) t where t.matNo between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+    </select>
+
+    <select id="getStockOutPageCount" parameterType="java.util.Map" resultType="java.lang.Integer">
+        select
+        count(1)
+        from man_mat a
+        where 1=1
+        <if test="matnr!=null and matnr!='' ">
+            and a.matnr = #{matnr}
+        </if>
+    </select>
 </mapper>

--
Gitblit v1.9.1