产品bm添加工序

hx-item/src/main/java/com/fjhx/item/controller/product/ProductBomInfoController.java

@@ -2,6 +2,7 @@ package com.fjhx.item.controller.product;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.fjhx.common.utils.Assert;
+import com.fjhx.item.entity.product.ProcessesBo;
 import com.fjhx.item.entity.product.dto.ProductBomInfoDto;
 import com.fjhx.item.entity.product.po.ProductBomDetail;
 import com.fjhx.item.entity.product.po.ProductInfo;
@@ -70,6 +71,11 @@ public class ProductBomInfoController {
         productBomInfoVo.setRawMaterialName(productInfo.getName());
         productBomInfoVo.setProductBomDetailList(productBomDetailVos);
 
+        //赋值工序列表
+        Long technologyId = productInfo.getTechnologyId();
+        List<ProcessesBo> processesList = productInfoService.getProcessesByTechnologyId(technologyId);
+        productBomInfoVo.setProcessesList(processesList);
+
         return productBomInfoVo;
     }
 

hx-item/src/main/java/com/fjhx/item/entity/product/ProcessesBo.java

@@ -0,0 +1,11 @@
+package com.fjhx.item.entity.product;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class ProcessesBo {
+    private String name;
+    private String code;
+}

hx-item/src/main/java/com/fjhx/item/entity/product/vo/ProductBomInfoVo.java

@@ -1,5 +1,6 @@
 package com.fjhx.item.entity.product.vo;
 
+import com.fjhx.item.entity.product.ProcessesBo;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
@@ -38,4 +39,9 @@ public class ProductBomInfoVo extends BasePo {
      */
     private List<ProductBomDetailVo> productBomDetailList;
 
+    /**
+     * 工序列表
+     */
+    private List<ProcessesBo> processesList;
+
 }

hx-item/src/main/java/com/fjhx/item/mapper/product/ProductInfoMapper.java

@@ -3,6 +3,7 @@ package com.fjhx.item.mapper.product;
 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.item.entity.product.ProcessesBo;
 import com.fjhx.item.entity.product.bo.ProductAnalysisBo;
 import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.entity.product.vo.ProductInfoVo;
@@ -77,4 +78,6 @@ public interface ProductInfoMapper extends BaseMapper<ProductInfo> {
     Page<ProductAnalysisBo> getProductAnalysisPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ProductInfo> wrapper);
 
     List<ProductInfoVo> getProductByMaterialId(@Param("ew") IWrapper<Object> wrapper);
+
+    List<ProcessesBo> getProcessesByTechnologyId(Long technologyId);
 }

hx-item/src/main/java/com/fjhx/item/service/product/ProductInfoService.java

@@ -2,6 +2,7 @@ package com.fjhx.item.service.product;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.common.entity.AvailableStockBo;
+import com.fjhx.item.entity.product.ProcessesBo;
 import com.fjhx.item.entity.product.bo.ProductAnalysisBo;
 import com.fjhx.item.entity.product.dto.ProductInfoDto;
 import com.fjhx.item.entity.product.dto.ProductInfoSelectDto;
@@ -120,4 +121,6 @@ public interface ProductInfoService extends BaseService<ProductInfo> {
     void excelExport(HttpServletResponse httpServletResponse, ProductInfoSelectDto dto);
 
     List<ProductInfoVo> getProductByMaterialId(Long materialId);
+
+    List<ProcessesBo> getProcessesByTechnologyId(Long technologyId);
 }

hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.fjhx.common.service.file.FtpFileService;
 import com.fjhx.common.service.file.impl.FtpFileServiceImpl;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.item.entity.product.ProcessesBo;
 import com.fjhx.item.entity.product.bo.ProductAnalysisBo;
 import com.fjhx.item.entity.product.bo.ProductExcelExportBo;
 import com.fjhx.item.entity.product.dto.ProductInfoDto;
@@ -991,4 +992,9 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         return baseMapper.getProductByMaterialId(wrapper);
     }
 
+    @Override
+    public List<ProcessesBo> getProcessesByTechnologyId(Long technologyId) {
+        return baseMapper.getProcessesByTechnologyId(technologyId);
+    }
+
 }

hx-item/src/main/resources/mapper/product/ProductInfoMapper.xml

@@ -149,4 +149,11 @@
                  JOIN product_bom_detail pbd ON pbd.product_id = pi.id
             ${ew.customSqlSegment}
     </select>
+    <select id="getProcessesByTechnologyId" resultType="com.fjhx.item.entity.product.ProcessesBo">
+        SELECT pp.*
+        FROM production_processes pp
+                 LEFT JOIN technology_process_line tpl ON tpl.target_processes_id = pp.id
+        WHERE tpl.technology_id = #{technologyId}
+        GROUP BY pp.id
+    </select>
 </mapper>

hx-purchase/src/main/java/com/fjhx/purchase/entity/subscribe/vo/SubscribeDetailVo.java

@@ -132,5 +132,10 @@ public class SubscribeDetailVo extends SubscribeDetail {
      */
     private BigDecimal prodNeedCount;
 
+    /**
+     * 生产备注
+     */
+    private String prodRemark;
+
 
 }