Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CLIENT

zkqy-custom-business/src/main/java/com/zkqy/business/domain/DetailsOfTheRefuelingPlanSpinning.java

@@ -32,6 +32,17 @@ public class DetailsOfTheRefuelingPlanSpinning extends BaseEntity
     @Excel(name = "机台号")
     private String machineId;
 
+    @Excel(name = "机台名称")
+    private String machineName;
+
+    public String getMachineName() {
+        return machineName;
+    }
+
+    public void setMachineName(String machineName) {
+        this.machineName = machineName;
+    }
+
     /** 生产位数 */
     @Excel(name = "生产位数")
     private String productionDigit;

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/DetailsOfTheRefuelingPlanSpinningServiceImpl.java

@@ -81,6 +81,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
             DetailsOfTheRefuelingPlanSpinning spinning = new DetailsOfTheRefuelingPlanSpinning();
 //            spinning.setMachineId(item.getProductionLineNo());
             spinning.setMacId(item.getId().toString());
+            spinning.setMachineName(item.getProductionLineName());
             //直接根据产线号拿计划，
             List<DetailsOfTheRefuelingPlanSpinning> detailsOfTheRefuelingPlanSpinnings = detailsOfTheRefuelingPlanSpinningMapper.selectDetailsOfTheRefuelingPlanSpinningList(spinning);
             List<DetailsOfTheRefuelingPlanSpinning>  tj= detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("2")).collect(Collectors.toList());
@@ -92,6 +93,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                 rs2.setMacId(item.getId().toString());//产线id
                 //把第一个元素给拷贝过去
                 BeanUtils.copyProperties(tj1, rs2);
+                rs2.setMachineName(item.getProductionLineName());
                 rs2.setCurrentLotNumber("");
                 rs2.setCurrentSpecification("停机");
                 rs2.setStartTime("");
@@ -109,8 +111,10 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                         DetailsOfTheRefuelingPlanSpinningRVo rs1 = new DetailsOfTheRefuelingPlanSpinningRVo();
                         rs1.setMachineId(item.getProductionLineNo());//产线号
                         rs1.setMacId(item.getId().toString());
+
                         //把第一个元素给拷贝过去
                         BeanUtils.copyProperties(spinning1, rs1);
+                        rs1.setMachineName(item.getProductionLineName());
                         List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                         rs1.setPlannedProduction(collect);
                         list.add(rs1);
@@ -120,6 +124,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                         DetailsOfTheRefuelingPlanSpinningRVo rs1 = new DetailsOfTheRefuelingPlanSpinningRVo();
                         rs1.setMachineId(item.getProductionLineNo());//产线号
                         rs1.setMacId(item.getId().toString());//产线iD
+                        rs1.setMachineName(item.getProductionLineName());
                         List<String> collect = detailsOfTheRefuelingPlanSpinnings.stream().filter(plan -> plan.getPlanStatus().equals("0")).map(plan -> plan.getCurrentColorCode() + "-(" + plan.getCurrentLotNumber() + ")").collect(Collectors.toList());
                         rs1.setPlannedProduction(collect);
                         list.add(rs1);
@@ -129,6 +134,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
                     DetailsOfTheRefuelingPlanSpinningRVo rs1 = new DetailsOfTheRefuelingPlanSpinningRVo();
                     rs1.setMachineId(item.getProductionLineNo());//产线号
                     rs1.setMacId(item.getId().toString());
+                    rs1.setMachineName(item.getProductionLineName());
                     list.add(rs1);
                 }
             }
@@ -208,7 +214,7 @@ public class DetailsOfTheRefuelingPlanSpinningServiceImpl implements IDetailsOfT
             detailsOfTheRefuelingPlanSpinning.setPlanStatus("3");
         }
         saleProducts.setSaleOrderNo(detailsOfTheRefuelingPlanSpinning.getSalesmanId());//合同号
-        saleProducts.setId(Long.valueOf(detailsOfTheRefuelingPlanSpinning.getProductId()));//产品id
+        saleProducts.setId(Long.valueOf(detailsOfTheRefuelingPlanSpinning.getProductId()));
         saleProducts.setOnBoardState(detailsOfTheRefuelingPlanSpinning.getPlanStatus());//更新上机状态
         saleProducts.setProductNumber(Double.valueOf(detailsOfTheRefuelingPlanSpinning.getNumber()));//数量
         //插入日志信息

zkqy-ui/src/views/orderMange/planTable/fangsi.vue

@@ -4,7 +4,8 @@
         <el-table
           :data="tableData"
           ref="tableRef">
-          <el-table-column prop="machineId" fixed label="线号" header-align="center" align="center" width="111px" ></el-table-column>
+<!--          <el-table-column prop="machineId" fixed label="线号" header-align="center" align="center" width="111px" type="hide" ></el-table-column>-->
+          <el-table-column prop="machineName" fixed label="线号" header-align="center" align="center" width="111px" ></el-table-column>
           <el-table-column prop="productionDigit" fixed label="生产位数" header-align="center" align="center" width="111.2px"></el-table-column>
           <el-table-column label="在机产品" header-align="center" >
             <el-table-column prop="productTypeName" fixed label="产品类型" header-align="center" align="center" width="111.2px"></el-table-column>