产品bom修改

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

@@ -36,8 +36,22 @@ public class ProductBomDetail extends BasePo {
     private BigDecimal quantity;
 
     /**
-     * 1原材料 2包材辅材
+     * 1原材料 2包材辅材 3工序
      */
     private Integer type;
 
+    /**
+     * 标准用量
+     */
+    private Integer standardDosage;
+    /**
+     * 损耗率
+     */
+    private Integer lossRate;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/technology/impl/TechnologyServiceImpl.java

@@ -102,15 +102,19 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
             for (TechnologyVo technologyVo : records) {
                 if (ObjectUtil.isNotEmpty(technologyVo.getProcessRoute())) {
                     List<String> arr = new ArrayList<>();
+                    List<ProductionProcesses> arr1 = new ArrayList<>();
+
                     List<String> processRouteIds = Arrays.asList(technologyVo.getProcessRoute().split(","));
                     for (String processRouteId : processRouteIds) {
                         ProductionProcesses productionProcesses = productionProcessesMap.get(Long.parseLong(processRouteId));
                         if (ObjectUtil.isNotEmpty(productionProcesses)) {
                             arr.add(productionProcesses.getName());
+                            arr1.add(productionProcesses);
                         } else {
                             arr.add("未知工序：" + processRouteId);
                         }
                     }
+                    technologyVo.setProcessRouteList(arr1);
                     technologyVo.setProcessRouteNameList(arr);
                 }
             }