取消领用

gdg

2021-02-03 94e89a3391c7f28d9002fbcc0cafdbf6d05d7e73

 src/main/java/com/nanometer/smartlab/dao/OpeWarehouseReserveDao.xml

@@ -12,6 +12,7 @@
    <result property="validFlag" column="valid_flag" typeHandler="com.nanometer.smartlab.entity.handler.ValidFlagHandler"></result>

    <result property="reagentId" column="reagent_id"></result>
    <result property="userId" column="user_id"></result>
    <association property="reagent" javaType="com.nanometer.smartlab.entity.SysReagent">
         <id property="id" column="reagentId"/>
       <result property="name" column="name"></result>
@@ -57,6 +58,9 @@
    <if test="productSn != null and productSn != ''">
        and sr.product_sn like concat('%',#{productSn},'%')
    </if>
      <if test="warehouseName != null and warehouseName != ''">
          and sw.name like concat('%',#{warehouseName},'%')
      </if>
  </sql>

  <sql id="queryColumns">
@@ -103,12 +107,12 @@
  </select>

    <insert id="insertOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId})
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,container_id,user_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{containerId},#{userId})
    </insert>
    <insert id="insertOpeWarehouseReserve2" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId})
        insert into ope_warehouse_reserve(id, reagent_id, article_number, reserve, valid_flag, update_time,warehouseId,apply_code,order_code,container_id,user_id)
        values (#{id}, #{reagentId}, #{articleNumber}, #{reserve}, 1, now(),#{warehouseId},#{applyCode},#{orderCode},#{containerId},#{userId})
    </insert>

    <update id="updateOpeWarehouseReserve" parameterType="com.nanometer.smartlab.entity.OpeWarehouseReserve">
@@ -123,6 +127,9 @@
        </if>
        <if test="warehouseId != null and warehouseId !=''">
            warehouseId=#{warehouseId},
        </if>
        <if test="userId != null and userId !=''">
            user_id=#{userId},
        </if>
        </set>
        where id=#{id}
@@ -171,6 +178,7 @@
        owr.reserve,
        owr.article_number,
        owr.container_id,
        owr.user_id,
        owr.update_time
        FROM
        ope_warehouse_reserve owr
@@ -206,6 +214,7 @@

    <update id="updateCount" parameterType="java.util.Map">
        update ope_warehouse_reserve set reserve=reserve+1 where reagent_id=#{reagentId} and article_number=#{articleNumber}
        and valid_flag = 1
    </update>
    <update id="updateBtReserve">
        UPDATE ope_warehouse_reserve