配送系统相关逻辑修改

src/main/resources/mybatis/wisdom/RkInfoMapper.xml

@@ -101,53 +101,73 @@
             ri.exec_status = 1
             AND ri.is_chuku = 0
             AND ri.is_delete = 0
+
             <if test="operationType != null and operationType != ''">
                 AND ri.operation_type LIKE CONCAT('%', #{operationType}, '%')
             </if>
+
             <if test="sapNo != null and sapNo != ''">
                 AND ri.sap_no LIKE CONCAT('%', #{sapNo}, '%')
             </if>
+
             <if test="xmNo != null and xmNo != ''">
                 AND ri.xm_no LIKE CONCAT('%', #{xmNo}, '%')
             </if>
+
             <if test="xmMs != null and xmMs != ''">
                 AND ri.xm_ms LIKE CONCAT('%', #{xmMs}, '%')
             </if>
+
             <if test="wlNo != null and wlNo != ''">
                 AND ri.wl_no LIKE CONCAT('%', #{wlNo}, '%')
             </if>
+
             <if test="wlMs != null and wlMs != ''">
                 AND ri.wl_ms LIKE CONCAT('%', #{wlMs}, '%')
             </if>
+
             <if test="gysMc != null and gysMc != ''">
                 AND ri.gys_mc LIKE CONCAT('%', #{gysMc}, '%')
             </if>
+
             <if test="pcode != null and pcode != ''">
                 AND ri.pcode LIKE CONCAT('%', #{pcode}, '%')
             </if>
+
             <if test="bizType != null and bizType != ''">
                 AND ri.biz_type LIKE CONCAT('%', #{bizType}, '%')
             </if>
+
             <if test="wlType != null and wlType != ''">
                 AND ri.wl_type LIKE CONCAT('%', #{wlType}, '%')
             </if>
+
             <if test="cangku != null and cangku != ''">
                 AND ri.cangku LIKE CONCAT('%', #{cangku}, '%')
             </if>
+
             <if test="billNo != null and billNo != ''">
                 AND ri.bill_no LIKE CONCAT('%', #{billNo}, '%')
             </if>
+
+            <!-- ★★★ 新增：按备注模糊搜索 ★★★ -->
+            <if test="remark != null and remark != ''">
+                AND ri.remark LIKE CONCAT('%', #{remark}, '%')
+            </if>
+
             <if test="isDelete != null and isDelete != ''">
                 AND ri.is_delete = #{isDelete}
             </if>
-            <!-- 出入库时间范围 -->
+
             <if test="startDate != null">
                 AND ri.operation_time &gt;= #{startDate}
             </if>
+
             <if test="endDate != null">
                 AND ri.operation_time &lt;= #{endDate}
             </if>
         </where>
+
         ORDER BY ri.operation_time DESC
     </select>
 
@@ -571,4 +591,32 @@
         ri.sap_no ASC
     </select>
 
+    <select id="getByWarehouseAndScene" resultMap="RkInfoResult">
+        SELECT
+        ri.*
+        FROM rk_info ri
+        JOIN pcde_detail pd
+        ON pd.pcode = ri.pcode
+        WHERE ri.exec_status = 1
+        AND ri.is_delete = '0'
+        AND ri.is_chuku = '0'
+        AND ri.cangku = #{warehouseCode}
+        AND pd.scene = #{sceneId}
+    </select>
+
+    <select id="listRkInfoByPcodes"
+            resultMap="RkInfoResult"
+            parameterType="java.util.ArrayList">
+        SELECT *
+        FROM rk_info
+        WHERE is_delete = 0
+        AND is_chuku = 0
+        AND pcode IN
+        <foreach collection="list" item="p" open="(" separator="," close=")">
+            #{p}
+        </foreach>
+
+    </select>
+
+
 </mapper>