|
|
@@ -10,7 +10,7 @@
|
|
|
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,
|
|
|
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
|
|
|
+ into_reason,flg_auto_handle,flg_handle_setting,flg_neg_into
|
|
|
</sql>
|
|
|
|
|
|
|
|
|
@@ -20,7 +20,7 @@
|
|
|
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.wh_id,tpi.into_reason,flg_auto_handle,flg_handle_setting
|
|
|
+ tpi.wh_id,tpi.into_reason,tpi.flg_auto_handle,tpi.flg_handle_setting,tpi.flg_neg_into
|
|
|
</sql>
|
|
|
|
|
|
|
|
|
@@ -62,6 +62,7 @@
|
|
|
<result column="wh_id" property="whId"/>
|
|
|
<result column="flg_auto_handle" property="flgAutoHandle"/>
|
|
|
<result column="flg_handle_setting" property="flgHandleSetting"/>
|
|
|
+ <result column="flg_neg_into" property="flgNegInto"/>
|
|
|
</resultMap>
|
|
|
|
|
|
<!-- response查询映射结果 -->
|
|
|
@@ -111,6 +112,7 @@
|
|
|
<result column="return_address" property="returnAddress" />
|
|
|
<result column="flg_auto_handle" property="flgAutoHandle"/>
|
|
|
<result column="flg_handle_setting" property="flgHandleSetting"/>
|
|
|
+ <result column="flg_neg_into" property="flgNegInto"/>
|
|
|
</resultMap>
|
|
|
|
|
|
|
|
|
@@ -631,6 +633,9 @@
|
|
|
<if test="intoStatus != null and intoStatus != ''">
|
|
|
AND tpi.into_status = #{intoStatus}
|
|
|
</if>
|
|
|
+ <if test="fromId != null and fromId != ''">
|
|
|
+ AND tpi.from_id = #{fromId}::uuid
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|