审核模块相关接口修改

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

@@ -55,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime"    column="update_time"    />
         <result property="isDelete"    column="is_delete"    />
         <result property="hasMoved" column="has_moved"/>
+        <result property="lihuoYName" column="lihuo_y_name"/>
     </resultMap>
 
     <sql id="selectRkInfoVo">
@@ -75,13 +76,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ri.gys_no, ri.gys_mc, ri.jh_amt, ri.ht_dj, ri.sap_no, ri.xh,
             ri.jh_qty, ri.ht_qty, ri.dw, ri.real_qty,
             ri.pcode, ri.pcode_id, ri.tray_code, ri.entity_id,
-            ri.create_by, ri.create_time, ri.update_by, ri.update_time, ri.is_delete
+            ri.create_by, ri.create_time, ri.update_by, ri.update_time, ri.is_delete,
+            u.user_name AS lihuo_y_name
         FROM rk_info ri
                  LEFT JOIN stock_in_type st ON ri.rk_type = st.type_code
                  LEFT JOIN material_type mt ON ri.wl_type = mt.type_code
                  LEFT JOIN warehouse_info wh ON ri.cangku = wh.warehouse_code
                  LEFT JOIN stock_out_type sot ON ri.ck_type = sot.type_code
                  LEFT JOIN construction_team ct ON ri.team_code = ct.team_code
+                 LEFT JOIN sys_user u ON ri.lihuo_y = u.user_id
     </sql>
 
     <insert id="batchInsertRkInfo"
@@ -94,9 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         wl_no, wl_ms, xm_no, xm_ms,
         xm_no_ck, xm_ms_ck, xj, sap_no, gys_no, gys_mc,
         jh_qty, ht_qty, jh_amt, ht_dj, dw,
-        borrow_time, return_time,
+        borrow_time, return_time, status,
         pcode, pcode_id, tray_code, real_qty, entity_id,
-        remark, is_chuku,is_borrowed,
+        remark, is_chuku, is_borrowed, gys_jh_id,
         is_delete, create_by, create_time
         )
         VALUES
@@ -107,13 +110,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{item.wlNo}, #{item.wlMs}, #{item.xmNo}, #{item.xmMs},
             #{item.xmNoCk}, #{item.xmMsCk}, #{item.xj}, #{item.sapNo}, #{item.gysNo}, #{item.gysMc},
             #{item.jhQty}, #{item.htQty}, #{item.jhAmt}, #{item.htDj}, #{item.dw},
-            #{item.borrowTime}, #{item.returnTime},
+            #{item.borrowTime}, #{item.returnTime}, #{item.status},
             #{item.pcode}, #{item.pcodeId}, #{item.trayCode}, #{item.realQty}, #{item.entityId},
-            #{item.remark}, #{item.isChuku}, #{item.isBorrowed},
+            #{item.remark}, #{item.isChuku}, #{item.isBorrowed}, #{item.gysJhId},
             #{item.isDelete}, #{item.createBy}, #{item.createTime}
             )
         </foreach>
     </insert>
+
     <!--还料入库-->
     <insert id="insertRkInfo" parameterType="RkInfo" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO rk_info (
@@ -347,6 +351,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         r.bill_no AS billNo,
         MAX(r.lihuo_y) AS lihuoY,
+        MAX(u.user_name) AS lihuoYName,
         MAX(rkType.type_name) AS rkTypeName,
         MAX(cangku.warehouse_name) AS cangkuName,
         MAX(wlType.type_name) AS wlTypeName
@@ -354,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN stock_in_type rkType ON r.rk_type = rkType.type_code
         LEFT JOIN warehouse_info cangku ON r.cangku = cangku.warehouse_code
         LEFT JOIN material_type wlType ON r.wl_type = wlType.type_code
+        LEFT JOIN sys_user u ON r.lihuo_y = u.user_id
         WHERE r.is_delete = '0'
         AND r.bill_no IN
         <foreach collection="billNos" item="billNo" open="(" separator="," close=")">
@@ -450,6 +456,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE rk_info
         SET status = #{status},
             update_by = #{updateBy},
+            is_chuku = #{isChuku},
             update_time = #{updateTime}
         WHERE bill_no = #{billNo}
           AND is_delete = '0'