|
|
@@ -8,7 +8,7 @@
|
|
|
into_id ,into_no, into_type, from_id, from_no, org_id, staff_id, cus_id, sup_id,
|
|
|
into_status, intoing_qty, intoing_amt, into_qty, into_amt, return_qty,
|
|
|
return_amt, into_date, remarks, annex_paths, make_staff, make_time,
|
|
|
- receivable_id, payable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
|
|
|
+ receivable_id, flg_valid, cp_id, op_create_time, op_create_user_id,
|
|
|
op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user,wh_id,
|
|
|
into_reason,flg_auto_handle,flg_handle_setting,flg_neg_into
|
|
|
</sql>
|
|
|
@@ -19,7 +19,7 @@
|
|
|
tpi.into_id, tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id,
|
|
|
tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt, tpi.into_qty,
|
|
|
tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths,
|
|
|
- tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id,
|
|
|
+ tpi.make_staff, tpi.make_time, tpi.receivable_id, tpi.flg_valid, tpi.cp_id,
|
|
|
tpi.wh_id,tpi.into_reason,tpi.flg_auto_handle,tpi.flg_handle_setting,tpi.flg_neg_into
|
|
|
</sql>
|
|
|
|
|
|
@@ -48,7 +48,6 @@
|
|
|
<result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
|
|
|
<result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
|
|
|
- <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="flg_valid" property="flgValid"/>
|
|
|
<result column="cp_id" property="cpId"/>
|
|
|
<result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
|
|
|
@@ -90,7 +89,6 @@
|
|
|
<result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
|
|
|
<result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
|
|
|
- <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="flg_valid" property="flgValid"/>
|
|
|
<result column="cp_id" property="cpId"/>
|
|
|
<result column="into_reason" property="intoReason" typeHandler="UuidTypeHandler"/>
|
|
|
@@ -121,7 +119,7 @@
|
|
|
tpi.into_id
|
|
|
, tpi.into_no, tpi.into_type, tpi.from_id, tpi.from_no, tpi.org_id, tpi.staff_id, tpi.cus_id, tpi.sup_id, tpi.into_status, tpi.intoing_qty, tpi.intoing_amt,
|
|
|
tpi.into_qty, tpi.into_amt, tpi.return_qty, tpi.return_amt, tpi.into_date, tpi.remarks, tpi.annex_paths, tpi.make_staff, tpi.make_time,
|
|
|
- tpi.receivable_id, tpi.payable_id, tpi.flg_valid, tpi.cp_id
|
|
|
+ tpi.receivable_id, tpi.flg_valid, tpi.cp_id
|
|
|
</sql>
|
|
|
<!-- response明细关联明细映射-->
|
|
|
<resultMap id="BaseResultMapItemResponse" type="com.dk.mdm.model.response.ivt.InboundResponse">
|
|
|
@@ -147,7 +145,6 @@
|
|
|
<result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
|
|
|
<result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
|
|
|
- <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="flg_valid" property="flgValid"/>
|
|
|
<result column="cp_id" property="cpId"/>
|
|
|
<collection property="inboundItemList" resultMap="inboundItemListMap" columnPrefix="list_"/>
|
|
|
@@ -262,9 +259,6 @@
|
|
|
<if test="receivableId != null and receivableId != ''">
|
|
|
AND tpi.receivable_id = #{receivableId}
|
|
|
</if>
|
|
|
- <if test="payableId != null and payableId != ''">
|
|
|
- AND tpi.payable_id = #{payableId}
|
|
|
- </if>
|
|
|
<if test="flgValid != null">
|
|
|
AND tpi.flg_valid = #{flgValid}
|
|
|
</if>
|
|
|
@@ -453,7 +447,6 @@
|
|
|
make_staff,
|
|
|
make_time,
|
|
|
receivable_id,
|
|
|
- payable_id,
|
|
|
cp_id,
|
|
|
op_app_code,
|
|
|
wh_id,
|
|
|
@@ -485,7 +478,6 @@
|
|
|
#{item.makeStaff}::uuid,
|
|
|
#{item.makeTime},
|
|
|
#{item.receivableId}::uuid,
|
|
|
- #{item.payableId}::uuid,
|
|
|
#{item.cpId},
|
|
|
#{item.opAppCode},
|
|
|
#{item.whId},
|
|
|
@@ -983,7 +975,6 @@
|
|
|
<result column="make_staff" property="makeStaff" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
|
|
|
<result column="receivable_id" property="receivableId" typeHandler="UuidTypeHandler"/>
|
|
|
- <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
|
|
|
<result column="flg_valid" property="flgValid"/>
|
|
|
<result column="cp_id" property="cpId"/>
|
|
|
<result column="sup_name" property="supName"/>
|