From 2cad02ff7b2047f8e90b2d29d61f24fb00645e44 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 29 May 2024 09:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E4=BD=93=E7=AE=A1=E7=90=86=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/op/mes/domain/MesLine.java       | 10 ++++++++++
 .../com/op/mes/service/impl/MesLineServiceImpl.java    |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java
index 498fc898..488dcb72 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/MesLine.java
@@ -83,6 +83,8 @@ public class MesLine extends BaseEntity {
 
     private List<String> processList;
 
+    private List<BigDecimal> qualityList;
+
     public void setId(String id) {
         this.id = id;
     }
@@ -179,6 +181,14 @@ public class MesLine extends BaseEntity {
         this.processList = processList;
     }
 
+    public List<BigDecimal> getQualityList() {
+        return qualityList;
+    }
+
+    public void setQualityList(List<BigDecimal> qualityList) {
+        this.qualityList = qualityList;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java
index 862e8220..7cf125e8 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/MesLineServiceImpl.java
@@ -1,5 +1,6 @@
 package com.op.mes.service.impl;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -48,10 +49,12 @@ public class MesLineServiceImpl implements IMesLineService {
         //查询时回显线体工艺数据
         List<MesLineProcess> mesList = mesLineProcessService.selectMesLineProcessByBelongTo(id);
         List<String> processList = mesList.stream().map(MesLineProcess::getProcessName).collect(Collectors.toList());
+        List<BigDecimal> qualityList = mesList.stream().map(MesLineProcess::getQuality).collect(Collectors.toList());
         MesLine mesLine = mesLineMapper.selectMesLineById(id);
         //设置线体数据
         if (!CollectionUtils.isEmpty(processList)) {
             mesLine.setProcessList(processList);
+            mesLine.setQualityList(qualityList);
         }
         return mesLine;
     }
@@ -101,6 +104,7 @@ public class MesLineServiceImpl implements IMesLineService {
         mesLine.setUpdateTime(DateUtils.getNowDate());
         mesLine.setUpdateBy(SecurityUtils.getUsername());
         List<String> processList = mesLine.getProcessList();
+        List<BigDecimal> qualityList = mesLine.getQualityList();
         int flag = 0;
         if (!CollectionUtils.isEmpty(processList)) {
             //删除旧的工艺项
@@ -114,10 +118,11 @@ public class MesLineServiceImpl implements IMesLineService {
             String key = "#header.poolName";
             String factoryCode = request.getHeader(key.substring(8)).replace("ds_", "");
 
-            for (String processName : processList ) {
+            for (int i = 0; i < processList.size(); i++) {
                 MesLineProcess mesLineProcess = new MesLineProcess();
                 mesLineProcess.setBelongTo(belongTo);
-                mesLineProcess.setProcessName(processName);
+                mesLineProcess.setProcessName(processList.get(i));
+                mesLineProcess.setQuality(qualityList.get(i));
                 mesLineProcess.setLineCode(lineCode);
                 mesLineProcess.setLineName(lineName);
                 mesLineProcess.setFactoryCode(factoryCode);