From f95cfde5a956e051852bba6e8d38430985cba7de Mon Sep 17 00:00:00 2001
From: "dequan.zhang" <13820060@qq.com>
Date: Thu, 20 Apr 2023 10:33:23 +0800
Subject: [PATCH] =?UTF-8?q?BC316=E5=B8=BD=E6=AA=90=E8=B6=85=E5=A3=B0?=
=?UTF-8?q?=E6=B3=A2=E4=B8=80=E5=A2=9E=E5=8A=A0=E5=8D=95=E4=B8=80=E5=B7=A5?=
=?UTF-8?q?=E4=BD=8Dfis=E8=AE=A1=E5=88=92=E7=94=9F=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs | 10 +++++-----
.../QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs | 8 ++++----
APPQ5/QMAPP.WinForm/App.config | 6 +++---
.../WCF/QMFrameWork.WebServiceHost/Web.config | 6 +++---
4 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
index fc366f8..3a2f358 100644
--- a/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/DataValidators/PlanValidator.cs
@@ -38,11 +38,11 @@ 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 (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
+ {
+ //20230309 DQzhang 获取当前工位第一条派工单
+ workorder = workorderdal.GetFirstOrderInLoc(data.WorkLocState.WORKCELL_CODE, data.MouldCode);
+ }
//-----------------------------------------------------------------------------------------------
diff --git a/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs b/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
index 94f7287..eed5f8a 100644
--- a/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
+++ b/APPQ5/QMAPP.FJC.TRACING/StateActions/SubmitWithOrder.cs
@@ -115,10 +115,10 @@ namespace QMAPP.FJC.TRACING.StateActions
product.PLAN_NO = workorder.ORDERPLAN_NO;
//--------------------BC316帽檐超声波焊接工位----------------------------------------------------
- //if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
- //{
- // workorder.IsDelete = true;
- //}
+ if (data.WorkLocState.WORKCELL_CODE == "BRIM_WELDING_BC316")
+ {
+ workorder.IsDelete = true;
+ }
//-----------------------------------------------------------------------------------------------
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 98f4854..98e4904 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -6,10 +6,10 @@
- -->
+
-
+
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index 2e96a89..db7e3ac 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -64,9 +64,9 @@
-
@@ -78,7 +78,7 @@
-
+