From 04624df6dd04be92cd6750d6aa53d4758b3386b7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-J7ED0MB\\yinjinlu" <411641505@qq.com>
Date: Sat, 19 Nov 2022 17:05:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmRtSalseController.java    |  2 +-
 .../resources/mapper/wm/WmRtSalseMapper.xml   | 45 +++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtSalseController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtSalseController.java
index a4601f4..9b829e9 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtSalseController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmRtSalseController.java
@@ -172,7 +172,7 @@ public class WmRtSalseController extends BaseController
      * @param rtId
      * @return
      */
-    @PreAuthorize("@ss.hasPermi('mes:wm:rtissue:edit')")
+    @PreAuthorize("@ss.hasPermi('mes:wm:rtsalse:edit')")
     @Log(title = "产品销售退货单", businessType = BusinessType.UPDATE)
     @Transactional
     @PutMapping("/{rtId}")
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmRtSalseMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmRtSalseMapper.xml
index c7e0a03..0c8a196 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmRtSalseMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmRtSalseMapper.xml
@@ -36,10 +36,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
     </resultMap>
 
+    <resultMap type="RtSalseTxBean" id="RtSalseTxBeanResult">
+        <result property="itemId" column="item_id"></result>
+        <result property="itemCode" column="item_code"></result>
+        <result property="itemName" column="item_name"></result>
+        <result property="specification" column="specification"></result>
+        <result property="unitOfMeasure" column="unit_of_measure"></result>
+        <result property="batchCode" column="batch_code"></result>
+        <result property="warehouseId" column="warehouse_id"></result>
+        <result property="warehouseCode" column="warehouse_code"></result>
+        <result property="warehouseName" column="warehouse_name"></result>
+        <result property="locationId" column="location_id"></result>
+        <result property="locationCode" column="location_code"></result>
+        <result property="locationName" column="location_name"></result>
+        <result property="areaId" column="area_id"></result>
+        <result property="areaCode" column="area_code"></result>
+        <result property="areaName" column="area_name"></result>
+        <result property="sourceDocType" column="source_doc_type"></result>
+        <result property="sourceDocId" column="source_doc_id"></result>
+        <result property="sourceDocCode" column="source_doc_code"></result>
+        <result property="sourceDocLineId" column="source_doc_line_id"></result>
+        <result property="transactionQuantity" column="transaction_quantity"></result>
+        <result property="rtDate" column="rt_date"></result>
+    </resultMap>
+
     <sql id="selectWmRtSalseVo">
         select rt_id, rt_code, rt_name, so_code, client_id, client_code, client_name, client_nick, warehouse_id, warehouse_code, warehouse_name, location_id, location_code, location_name, area_id, area_code, area_name, rt_date, rt_reason, status, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_rt_salse
     </sql>
 
+    <select id="getTxBeans" parameterType="Long" resultMap="RtSalseTxBeanResult">
+        SELECT irl.`item_id`,
+               irl.`item_code`,
+               irl.`item_name`,
+               irl.`specification`,
+               irl.`unit_of_measure`,
+               irl.`batch_code`,
+               irl.`warehouse_id`,irl.`warehouse_code`,irl.`warehouse_name`,
+               irl.`location_id`,irl.`location_code`,irl.`location_name`,
+               irl.`area_id`,irl.`area_code`,irl.`area_name`,
+               'RTSALSE' AS source_doc_type,ir.`rt_id` AS source_doc_id,
+               ir.`rt_code` AS source_doc_code,
+               irl.`line_id` AS source_doc_line_id,
+               irl.quantity_rted AS transaction_quantity,
+               ir.rt_date as recptDate
+        FROM wm_rt_salse ir
+                 LEFT JOIN wm_rt_salse_line irl
+                           ON ir.rt_id = irl.rt_id
+        WHERE ir.rt_id = #{rtId}
+    </select>
+
     <select id="selectWmRtSalseList" parameterType="WmRtSalse" resultMap="WmRtSalseResult">
         <include refid="selectWmRtSalseVo"/>
         <where>