叫料界面增加组件查询条件

common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java

@@ -131,6 +131,7 @@ public class SfcDispatchDto implements Serializable{
     /**
      * 派工备注
      */
+    @ExcelColumn("备注")
     private String remark;
     /**
      * 前置工序

dispatch/src/main/resources/mapper/CallItemMapper.xml

@@ -647,6 +647,7 @@
             LEFT JOIN CUSTOM_FIELDS CS ON CS.HANDLE = SO.HANDLE AND CS.ATTRIBUTE = 'ITEM_NUMBER'
             INNER JOIN ITEM IT ON IT.HANDLE = SO.ITEM_BO
             LEFT JOIN ITEM_T ITT ON ITT.ITEM_BO = IT.HANDLE AND ITT.LOCALE = 'zh'
+            INNER JOIN ITEM CP ON CP.HANDLE = ZCI.COMPONENT_BO
             INNER JOIN OPERATION OP ON OP.SITE = ZCI.SITE AND OP.OPERATION = ZCI.OPERATION AND OP.CURRENT_REVISION = 'true'
             LEFT JOIN OPERATION_T OPT ON OPT.OPERATION_BO = OP.HANDLE AND OPT.LOCALE = 'zh'
             LEFT JOIN (
@@ -680,6 +681,9 @@
             <if test="resrce != null and resrce != ''">
                 AND ZCI.RESRCE = #{resrce}
             </if>
+            <if test="component != null and component != ''">
+                AND CP.ITEM = #{component}
+            </if>
             <if test="startFromDate != null">
                 AND ZSD.PLANNED_START_DATE >= #{startFromDate}
             </if>