添加产品规格型号

hx-mes/src/main/java/com/fjhx/mes/entity/bom/vo/BomDetailVo.java

@@ -33,4 +33,9 @@ public class BomDetailVo extends BomDetail {
      * 售后明细
      */
     private Object afterSalesRecordDetail;
+
+    /**
+     * 产品名称
+     */
+    private String productSpec;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/bom/vo/BomInfoVo.java

@@ -41,4 +41,9 @@ public class BomInfoVo extends BomInfo {
      */
     private List<BomDetailVo> bomDetailVoList;
 
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionPlanVo.java

@@ -37,4 +37,6 @@ public class ProductionPlanVo extends ProductionPlan {
      */
     private String workOrderCode;
 
+    /**产品规格*/
+    private String productSpec;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskDetailVo.java

@@ -67,6 +67,11 @@ public class ProductionTaskDetailVo extends ProductionTaskDetail {
      */
     private List<ProductionTaskDetailRecordVo> productionTaskDetailRecordList;
 
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
     //-------------------生产进度--------------------------
     /**
      * 销售合同号

hx-mes/src/main/java/com/fjhx/mes/entity/production/vo/ProductionTaskVo.java

@@ -45,4 +45,9 @@ public class ProductionTaskVo extends ProductionTask {
      * 生产任务明细列表
      */
     private List<ProductionTaskDetailVo> productionTaskDetailList;
+
+    /**
+     * 产品规格
+     */
+    private String productSpec;
 }

hx-mes/src/main/java/com/fjhx/mes/entity/work/vo/WorkOrderVo.java

@@ -69,4 +69,9 @@ public class WorkOrderVo extends WorkOrder {
      */
     private BigDecimal availableStockQuantity;
 
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
 }

hx-mes/src/main/java/com/fjhx/mes/service/bom/impl/BomInfoServiceImpl.java

@@ -95,12 +95,14 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
                 item.setProductType(productInfo.getType());
                 item.setProductCode(productInfo.getCode());
                 item.setProductName(productInfo.getName());
+                item.setProductSpec(productInfo.getSpec());
             }
         } else {
             productInfoService.attributeAssign(records, BomInfo::getProductId, (item, productInfo) -> {
                 item.setProductType(productInfo.getType());
                 item.setProductCode(productInfo.getCode());
                 item.setProductName(productInfo.getName());
+                item.setProductSpec(productInfo.getSpec());
             });
         }
 
@@ -119,6 +121,7 @@ public class BomInfoServiceImpl extends ServiceImpl<BomInfoMapper, BomInfo> impl
             item.setProductCode(productInfo.getCode());
             item.setProductName(productInfo.getName());
             item.setProductUnit(productInfo.getUnit());
+            item.setProductSpec(productInfo.getSpec());
         });
 
         result.setBomDetailVoList(bomDetailVoList);

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionPlanServiceImpl.java

@@ -99,6 +99,7 @@ public class ProductionPlanServiceImpl extends ServiceImpl<ProductionPlanMapper,
         ProductInfo productInfo = productInfoService.getById(workOrder.getProductId());
         if(ObjectUtil.isNotEmpty(productInfo)) {
             result.setProductName(productInfo.getName());
+            result.setProductSpec(productInfo.getSpec());
         }
         //赋值生产任务列表
         List<ProductionTask> list = productionTaskService.list(q -> q.eq(ProductionTask::getProductionPlanId, id));

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskDetailServiceImpl.java

@@ -124,6 +124,7 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
         //赋值产品名
         productInfoService.attributeAssign(records, ProductionTaskDetailVo::getProductId, (item, productInfo) -> {
             item.setProductName(productInfo.getName());
+            item.setProductSpec(productInfo.getSpec());
         });
         //赋值当前工序名 目标工序名
         List<Long> productionTaskIds = records.stream().map(ProductionTaskDetail::getProductionTaskId).collect(Collectors.toList());
@@ -551,6 +552,12 @@ public class ProductionTaskDetailServiceImpl extends ServiceImpl<ProductionTaskD
                     q -> q.in(ProductionProcesses::getId, processesIds));
         }
 
+        //赋值产品名称
+        ProductInfo productInfo = productInfoService.getById(productionTaskDetailVo.getProductId());
+        if(ObjectUtil.isNotEmpty(productInfo)) {
+            productionTaskDetailVo.setProductName(productInfo.getName());
+            productionTaskDetailVo.setProductSpec(productInfo.getSpec());
+        }
 
         productionTaskDetailVo.setProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getProductionProcessesId()));
         productionTaskDetailVo.setNextProductionProcessesName(productionProcessesMap.get(productionTaskDetailVo.getNextProductionProcessesId()));

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionTaskServiceImpl.java

@@ -110,22 +110,6 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         }
         Page<ProductionTaskVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionTaskVo> records = page.getRecords();
-//        //赋值产品名称
-//        List<Long> productIds = records.stream().map(ProductionTaskVo::getProductId).collect(Collectors.toList());
-//        if (ObjectUtil.isNotEmpty(productIds)) {
-//            List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
-//            Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
-//                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-//            for (ProductionTaskVo productionTaskVo : records) {
-//                Long productId = productionTaskVo.getProductId();
-//                if (ObjectUtil.isNotEmpty(productId)) {
-//                    ProductInfo productInfo = productInfoMap.get(productId);
-//                    if (ObjectUtil.isNotEmpty(productInfo)) {
-//                        productionTaskVo.setProductName(productInfo.getName());
-//                    }
-//                }
-//            }
-//        }
 
         //赋值负责人名字
         UserUtil.assignmentNickName(records, ProductionTask::getPersonLiableId, ProductionTaskVo::setPersonLiableName);
@@ -138,6 +122,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
         ProductInfo productInfo = productInfoService.getById(productionTaskVo.getProductId());
         if (ObjectUtil.isNotEmpty(productInfo)) {
             productionTaskVo.setProductName(productInfo.getName());
+            productionTaskVo.setProductSpec(productInfo.getSpec());
         }
         Map<Long, String> nickNameMapByIds = UserUtil.getNickNameMapByIds(Arrays.asList(productionTaskVo.getPersonLiableId()));
         if (ObjectUtil.isNotEmpty(nickNameMapByIds)) {

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

@@ -73,7 +73,7 @@ public class TechnologyServiceImpl extends ServiceImpl<TechnologyMapper, Technol
                     for (ApplicableProducts applicableProducts : applicableProductsList1) {
                         ProductInfo productInfo = productInfoMap.get(applicableProducts.getProductId());
                         if (ObjectUtil.isNotEmpty(productInfo)) {
-                            productNameList.add(productInfo.getName());
+                            productNameList.add(productInfo.getName()+"("+productInfo.getSpec()+")");
                         } else {
                             productNameList.add("未知商品:" + applicableProducts.getProductId());
                         }

hx-mes/src/main/java/com/fjhx/mes/service/work/impl/WorkOrderServiceImpl.java

@@ -142,6 +142,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
             //赋值产品名称
             productInfoService.attributeAssign(records, WorkOrderVo::getProductId, (item, productInfo) -> {
                 item.setProductName(productInfo.getName());
+                item.setProductSpec(productInfo.getSpec());
             });
         }
         return page;
@@ -156,6 +157,7 @@ public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder
         ProductInfo productInfo = productInfoService.getById(result.getProductId());
         if (ObjectUtil.isNotEmpty(productInfo)) {
             result.setProductName(productInfo.getName());
+            result.setProductSpec(productInfo.getSpec());
         }
         //赋值产品可用库存
         BigDecimal availableStockQuantity = stockService.getAvailableStockQuantity(workOrder.getProductId());

hx-mes/src/main/resources/mapper/production/ProductionPlanMapper.xml

@@ -20,7 +20,8 @@
                     pp.update_time,
                     pp.quantity - ifnull( sum( pt.quantity ), 0 ) AS remainingQuantity,
                     wo.`code` AS workOrderCode,
-                    pi.`name` AS productName
+                    pi.`name` AS productName,
+                    pi.`spec` AS productSpec
                 FROM
                     production_plan pp
                         LEFT JOIN production_task pt ON pt.production_plan_id = pp.id

hx-mes/src/main/resources/mapper/production/ProductionTaskDetailMapper.xml

@@ -68,6 +68,7 @@
                     pt.`code` AS productionTaskCode,
                     pi.`code` AS productCode,
                     pi.`name` AS productName,
+                    pi.`spec` AS productSpec,
                     ptd.product_sn,
                     pt.due_date,
                     IF(

hx-mes/src/main/resources/mapper/production/ProductionTaskMapper.xml

@@ -16,7 +16,8 @@
             pt.update_time,
             wo.product_id,
             pi.`name` AS productName,
-            pp.`code` AS productionPlanCode
+            pp.`code` AS productionPlanCode,
+            pi.`spec` AS productSpec
         FROM
             production_task pt
                 LEFT JOIN production_plan pp ON pt.production_plan_id = pp.id

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -130,6 +130,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
             s.setProductUnit(productInfo.getUnit());
             s.setProductDefinition(productInfo.getDefinition());
             s.setProductCustomCode(productInfo.getCustomCode());
+            s.setProductSpec(productInfo.getSpec());
+
 
             String victoriatouristJson = productInfo.getVictoriatouristJson();
             JSONObject json = ObjectUtil.isNotEmpty(victoriatouristJson) ? JSONObject.parseObject(victoriatouristJson) : new JSONObject();