From b26eb148d0773f4d2a2c39117580d9427abe91c7 Mon Sep 17 00:00:00 2001
From: "dequan.zhang" <13820060@qq.com>
Date: Tue, 4 Apr 2023 10:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=BD=E6=AA=90=E5=B7=A5=E4=BD=8D=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=EF=BC=88=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataValidators/PlanValidator.cs                | 14 +++++++++++++-
 .../StateActions/SubmitWithOrder.cs                | 10 +++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
index b271c13..fc366f8 100644
--- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
@@ -23,7 +23,8 @@ namespace QMAPP.FJC.TRACING.DataValidators
             //获取当前工位正在执行的派工单
             var workorder= workorderdal.GetWorkingOrderInLoc(data.WorkLocState.WORKLOC_CODE,data.MouldCode);
 
-            //-----------------------------------------------------------------------------------------------
+
+            //--------------------BC316总成装配工位----------------------------------------------------------
             if (data.WorkLocState.WORKCELL_CODE == "ASSEMBLE_BC316")
             {
                 //20210120 DQzhang 获取当前工位第一条派工单
@@ -35,6 +36,17 @@ namespace QMAPP.FJC.TRACING.DataValidators
             }
             //-----------------------------------------------------------------------------------------------
 
+
+            //--------------------BC316帽檐超声波焊接工位----------------------------------------------------
+            //if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
+            //{
+            //    //20230309 DQzhang 获取当前工位第一条派工单
+            //    workorder = workorderdal.GetFirstOrderInLoc(data.WorkLocState.WORKCELL_CODE, data.MouldCode);
+            //}
+            //-----------------------------------------------------------------------------------------------
+
+
+
             if (workorder == null) //不存在正在执行的派工单
             {
                 //获取当前工序优先级最高的工单
diff --git a/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs b/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
index abf12e1..94f7287 100644
--- a/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
@@ -113,7 +113,15 @@ namespace QMAPP.FJC.TRACING.StateActions
             //关联计划ID
             product.PLAN_ID = workorder.ORDERPLANID;
             product.PLAN_NO = workorder.ORDERPLAN_NO;
-            
+
+            //--------------------BC316帽檐超声波焊接工位----------------------------------------------------
+            //if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
+            //{
+            //    workorder.IsDelete = true;
+            //}
+            //-----------------------------------------------------------------------------------------------
+
+
             if (!workcellend)
             {
                 workorder.WORKLOC_CODE = data.WorkLocState.WORKLOC_CODE;