Răsfoiți Sursa

入库成本核对修改

changhaoning 1 an în urmă
părinte
comite
ea14a3d9e1
1 a modificat fișierele cu 6 adăugiri și 2 ștergeri
  1. 6 2
      src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

+ 6 - 2
src/main/java/com/dk/mdm/mapper/ivt/InboundItemMapper.xml

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