501流程测试修改，作废流程添加
This commit is contained in:
liuhanqing
@@ -3,49 +3,90 @@
|
||||
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="com.ruoyi.check.DifferenceRecordFinish.mapper.CheckDifferenceRecordFinishMapper">
|
||||
|
||||
<resultMap type="CheckDifferenceRecordFinish" id="CheckDifferenceRecordFinishResult">
|
||||
<result property="checkGuid" column="check_guid" />
|
||||
<result property="stockId" column="stock_id" />
|
||||
<result property="trayCode" column="tray_code" />
|
||||
<result property="cargoSpaceId" column="cargo_space_id" />
|
||||
<result property="productId" column="product_id" />
|
||||
<result property="lotNo" column="lot_no" />
|
||||
<result property="supplier" column="supplier" />
|
||||
<result property="customer" column="customer" />
|
||||
<result property="oldQuantity" column="old_quantity" />
|
||||
<result property="newQuantity" column="new_quantity" />
|
||||
<result property="recordType" column="record_type" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="productGuid" column="product_guid" />
|
||||
<result property="checkStockDetailId" column="check_stock_detail_id" />
|
||||
<result property="status" column="status" />
|
||||
|
||||
<resultMap type="CheckDifferenceRecord" id="CheckDifferenceRecordResult">
|
||||
<result property="checkGuid" column="check_guid"/>
|
||||
<result property="checkStockDetailId" column="check_stock_detail_id"/>
|
||||
<result property="stockId" column="stock_id"/>
|
||||
<result property="trayCode" column="tray_code"/>
|
||||
<result property="cargoSpaceId" column="cargo_space_id"/>
|
||||
<result property="cargoSpaceName" column="cargo_space_name"/>
|
||||
<result property="productId" column="product_id"/>
|
||||
<result property="lotNo" column="lot_no"/>
|
||||
<result property="supplier" column="supplier"/>
|
||||
<result property="customer" column="customer"/>
|
||||
<result property="oldQuantity" column="old_quantity"/>
|
||||
<result property="newQuantity" column="new_quantity"/>
|
||||
<result property="recordType" column="record_type"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="productGuid" column="product_guid"/>
|
||||
<result property="status" column="status"/>
|
||||
<result property="warehouseId" column="warehouse_id"/>
|
||||
<result property="warehouseName" column="warehouse_name"/>
|
||||
<association property="extraField" javaType="ExtraField">
|
||||
<result property="productId" column="product_id"/>
|
||||
<result property="materialDesc" column="product_name"/>
|
||||
<result property="englishDesc" column="englishDesc"/>
|
||||
<result property="length" column="length"/>
|
||||
<result property="width" column="width"/>
|
||||
<result property="height" column="height"/>
|
||||
<result property="volume" column="volume"/>
|
||||
<result property="netWeight" column="netWeight"/>
|
||||
</association>
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectCheckDifferenceRecordFinishVo">
|
||||
select check_guid, stock_id, tray_code, cargo_space_id, product_id, lot_no, supplier, customer, old_quantity, new_quantity, record_type, create_time, product_guid, check_stock_detail_id, status from check_difference_record_finish
|
||||
select r.check_guid,
|
||||
r.check_stock_detail_id,
|
||||
r.stock_id,
|
||||
r.tray_code,
|
||||
r.cargo_space_id,
|
||||
r.product_id,
|
||||
r.lot_no,
|
||||
r.supplier,
|
||||
r.customer,
|
||||
r.old_quantity,
|
||||
r.new_quantity,
|
||||
r.record_type,
|
||||
r.create_time,
|
||||
r.product_guid,
|
||||
r.status,
|
||||
r.warehouse_id,
|
||||
w.warehouse_name,
|
||||
bp.product_name,
|
||||
bp.spare1 as englishDesc,
|
||||
bp.spare2 as netWeight,
|
||||
bp.spare5 as length,
|
||||
bp.spare6 as width,
|
||||
bp.spare7 as height,
|
||||
bp.spare8 as volume,
|
||||
bcs.cargo_space_name
|
||||
from check_difference_record_finish r
|
||||
left join bas_warehouse w on r.warehouse_id = w.warehouse_id
|
||||
left join bas_product bp on r.product_id = bp.product_id
|
||||
left join bas_cargo_space bcs on r.cargo_space_id = bcs.cargo_space_id
|
||||
</sql>
|
||||
|
||||
<select id="selectCheckDifferenceRecordFinishList" parameterType="CheckDifferenceRecordFinish" resultMap="CheckDifferenceRecordFinishResult">
|
||||
<select id="selectCheckDifferenceRecordFinishList" parameterType="CheckDifferenceRecordFinish" resultMap="CheckDifferenceRecordResult">
|
||||
<include refid="selectCheckDifferenceRecordFinishVo"/>
|
||||
<where>
|
||||
<if test="stockId != null and stockId != ''"> and stock_id = #{stockId}</if>
|
||||
<if test="trayCode != null and trayCode != ''"> and tray_code = #{trayCode}</if>
|
||||
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and cargo_space_id = #{cargoSpaceId}</if>
|
||||
<if test="productId != null and productId != ''"> and product_id = #{productId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and lot_no = #{lotNo}</if>
|
||||
<if test="supplier != null and supplier != ''"> and supplier = #{supplier}</if>
|
||||
<if test="customer != null and customer != ''"> and customer = #{customer}</if>
|
||||
<if test="oldQuantity != null and oldQuantity != ''"> and old_quantity = #{oldQuantity}</if>
|
||||
<if test="newQuantity != null and newQuantity != ''"> and new_quantity = #{newQuantity}</if>
|
||||
<if test="recordType != null "> and record_type = #{recordType}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and product_guid = #{productGuid}</if>
|
||||
<if test="checkStockDetailId != null and checkStockDetailId != ''"> and check_stock_detail_id = #{checkStockDetailId}</if>
|
||||
<if test="status != null and status != ''"> and status = #{status}</if>
|
||||
<where>
|
||||
<if test="stockId != null and stockId != ''"> and r.stock_id = #{stockId}</if>
|
||||
<if test="trayCode != null and trayCode != ''"> and r.tray_code = #{trayCode}</if>
|
||||
<if test="cargoSpaceId != null and cargoSpaceId != ''"> and r.cargo_space_id = #{cargoSpaceId}</if>
|
||||
<if test="productId != null and productId != ''"> and r.product_id = #{productId}</if>
|
||||
<if test="lotNo != null and lotNo != ''"> and r.lot_no = #{lotNo}</if>
|
||||
<if test="supplier != null and supplier != ''"> and r.supplier = #{supplier}</if>
|
||||
<if test="customer != null and customer != ''"> and r.customer = #{customer}</if>
|
||||
<if test="oldQuantity != null and oldQuantity != ''"> and r.old_quantity = #{oldQuantity}</if>
|
||||
<if test="newQuantity != null and newQuantity != ''"> and r.new_quantity = #{newQuantity}</if>
|
||||
<if test="recordType != null "> and r.record_type = #{recordType}</if>
|
||||
<if test="productGuid != null and productGuid != ''"> and r.product_guid = #{productGuid}</if>
|
||||
<if test="checkStockDetailId != null and checkStockDetailId != ''"> and r.check_stock_detail_id = #{checkStockDetailId}</if>
|
||||
<if test="status != null and status != ''"> and r.status = #{status}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectCheckDifferenceRecordFinishByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordFinishResult">
|
||||
|
||||
<select id="selectCheckDifferenceRecordFinishByCheckGuid" parameterType="String" resultMap="CheckDifferenceRecordResult">
|
||||
<include refid="selectCheckDifferenceRecordFinishVo"/>
|
||||
where check_guid = #{checkGuid}
|
||||
</select>
|
||||
@@ -114,9 +155,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</delete>
|
||||
|
||||
<delete id="deleteCheckDifferenceRecordFinishByCheckGuids" parameterType="String">
|
||||
delete from check_difference_record_finish where check_guid in
|
||||
delete from check_difference_record_finish where check_guid in
|
||||
<foreach item="checkGuid" collection="array" open="(" separator="," close=")">
|
||||
#{checkGuid}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
||||
Reference in New Issue
Block a user