5907 【模具盘点】

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -47,6 +47,9 @@
         <if test="kindCodeList != null and kindCodeList.size()>0">
             AND kind_code =any(#{kindCodeList,typeHandler=StringListTypeHandler})
         </if>
+        <if test="excludeKindCodeList != null and excludeKindCodeList.size()>0">
+            AND kind_code !=any(#{excludeKindCodeList,typeHandler=StringListTypeHandler})
+        </if>
         order by display_no
     </select>
 

src/main/java/com/dk/mdm/mapper/mst/MouldCheckItemMapper.xml

@@ -189,6 +189,9 @@
                 <if test="makeItems.mouldKindIds!=null">
                     and tm.mould_kind = any (#{makeItems.mouldKindIds, typeHandler=StringListTypeHandler})
                 </if>
+                <if test="makeItems.placeId!=null">
+                    and tm.place_id = any (#{makeItems.placeId, typeHandler=IntListTypeHandler})
+                </if>
             </if>
             <if test="mouldCode!=null and mouldCode!=''">
                 and tm.unique_code = #{mouldCode}

src/main/java/com/dk/mdm/mapper/mst/MouldCheckMapper.xml

@@ -27,7 +27,10 @@
                (select string_agg(category_name, ' | ')
                 from mst.t_model_category
                 where category_id = any
-                      ((array(select (json_array_elements_text(tmc.make_items -> 'modelCategoryIds'))))::bigint[]))
+                      ((array(select (json_array_elements_text(tmc.make_items -> 'modelCategoryIds'))))::bigint[])),
+                'placeName',
+                (select string_agg(sys.f_concat_level2(tw.wh_name, twp.place_name), ' | ') from
+                mst.t_warehouse_place twp left join mst.t_warehouse tw on tw.wh_id = twp.wh_id where twp.place_id = any((array(select (json_array_elements_text(tmc.make_items -> 'placeId'))))::bigint[]))
            ) as make_items,
         tmc.remarks, tmc.flg_valid, tmc.fty_id, tmc.op_create_time, tmc.op_create_user_id, tmc.op_update_time, tmc.op_update_user_id, tmc.op_app_code, tmc.op_timestamp, tmc.op_db_user, tmc.check_total, tmc.checked_qty, tmc.uncheck_qty, tmc.plus_qty, tmc.loss_qty
     </sql>