入库相关接口开发2.0

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

@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getBySapNo" parameterType="java.lang.String" resultMap="GysJhResult">
         <include refid="selectGysJhVo"/>
         WHERE sap_no = #{sapNo}
+        AND status = '0'
     </select>
 
     <insert id="insertGysJh" parameterType="GysJh" useGeneratedKeys="true" keyProperty="id">
@@ -137,6 +138,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <update id="updateStatusById" parameterType="Long">
+        update gys_jh
+        set status = '1'
+        where id = #{id}
+    </update>
+
     <delete id="deleteGysJhById" parameterType="Long">
         delete from gys_jh where id = #{id}
     </delete>

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

@@ -62,20 +62,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <insert id="batchInsertRkInfo" parameterType="java.util.List">
         insert into rk_info (
         rk_type, wl_type, cangku, lihuo_y, rk_time,
-        wl_no, xm_ms, pcode, tray_code, real_qty, entity_id,
+        wl_no, wl_ms, xm_no, xm_ms, xj, sap_no, gys_no, gys_mc,
+        jh_qty, ht_qty, jh_amt, ht_dj, dw,
+        pcode, pcode_id, tray_code, real_qty, entity_id,
         remark, is_chuku, is_delete, create_by, create_time
         )
         values
         <foreach collection="list" item="item" separator=",">
             (
             #{item.rkType}, #{item.wlType}, #{item.cangku}, #{item.lihuoY}, #{item.rkTime},
-            #{item.wlNo}, #{item.xmMs}, #{item.pcode}, #{item.trayCode}, #{item.realQty}, #{item.entityId},
+            #{item.wlNo}, #{item.wlMs}, #{item.xmNo}, #{item.xmMs}, #{item.xj}, #{item.sapNo}, #{item.gysNo}, #{item.gysMc},
+            #{item.jhQty}, #{item.htQty}, #{item.jhAmt}, #{item.htDj}, #{item.dw},
+            #{item.pcode}, #{item.pcodeId}, #{item.trayCode}, #{item.realQty}, #{item.entityId},
             #{item.remark}, #{item.isChuku}, #{item.isDelete}, #{item.createBy}, #{item.createTime}
             )
         </foreach>
     </insert>
 
-
     <select id="selectRkInfoList" parameterType="RkInfo" resultMap="RkInfoResult">
         <include refid="selectRkInfoVo"/>
         <where>
@@ -111,10 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
     </select>
-    
+
     <select id="selectRkInfoById" parameterType="Long" resultMap="RkInfoResult">
         <include refid="selectRkInfoVo"/>
-        where id = #{id} and is_delete = 0
+        where ri.id = #{id} and ri.is_delete = 0
     </select>
 
     <select id="countRkInfoByLocationCode" resultType="int">
@@ -122,6 +125,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         FROM rk_info
         WHERE pcode = #{locationCode} AND is_delete = 0
     </select>
+
+    <select id="selectUsedPcodes" resultType="java.lang.String">
+        SELECT DISTINCT pcode
+        FROM rk_info
+        WHERE is_delete = '0' AND is_chuku != '1'
+    </select>
+
     <update id="updateRkInfo" parameterType="RkInfo">
         update rk_info
         <trim prefix="SET" suffixOverrides=",">