添加产线字段

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

@@ -49,8 +49,8 @@
 --             left join imcs_t_tray t on a.tray_id = t.id
 --             where biz_type = '1')
 --             union
-            (select b.id,b.tray_id,b.biz_type,b.specification_id,c.name,c.no,c.category,c.brand,b.armor_pic,b.remark,b.group_id,b.sort,b.procedure_id from imcs_b_bom_procedure_tray b
-            LEFT JOIN imcs_m_frock_clamp c on b.tray_id = c.id
+            (select b.id,b.tray_id,b.biz_type,b.specification_id,c.name,c.no,c.category,c.brand,b.armor_pic,b.remark,b.group_id,b.sort,b.procedure_id,c.material_type materialType from imcs_b_bom_procedure_tray b
+                LEFT JOIN imcs_m_frock_clamp c on b.tray_id = c.id
                 where biz_type = '2'
             )
         )ts

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionReadyCenter/entity/BomProcedureTray.java

@@ -161,6 +161,10 @@ public class BomProcedureTray extends Entity<Long> {
     @TableField(exist = false)
     private String category;
 
+    @ApiModelProperty(value="材料类型")
+    @TableField(exist = false)
+    private String materialType;
+
 
     /**
      * 品牌