工艺夹具前端页面展示绑定产品

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

@@ -52,7 +52,7 @@
 
     <!-- 托盘夹具列表 -->
     <select id="getProcedureTray" parameterType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion" resultType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureTray">
-        select ts.*,ps.positions,tg.group_sort,tg.group_prority
+        select ts.*,ps.positions,tg.group_sort,tg.group_prority,tt.production_type
         from (
 --             (select a.id,a.tray_id,a.biz_type,a.specification_id,t.name,t.no,t.specification,t.brand,a.armor_pic,a.remark,a.group_id,a.sort,a.procedure_id from imcs_b_bom_procedure_tray a
 --             left join imcs_t_tray t on a.tray_id = t.id
@@ -69,6 +69,7 @@
                 group by a.procedure_tray_id ) ps
         on ts.id = ps.procedure_tray_id
         left join imcs_b_bom_procedure_tray_group tg on ts.group_id = tg.id
+        left join imcs_t_tray tt on tt.no=ts.no
         where 1=1
         <if test="id != null and id != '' ">
             and ts.procedure_id = #{id}

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

@@ -22,12 +22,13 @@
         <result column="join_date" jdbcType="VARCHAR" property="joinDate"/>
         <result column="zone_id" jdbcType="BIGINT" property="zoneId"/>
         <result column="material_type" jdbcType="VARCHAR" property="materialType"/>
+        <result column="production_type" jdbcType="VARCHAR" property="productionType"/>
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
         id,create_time,create_user,update_time,update_user,join_date,factory,zone_id,
-        no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type,org_id
+        no, name, status, model, category, brand,map_no,period,expiry_date,num,material_type,org_id,production_type
     </sql>
 
     <!-- 分页 -->
@@ -35,8 +36,9 @@
         select
         <include refid="Base_Column_List"/>
         from (
-         select a.*, z.org_id from imcs_m_frock_clamp a
+         select a.*, z.org_id,tt.production_type from imcs_m_frock_clamp a
          left join imcs_z_zone z on a.zone_id = z.id
+          left join imcs_t_tray tt on a.no=tt.no
         ) s ${ew.customSqlSegment}
     </select>
 

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

@@ -186,6 +186,10 @@ public class BomProcedureTray extends Entity<Long> {
     @TableField(exist = false)
     private String name;
 
+    @ApiModelProperty(value="产品类型")
+    @TableField(exist = false)
+    private String productionType;
+
     @Builder
     public BomProcedureTray(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser, 
                     Long trayId, Long procedureId, String remark, String bizType, Integer sort, 

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

@@ -155,6 +155,9 @@ public class MToolClamp extends Entity<Long> {
     @TableField(value = "syn_flag")
     private int synFlag;
 
+    @TableField(exist = false)
+    private String productionType;
+
 
     @Builder
     public MToolClamp(Long id, LocalDateTime createTime, Long createUser, LocalDateTime updateTime, Long updateUser,