出入库逻辑修改

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

@@ -22,6 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="htQty"    column="ht_qty"    />
         <result property="dw"    column="dw"    />
         <result property="status"    column="status"    />
+        <result property="entityId" column="entity_id" />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectGysJhVo">
-        select id, index_no, xj, xm_no, xm_ms, wl_no, wl_ms, gys_no, gys_mc, jh_amt, ht_dj, sap_no, xh, jh_qty, ht_qty, dw, status, remark, create_by, create_time, update_by, update_time, is_delete from gys_jh
+        select id, index_no, xj, xm_no, xm_ms, wl_no, wl_ms, gys_no, gys_mc, jh_amt, ht_dj, sap_no, xh, jh_qty, ht_qty, dw, status,entity_id, remark, create_by, create_time, update_by, update_time, is_delete from gys_jh
     </sql>
 
     <select id="selectGysJhList" parameterType="GysJh" resultMap="GysJhResult">
@@ -54,7 +55,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'
+        AND status != '1'
     </select>
 
     <select id="existsByUniqueKeys" resultType="boolean">
@@ -63,7 +64,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE sap_no = #{sapNo}
           AND xm_no = #{xmNo}
           AND wl_no = #{wlNo}
-          AND is_delete = '0'
+          AND is_delete != '1'
+    </select>
+
+    <select id="selectByIds" resultMap="GysJhResult">
+        SELECT * FROM gys_jh
+        WHERE id IN
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
     </select>
 
     <insert id="insertGysJh" parameterType="GysJh" useGeneratedKeys="true" keyProperty="id">
@@ -85,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">ht_qty,</if>
             <if test="dw != null">dw,</if>
             <if test="status != null">status,</if>
+            <if test="entityId != null">entity_id,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -109,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">#{htQty},</if>
             <if test="dw != null">#{dw},</if>
             <if test="status != null">#{status},</if>
+            <if test="entityId != null">#{entityId},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -137,6 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="htQty != null">ht_qty = #{htQty},</if>
             <if test="dw != null">dw = #{dw},</if>
             <if test="status != null">status = #{status},</if>
+            <if test="entityId != null">entity_id = #{entityId},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -164,13 +176,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <update id="batchUpdateStatusByIds">
         UPDATE gys_jh
-        SET status = '1'
+        SET status = '2'
         WHERE id IN
-        <foreach collection="idSet" item="id" open="(" separator="," close=")">
+        <foreach collection="ids" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
     </update>
 
+    <update id="decreaseJhQtyById">
+        UPDATE gys_jh
+        SET jh_qty = jh_qty - #{realQty}
+        WHERE id = #{id}
+    </update>
+
     <delete id="deleteGysJhById" parameterType="Long">
         delete from gys_jh where id = #{id}
     </delete>