针筒管理系统

hx-service-api/syringe-management-api/src/main/java/com/fjhx/params/production/ProductWorkingProcedure.java

@@ -0,0 +1,28 @@
+package com.fjhx.params.production;
+
+import lombok.Data;
+
+@Data
+public class ProductWorkingProcedure {
+
+    /**
+     * 工序id
+     */
+    private Long id;
+
+    /**
+     * 工序名称
+     */
+    private String name;
+
+    /**
+     * 是否包装
+     */
+    private Integer whetherPacking;
+
+    /**
+     * 关联id
+     */
+    private Long linkId;
+
+}

hx-service-api/syringe-management-api/src/main/java/com/fjhx/params/production/ProductWorkingRoute.java

@@ -1,6 +1,5 @@
 package com.fjhx.params.production;
 
-import com.fjhx.entity.working.WorkingProcedure;
 import lombok.Data;
 
 import java.util.List;
@@ -21,6 +20,6 @@ public class ProductWorkingRoute {
     /**
      * 工序列表
      */
-    private List<WorkingProcedure> procedureList;
+    private List<ProductWorkingProcedure> productWorkingProcedureList;
 
 }

hx-service/syringe-management/src/main/java/com/fjhx/controller/bom/BomController.java

@@ -62,4 +62,13 @@ public class BomController {
         return R.success(result);
     }
 
+    // /**
+    //  * 获取bom中工序关联物料
+    //  */
+    // @PostMapping("/getBomRelationProductClassify")
+    // public R getBomRelationProductClassify() {
+    //     List<Map<String, Object>> result = bomService.getBomRelationProductClassify();
+    //     return R.success(result);
+    // }
+
 }

hx-service/syringe-management/src/main/java/com/fjhx/mapper/bom/BomMapper.xml

@@ -5,7 +5,6 @@
     <select id="getPage" resultType="com.fjhx.params.bom.BomEx">
         select b.id,
                b.edition,
-               b.introduce,
                b.update_user,
                b.update_time,
                p.id   productId,
@@ -19,7 +18,8 @@
     </select>
 
     <select id="getBomRelationProductClassify" resultType="java.util.Map">
-        select distinct c.id classifyId, c.name classifyName
+        select distinct c.id   classifyId,
+                        c.name classifyName
         from bom b
                  inner join product p on b.product_id = p.id
                  inner join classify c on p.classify_id = c.id

hx-service/syringe-management/src/main/java/com/fjhx/mapper/product/ProductExMapper.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.product.ProductEx;
-import com.fjhx.entity.working.WorkingProcedure;
+import com.fjhx.params.production.ProductWorkingProcedure;
 import com.fjhx.params.production.ProductWorkingRoute;
 import org.apache.ibatis.annotations.Param;
 
@@ -27,6 +27,6 @@ public interface ProductExMapper extends BaseMapper<ProductEx> {
 
     ProductWorkingRoute getProductWorkingRoute(@Param("productId") Long productId);
 
-    List<WorkingProcedure> getProcedureList(@Param("workingRouteId") Long workingRouteId);
+    List<ProductWorkingProcedure> getProcedureList(@Param("workingRouteId") Long workingRouteId);
 
 }

hx-service/syringe-management/src/main/java/com/fjhx/mapper/product/ProductExMapper.xml

@@ -37,8 +37,15 @@
         where pe.id = #{productId}
     </select>
 
-    <select id="getProcedureList" resultType="com.fjhx.entity.working.WorkingProcedure">
-
+    <select id="getProcedureList" resultType="com.fjhx.params.production.ProductWorkingProcedure">
+        select wp.id,
+               wp.name,
+               wp.whether_packing,
+               wrp.id linkId
+        from working_route_procedure wrp
+                 left join working_procedure wp on wrp.working_procedure_id = wp.id
+        where wrp.working_route_id = #{workingRouteId}
+        order by wrp.sort
     </select>
 
 </mapper>

hx-service/syringe-management/src/main/java/com/fjhx/service/product/impl/ProductExServiceImpl.java

@@ -8,8 +8,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.Product;
 import com.fjhx.entity.product.ProductEx;
-import com.fjhx.entity.working.WorkingProcedure;
 import com.fjhx.mapper.product.ProductExMapper;
+import com.fjhx.params.production.ProductWorkingProcedure;
 import com.fjhx.params.production.ProductWorkingRoute;
 import com.fjhx.service.ClassifyService;
 import com.fjhx.service.ProductService;
@@ -96,11 +96,9 @@ public class ProductExServiceImpl extends ServiceImpl<ProductExMapper, ProductEx
     @Override
     public ProductWorkingRoute getWorkingRoute(Long ProductId) {
         ProductWorkingRoute productWorkingRoute = baseMapper.getProductWorkingRoute(ProductId);
-
-        List<WorkingProcedure> procedureList = baseMapper.getProcedureList(productWorkingRoute.getWorkingRouteId());
-
-
-        return null;
+        List<ProductWorkingProcedure> procedureList = baseMapper.getProcedureList(productWorkingRoute.getWorkingRouteId());
+        productWorkingRoute.setProductWorkingProcedureList(procedureList);
+        return productWorkingRoute;
     }
 
 }