From b6506a910cf5613b64fddb56502019b46c79962f Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Fri, 28 Jul 2023 16:02:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AE=A1=E5=88=92=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86(=E6=AF=8D=E5=B7=A5=E5=8D=95=E4=B8=BA=E6=9C=AA?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=B2=E8=A7=A3=E5=86=B3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mes/service/impl/ProOrderServiceImpl.java | 26 +++----------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
index 1727e2bb5..27c19ae1f 100644
--- a/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
+++ b/op-modules/op-mes/src/main/java/com/op/mes/service/impl/ProOrderServiceImpl.java
@@ -89,6 +89,8 @@ public class ProOrderServiceImpl implements IProOrderService {
             // code
             int endCode = getEndCode(product.getId());
             firWorkOrder.setWorkorderCode(product.getOrderCode()+"-"+endCode);
+            // 更新到数据库
+            proOrderWorkorderMapper.insertProOrderWorkorder(firWorkOrder);
 
             // 创建通用批次表对象
             ProOrderWorkorderBatch workBatch = setCommonBatchAttribute();
@@ -152,7 +154,7 @@ public class ProOrderServiceImpl implements IProOrderService {
             if (checkEnd == 0) {
                 firWorkOrder.setIsEnd(1);
                 // 更新到数据库
-                proOrderWorkorderMapper.insertProOrderWorkorder(firWorkOrder);
+                proOrderWorkorderMapper.updateProOrderWorkorder(firWorkOrder);
             }
 
             return success();
@@ -277,11 +279,7 @@ public class ProOrderServiceImpl implements IProOrderService {
     @Override
     @DS("#header.poolName")
     public List<ProOrder> selectProOrderList(ProOrder proOrder) {
-        List<ProOrder> proOrderList = proOrderMapper.selectProOrderList(proOrder);
-        for (int i = 0; i < proOrderList.size(); i++) {
-            proOrderList.get(i).setStatus(changeStatus(proOrderList.get(i).getStatus()));
-        }
-        return proOrderList;
+        return proOrderMapper.selectProOrderList(proOrder);
     }
 
     /**
@@ -462,22 +460,6 @@ public class ProOrderServiceImpl implements IProOrderService {
         }
     }
 
-    /**
-     * 转换拆分订单状态
-     *
-     * @param status
-     * @return
-     */
-    private String changeStatus(String status) {
-        if (status.equals("o0")){
-            return "未拆分";
-        }
-        if (status.equals("o1")){
-            return "已拆分";
-        }
-        return status;
-    }
-
     /**
      * 获取工单尾号code
      * @param id