From b593ae1c0ea573071bc92bcee9944e0d289c8f60 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 12 Sep 2023 10:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/plan/service/impl/ProOrderServiceImpl.java | 15 ++++++++-------
 .../mapper/plan/ProOrderWorkorderMapper.xml       |  1 +
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
index e6460f26..c653477f 100644
--- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java
@@ -228,7 +228,7 @@ public class ProOrderServiceImpl implements IProOrderService {
     @Override
     @DS("#header.poolName")
     public AjaxResult getWorkOrderList(String id) {
-        // 通过订单id查询所有工单信息list
+        // 通过订单id查询所有母工单信息list
         List<ProOrderWorkorder> proOrderWorkorderList = proOrderWorkorderMapper.selectFirWorkOrder(id);
 
         for (ProOrderWorkorder proOrderWorkorder : proOrderWorkorderList) {
@@ -246,21 +246,22 @@ public class ProOrderServiceImpl implements IProOrderService {
     private void formatProOrderWorkorder(ProOrderWorkorder proOrderWorkorder) {
         // 通过班次id查询班次名称
         String shiftDesc = proOrderMapper.selectShiftNameById(proOrderWorkorder.getShiftId());
-        // 通过设备code查询出机型名称
 
-        String prodLineName = "";
-        String equipCods = "'";
+        StringBuilder prodLineName = new StringBuilder("");
+        StringBuilder equipCods = new StringBuilder("'");
         JSONArray codeArray = JSONArray.parseArray(proOrderWorkorder.getProdLineCode());
         for(int c=0;c<codeArray.size();c++){
-            equipCods += codeArray.getJSONArray(c).getString(1)+"','";
+            equipCods.append(codeArray.getJSONArray(c).getString(1));
+            equipCods.append("','");
         }
 
         Map<String,CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
         Set<String> keys = equipMap.keySet();
         for (String key : keys) {
-            prodLineName += equipMap.get(key).getLabel()+",";
+            prodLineName.append(equipMap.get(key).getLabel());
+            prodLineName.append(",");
         }
-        proOrderWorkorder.setProdLineCode(prodLineName);
+        proOrderWorkorder.setProdLineCode(prodLineName.toString());
 
         // 通过工单id查询批次号
         List<String> batchCodeList = proOrderMapper.selectBatchCodesById(proOrderWorkorder.getWorkorderId());
diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
index 645f97de..c13a63b8 100644
--- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
+++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml
@@ -84,6 +84,7 @@
         <include refid="selectProOrderWorkorderVo"/>
         where workorder_code = #{workorderId} or workorder_id = #{workorderId}
     </select>
+
     <select id="selectFirWorkOrder" parameterType="String" resultMap="ProOrderWorkorderResult">
         <include refid="selectProOrderWorkorderVo"/>
         where order_id = #{id}