修改bug

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/operationManagementCenter/TTaskMapper.xml

@@ -78,6 +78,12 @@
         <if test="taskBatchNo != null and taskBatchNo != ''">
             and task_batch_no = #{taskBatchNo}
         </if>
+        <if test="orderId != null and orderId != ''">
+            and order_id = #{orderId}
+        </if>
+        <if test="planId != null and planId != ''">
+            and plan_id = #{planId}
+        </if>
         <if test="draftFlag != null and draftFlag != ''">
             and draft_flag = #{draftFlag}
         </if>

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/productionReadyCenter/BBomMapper.xml

@@ -34,9 +34,9 @@
     <select id="pageList" parameterType="String" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>
-        from (select b.*,m.brand materialBrandName
+        from (select b.*,m.trade_mark materialBrandName
             ,bi.version
-        from imcs_b_bom b LEFT JOIN imcs_m_tool_meterial m on b.meterial_id = m.id
+        from imcs_b_bom b LEFT JOIN imcs_m_meterial m on b.meterial_id = m.id
             LEFT JOIN imcs_b_bom_version_info bi on b.id = bi.bom_id and bi.use_status = 1
         where 1=1
         ) s ${ew.customSqlSegment}