Merge remote-tracking branch 'origin/20241216临时分支-包含修改投产周转外协工序单价等' into 20241216临时分支-包含修改投产周转外协工序单价等

src/main/java/cn/ezhizao/project/business/domain/BizLot.java

@@ -244,5 +244,7 @@ public class BizLot extends BaseEntity {
     private Integer totalLotNumber;
     @TableField(exist = false)
     private String companyAlias;
+    @TableField(exist = false)
+    private String furnaceNumber;
 
 }

src/main/resources/mybatis/business/BizLotMapper.xml

@@ -105,8 +105,10 @@
     </select>
 
     <select id="getList" parameterType="BizLot" resultMap="BizLotResult">
-        SELECT t1.*, t4.total_lot_number,t4.company_alias as companyAlias FROM biz_lot t1
+        SELECT t1.*, t4.total_lot_number,t4.company_alias as companyAlias, t3.furnace_number  FROM biz_lot t1
         LEFT JOIN biz_production_plan_detail t4 ON t1.production_plan_detail_id = t4.id
+        left join biz_daywork t2 on t2.deleted = 0 and t2.lot_id = t1.id
+        left join biz_furnace_no_info t3 on t3.daywork_id = t2.id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
             <if test="id != null">AND t1.id = #{id}</if>
@@ -135,6 +137,8 @@
             <if test="drawingNumber != null  and drawingNumber != ''">AND t1.drawing_number = #{drawingNumber}</if>
             <if test="productDescription != null  and productDescription != ''">AND t4.product_description like concat('%',#{productDescription},'%')
             </if>
+            <if test="furnaceNumber != null  and furnaceNumber != ''">AND t3.furnace_number like concat('%',#{furnaceNumber},'%')
+            </if>
             <if test="status == 0">
                 AND not exists (select 1 from biz_daywork where t1.id = biz_daywork.lot_id and biz_daywork.deleted = 0)
             </if>