From 4ad1f324ab1fd2b51504afc00b43b4ee40f029c2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 20 二月 2025 09:40:03 +0800
Subject: [PATCH] #

---
 src/main/resources/mapper/LocDetlMapper.xml |  158 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 128 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 0bfd94c..adb8138 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -5,34 +5,49 @@
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
     <resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetl">
         <result column="loc_no" property="locNo" />
+        <result column="zpallet" property="zpallet" />
+        <result column="anfme" property="anfme" />
         <result column="matnr" property="matnr" />
         <result column="maktx" property="maktx" />
         <result column="batch" property="batch" />
         <result column="order_no" property="orderNo" />
-        <result column="lgnum" property="lgnum" />
-        <result column="type" property="type" />
+
+        <result column="specs" property="specs" />
+        <result column="model" property="model" />
         <result column="color" property="color" />
-        <result column="supplier" property="supplier" />
-        <result column="warehouse" property="warehouse" />
         <result column="brand" property="brand" />
-        <result column="anfme" property="anfme" />
-        <result column="altme" property="altme" />
-        <result column="zpallet" property="zpallet" />
-        <result column="bname" property="bname" />
-        <result column="memo" property="memo" />
+        <result column="unit" property="unit" />
+        <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="modi_user" property="modiUser" />
         <result column="modi_time" property="modiTime" />
         <result column="appe_user" property="appeUser" />
         <result column="appe_time" property="appeTime" />
+        <result column="memo" property="memo" />
+        <result column="roll_up" property="rollUp" />
     </resultMap>
 
-
-    <select id="selectItem" resultMap="BaseResultMap">
-        select top 1 *
-        from asr_loc_detl
-        where 1=1
-        and loc_no = #{locNo}
-        and matnr = #{matnr}
+    <sql id="batchSeq">
         <choose>
             <when test="batch != null and batch != ''">
                 and batch = #{batch}
@@ -41,7 +56,34 @@
                 and (batch IS NULL OR batch = '')
             </otherwise>
         </choose>
+    </sql>
+
+    <select id="selectItem" resultMap="BaseResultMap">
+        select top 1 *
+        from asr_loc_detl
+        where 1=1
+        and loc_no = #{locNo}
+        and matnr = #{matnr}
+        <include refid="batchSeq"></include>
     </select>
+
+    <delete id="deleteItem">
+        delete from asr_loc_detl
+        where 1=1
+        and loc_no = #{locNo}
+        and matnr = #{matnr}
+        <include refid="batchSeq"></include>
+    </delete>
+
+    <update id="updateAnfme">
+        update asr_loc_detl
+        set anfme = #{anfme}
+        , modi_time = getdate()
+        where 1=1
+        and loc_no = #{locNo}
+        and matnr = #{matnr}
+        <include refid="batchSeq"></include>
+    </update>
 
     <sql id="stockOutCondition">
         <if test="loc_no!=null and loc_no!='' ">
@@ -56,11 +98,17 @@
         <if test="anfme!=null and anfme!='' ">
             and a.anfme like '%' + #{anfme} + '%'
         </if>
-        <if test="altme!=null and altme!='' ">
-            and a.altme like '%' + #{altme} + '%'
-        </if>
         <if test="startTime!=null and endTime!=null">
             and a.modi_time between #{startTime} and #{endTime}
+        </if>
+        <if test="crnNo!=null and crnNo!='' ">
+            and b.crn_no=#{crnNo}
+        </if>
+        <if test="batch!=null and batch!='' ">
+            and a.batch like '%' + #{batch} + '%'
+        </if>
+        <if test="specs!=null and specs!='' ">
+            and a.specs like '%' + #{specs} + '%'
         </if>
     </sql>
 
@@ -161,19 +209,30 @@
         where 1=1
         and b.loc_sts = 'F'
         and a.matnr = #{matnr}
-        <choose>
-            <when test="batch != null and batch != ''">
-                and a.batch = #{batch}
-            </when>
-            <otherwise>
-                and (a.batch IS NULL OR a.batch = '')
-            </otherwise>
-        </choose>
-        <if test="orderNo != null and orderNo != ''">
-            and a.orderNo = #{orderNo}
+<!--        <choose>-->
+<!--            <when test="batch != null and batch != ''">-->
+<!--                and a.batch = #{batch}-->
+<!--            </when>-->
+<!--            <otherwise>-->
+<!--                and (a.batch IS NULL OR a.batch = '')-->
+<!--            </otherwise>-->
+<!--        </choose>-->
+        <if test="batch != null and batch != ''">
+            and a.batch = #{batch}
         </if>
+        <if test="orderNo != null and orderNo != ''">
+            and a.order_no = #{orderNo}
+        </if>
+
+        <if test="locNos != null and locNos.size > 0">
+            and b.loc_no not in
+            <foreach item="item" collection="locNos" index="index"  separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
         order by
-        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time)
+        DATEPART(yyyy,a.modi_time),DATEPART(mm,a.modi_time),DATEPART(dd,a.modi_time), a.anfme
         desc,
         NEWID(),
         case
@@ -239,4 +298,43 @@
         </if>
     </select>
 
+    <select id="queryStockTotal" resultType="com.zy.asrs.entity.result.StockVo">
+        select
+        matnr,
+        batch,
+        count(anfme) as count
+        from asr_loc_detl
+        where 1=1
+        group by matnr,batch
+    </select>
+    <select id="sum" resultType="java.lang.Integer">
+        SELECT SUM(anfme) FROM asr_loc_detl
+    </select>
+    <select id="unreason" resultMap="BaseResultMap">
+        SELECT
+            *
+        FROM
+            [dbo].[asr_loc_detl]
+        WHERE
+            DATALENGTH( batch ) != 11 or
+            batch LIKE '%[a-z]%'
+    </select>
+
+    <select id="selectLocDetlSumQty" resultType="double">
+        select SUM(anfme) anfme
+        from asr_loc_detl
+        where loc_no=#{locNo}
+    </select>
+
+    <update id="updateMatTurn">
+        UPDATE a
+        SET a.matnr=b.matnr,
+            a.specs=b.specs,
+            a.maktx=b.maktx,
+            a.unit=b.unit
+        FROM asr_loc_detl a
+        INNER JOIN man_mat b ON a.matnr=#{matnrOld} AND b.matnr=#{matnr};
+    </update>
+
+
 </mapper>

--
Gitblit v1.9.1