From d4f42dd05f42fd8d52ccc77b57ddb1eed6cd66d5 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Tue, 16 Aug 2022 09:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPQ5/QMAPP.WinForm/App.config | 3 +- .../QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs | 54 ++----------------- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +- .../WCF/QMFrameWork.WebServiceHost/Web.config | 4 +- 4 files changed, 10 insertions(+), 55 deletions(-) diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 5fbcefc..cd3b02e 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -13,8 +13,9 @@ - + + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index 40b98b0..95864f2 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -190,53 +190,12 @@ namespace QMAPP.WinForm.Forms.TianJin QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); DataTable tbl = agent.InvokeServiceFunction(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetList.ToString(), pFisType, WORKCENTER_CODE); tbl.AcceptChanges(); - - //var tblf = tbl.Select("MOULD_CODE = '左前'"); - //var tblr = tbl.Select("MOULD_CODE = '左后'"); - //var tbrf = tbl.Select("MOULD_CODE = '右前'"); - //var tbrr = tbl.Select("MOULD_CODE = '右后'"); - - //if (tb.Rows.Count > 0) - //{ - // tbz = tb.Select(t=>t.); - //} - + DataTable tbz = new DataTable(); if (tbl.Rows.Count <= 0) { - //#region 重新排序 - //int defaultNum = Convert.ToInt32(QMAPP.WinForm.Common.LocalSetting.Settings["ShowDataCount", "4"]); - //if (pFisType == "01") - //{ - // for (int i = 1; i < 100; i++) - // { - // var num = Convert.ToInt32(i * defaultNum); - // if (num > tblf.Count()) - // { - // for (int a = 0; a <= defaultNum; a++) - // { - // tbz.Rows.Add(tblf[i-1+a]); - // } - // for (int a = 0; a <= defaultNum; a++) - // { - // tbz.Rows.Add(tblr[i - 1 + a]); - // } - // } - // else - // { - // var tblfcount =tblf.Count() - (i - 1) * defaultNum; - // for - // } - // } - //} - //else - //{ - - //} - //#endregion - DataTable dt = (DataTable)dgvMATChange.DataSource; if (dt != null) { @@ -1150,7 +1109,7 @@ namespace QMAPP.WinForm.Forms.TianJin strcarsetdesc_cn = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_NAME"].Value.ToString(); //车型 strlineno = dgvMATChange.Rows[temprowindex].Cells["LINENO"].Value.ToString(); - + strvin = Code; //扫描状态 strscanstat = dgvMATChange.Rows[temprowindex].Cells["STATE"].Value.ToString(); dgvrowindex = temprowindex; @@ -1230,7 +1189,7 @@ namespace QMAPP.WinForm.Forms.TianJin var mach = inputstring.Substring(4, inputstring.Length - 4); var plan = new TJOrderPlan(); - plan.PLAN_DATE = DateTime.Now; + plan.PLAN_DATE = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")); plan.QTY = defaultNum/2; if (mach.Substring(0, 3) == "770") plan.LINENO = "770B"; @@ -1250,12 +1209,7 @@ namespace QMAPP.WinForm.Forms.TianJin } } - - //var list = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_GetListMachine", plan.MATERIAL_CODE); - //if (list != null) - // plan.MATERIAL_NAME = list[0].MATERIALNAME; - - //QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + var RESULT = agent.InvokeServiceFunction>("TJDoorPlankPlanBLL_Insert", plan); if (RESULT.IsSuccess == true) { diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index d4d6124..45c7b34 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.08.10.01")] -[assembly: AssemblyFileVersion("2022.08.10.01")] +[assembly: AssemblyVersion("2022.08.16.01")] +[assembly: AssemblyFileVersion("2022.08.16.01")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index fa5bbec..5560056 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -73,9 +73,9 @@ - + - +