From e8f986214be755cb0e0ada00f469a37622164ba1 Mon Sep 17 00:00:00 2001
From: "[li_she]" <[li.she@xujiesoft.com]>
Date: Sun, 19 Feb 2023 17:47:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=8D=B7=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=AD=89=E4=BA=8E400=E4=B9=9F=E6=98=AF?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=B8=8D=E9=80=9A=E8=BF=87=202023=E5=B9=B42?=
 =?UTF-8?q?=E6=9C=8819=E6=97=A5=20sxm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shopOrder/shopOrder/shopOrder.vue | 2 +-
 src/views/modules/yieldReport/com_finish_roll.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 813dbb4..25b8faa 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -1866,7 +1866,7 @@ export default {
       buttons: {
         orderPrimaryMenu: '主菜单',
         orderToScheduling: '查看派工单信息',
-        changeRouting: '变更工艺路线',
+        changeRouting: '更改工艺路线版本',
         orderListButton: '列表',
         editButton: '编辑',
         deleteButton: '删除',
diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 0bf7712..1d868a0 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -1220,7 +1220,7 @@ export default {
       //先调用检查方法
       checkFinishRollWithNoFqc(postData).then(({data}) => {
         //判断是否成功
-        if(data.code == 500){
+        if(data.code == 500 || data.code == 400){
           this.$message.error(data.msg);
         }else if (data.resultMap.resultCode == '201'){
           //打开异常原因录入的界面