From 1f97a20465e29c4ae1824aa66408c77213812c40 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期三, 19 十一月 2025 16:38:18 +0800
Subject: [PATCH] #新增erp中间表库存同步功能

---
 src/main/resources/mapper/WrkDetlLogMapper.xml |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/WrkDetlLogMapper.xml b/src/main/resources/mapper/WrkDetlLogMapper.xml
index eea3275..a2a468e 100644
--- a/src/main/resources/mapper/WrkDetlLogMapper.xml
+++ b/src/main/resources/mapper/WrkDetlLogMapper.xml
@@ -45,11 +45,26 @@
         <result column="appe_user" property="appeUser"/>
         <result column="appe_time" property="appeTime"/>
         <result column="memo" property="memo"/>
+
+        <result column="i_no" property="iNo" />
+        <result column="temp1" property="temp1" />
+        <result column="temp2" property="temp2" />
+        <result column="temp3" property="temp3" />
+        <result column="pg_no" property="sPgNO" />
+        <result column="pro_type" property="proType" />
+        <result column="out_order_no" property="outOrderNo" />
+        <result column="lu_hao" property="luHao" />
+        <result column="ware_id" property="wareId" />
+        <result column="ware_mame" property="wareName" />
+        <result column="packing" property="packing" />
     </resultMap>
 
     <sql id="batchSeq">
         <if test="wrkNo != null and wrkNo != ''">
             and a.wrk_no = #{wrkNo}
+        </if>
+        <if test="anfme != null and anfme != ''">
+            and a.anfme = #{anfme}
         </if>
         <if test="modiTimeStart != null ">
             <if test="modiTimeEnd != null ">
@@ -57,11 +72,22 @@
             </if>
         </if>
         <if test="orderNo != null and orderNo != ''">
-            and ( a.order_no like concat('%',#{orderNo},'%')
-            or a.batch like concat('%',#{orderNo},'%')
-            or a.matnr like concat('%',#{orderNo},'%')
-            or a.zpallet like concat('%',#{orderNo},'%')
-            )
+            and a.order_no like concat('%',#{orderNo},'%')
+        </if>
+        <if test="batch != null and batch != ''">
+            and a.batch like concat('%',#{batch},'%')
+        </if>
+        <if test="matnr != null and matnr != ''">
+            and a.matnr like concat('%',#{matnr},'%')
+        </if>
+        <if test="zpallet != null and zpallet != ''">
+            and a.zpallet like concat('%',#{zpallet},'%')
+        </if>
+        <if test="specs != null and specs != ''">
+            and a.specs like concat('%',#{specs},'%')
+        </if>
+        <if test="model != null and model != ''">
+            and a.model like concat('%',#{model},'%')
         </if>
     </sql>
 
@@ -82,7 +108,7 @@
     </select>
 
     <select id="selectWrkDetlLogsTotal" resultType="Long">
-        select count(*) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
+        select count(1) from asr_wrk_detl_log as a ,asr_wrk_mast_log as b
         where 1=1
         and a.io_time=b.io_time
         and a.wrk_no=b.wrk_no

--
Gitblit v1.9.1