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 @@ - +