|
|
@@ -589,8 +589,8 @@
|
|
|
<include refid="Base_Column_List_Response"/>
|
|
|
,tpid.into_no as "intoNo"
|
|
|
,tmgs.sku_code as "skuCode"
|
|
|
- ,tpii.sku_model as "skuModel"
|
|
|
- ,tpii.sku_name as "skuName"
|
|
|
+ ,tmgs.sku_model as "skuModel"
|
|
|
+ ,tmgs.sku_name as "skuName"
|
|
|
,tmgs.sku_spec as "skuSpec"
|
|
|
,tmgb.brand_name as "brandName"
|
|
|
,tmgb.short_name as "shortName"
|
|
|
@@ -669,6 +669,9 @@
|
|
|
AND tpii.into_status =
|
|
|
any(#{intoStatusList, typeHandler= StringListTypeHandler})
|
|
|
</if>
|
|
|
+ <if test="skuModel != null and skuModel != ''">
|
|
|
+ AND tmgs.sku_model LIKE concat('%',my_ex.likequery(#{skuModel}),'%')
|
|
|
+ </if>
|
|
|
<if test="searchText !=null">
|
|
|
AND (tpid.into_no LIKE concat('%',my_ex.likequery(#{searchText}), '%') OR tmgs.sku_name LIKE concat('%',my_ex.likequery(#{searchText}),'%') OR tmgs.sku_code LIKE concat('%',my_ex.likequery(#{searchText}),'%'))
|
|
|
</if>
|
|
|
@@ -682,6 +685,7 @@
|
|
|
<update id="updateCost" parameterType="com.dk.mdm.model.pojo.ivt.InboundItem">
|
|
|
update dkic_b.t_psi_inbound_item
|
|
|
<set>
|
|
|
+ flg_cost_check = true,
|
|
|
<if test="costPrice!= null">
|
|
|
cost_price= #{costPrice},
|
|
|
</if>
|
changhaoning