工序

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/BomProcedureVersionServiceImpl.java

@@ -425,6 +425,7 @@ public class BomProcedureVersionServiceImpl extends SuperServiceImpl<BomProcedur
                     item.setProcedureId(bean.getId());
                     item.setResourceId(pp.getResourceId());
                     item.setPrority(pp.getPrority());
+                    item.setResourceBusinessId(pp.getResourceBusinessId());
                     bomProcedureProductionresourceService.save(item);
                 }else{//修改
                     bomProcedureProductionresourceService.updateById(pp);

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/ProductionresourceBizServiceImpl.java

@@ -45,6 +45,6 @@ public class ProductionresourceBizServiceImpl implements ProductionresourceBizSe
             item.put("businessList", CollectionUtil.isEmpty(businessList)?new ArrayList<>():businessList);
             return item;
         }).collect(Collectors.toList());
-        return map;
+        return returnMap;
     }
 }

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

@@ -22,13 +22,26 @@
     </sql>
 
     <!-- 根据工艺id获取生产资源（设备） -->
-    <select id="getResourcelist" parameterType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion" resultType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProductionresource">
-        select a.*,b.code,b.name,b.cncProgram from imcs_b_bom_procedure_productionresource a
-        left join (
-            select pr.id,pr.code,pr.name,ifnull(pc.cnc_program,0) as cncProgram from imcs_tenant_productionresource pr
-            left join imcs_p_productionresource_conf pc on pr.id = pc.resource_id
-        ) b on a.resource_id = b.id
-        where 1=1
+    <select id="getResourcelist" parameterType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureVersion" resultType="com.github.zuihou.business.productionReadyCenter.entity.BomProcedureProductionresource">SELECT
+        a.*, b. CODE,
+        b. NAME,
+        b.cncProgram,
+        rb. NAME resourceBusinessName
+        FROM
+        imcs_b_bom_procedure_productionresource a
+        LEFT JOIN imcs_resource_business rb ON a.resource_business_id = rb.id
+        LEFT JOIN (
+        SELECT
+        pr.id,
+        pr. CODE,
+        pr. NAME,
+        ifnull(pc.cnc_program, 0) AS cncProgram
+        FROM
+        imcs_tenant_productionresource pr
+        LEFT JOIN imcs_p_productionresource_conf pc ON pr.id = pc.resource_id
+        ) b ON a.resource_id = b.id
+        WHERE
+        1 = 1
         <if test="id != null and id != '' ">
           and a.procedure_id = #{id}
         </if>

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

@@ -105,6 +105,10 @@ public class BomProcedureProductionresource extends Entity<Long> {
     @Excel(name = "资源业务ID")
     private Long resourceBusinessId;
 
+    @ApiModelProperty(value = "资源业务")
+    @TableField(exist = false)
+    private String resourceBusinessName;
+
     public String getResourceIdStr() {
         if(StringUtil.isEmpty(resourceIdStr)){
             return String.valueOf(getResourceId());