Browse Source

暂存

master
songnan.zhang 2 years ago
parent
commit
d4f42dd05f
  1. 3
      APPQ5/QMAPP.WinForm/App.config
  2. 50
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  3. 4
      APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
  4. 4
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

3
APPQ5/QMAPP.WinForm/App.config

@ -13,8 +13,9 @@
<!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=.;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>--> <add name="maindbBZD" connectionString="Data Source=.;Initial Catalog=BZD;User Id=sa;Password=Microsoft2008;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
</connectionStrings> </connectionStrings>

50
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs

@ -191,52 +191,11 @@ namespace QMAPP.WinForm.Forms.TianJin
DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetList.ToString(), pFisType, WORKCENTER_CODE); DataTable tbl = agent.InvokeServiceFunction<DataTable>(QMAPP.ServicesAgent.FrmPlaceManage.TJFrmPlaceBLL_GetList.ToString(), pFisType, WORKCENTER_CODE);
tbl.AcceptChanges(); 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(); DataTable tbz = new DataTable();
if (tbl.Rows.Count <= 0) 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; DataTable dt = (DataTable)dgvMATChange.DataSource;
if (dt != null) if (dt != null)
{ {
@ -1150,7 +1109,7 @@ namespace QMAPP.WinForm.Forms.TianJin
strcarsetdesc_cn = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_NAME"].Value.ToString(); strcarsetdesc_cn = dgvMATChange.Rows[temprowindex].Cells["MATERIAL_NAME"].Value.ToString();
//车型 //车型
strlineno = dgvMATChange.Rows[temprowindex].Cells["LINENO"].Value.ToString(); strlineno = dgvMATChange.Rows[temprowindex].Cells["LINENO"].Value.ToString();
strvin = Code;
//扫描状态 //扫描状态
strscanstat = dgvMATChange.Rows[temprowindex].Cells["STATE"].Value.ToString(); strscanstat = dgvMATChange.Rows[temprowindex].Cells["STATE"].Value.ToString();
dgvrowindex = temprowindex; dgvrowindex = temprowindex;
@ -1230,7 +1189,7 @@ namespace QMAPP.WinForm.Forms.TianJin
var mach = inputstring.Substring(4, inputstring.Length - 4); var mach = inputstring.Substring(4, inputstring.Length - 4);
var plan = new TJOrderPlan(); var plan = new TJOrderPlan();
plan.PLAN_DATE = DateTime.Now; plan.PLAN_DATE = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
plan.QTY = defaultNum/2; plan.QTY = defaultNum/2;
if (mach.Substring(0, 3) == "770") if (mach.Substring(0, 3) == "770")
plan.LINENO = "770B"; plan.LINENO = "770B";
@ -1251,11 +1210,6 @@ namespace QMAPP.WinForm.Forms.TianJin
} }
} }
//var list = agent.InvokeServiceFunction<List<Materiel>>("TJDoorPlankPlanBLL_GetListMachine", plan.MATERIAL_CODE);
//if (list != null)
// plan.MATERIAL_NAME = list[0].MATERIALNAME;
//QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent();
var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan); var RESULT = agent.InvokeServiceFunction<DataResult<int>>("TJDoorPlankPlanBLL_Insert", plan);
if (RESULT.IsSuccess == true) if (RESULT.IsSuccess == true)
{ {

4
APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”: // 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2022.08.10.01")] [assembly: AssemblyVersion("2022.08.16.01")]
[assembly: AssemblyFileVersion("2022.08.10.01")] [assembly: AssemblyFileVersion("2022.08.16.01")]

4
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

@ -73,9 +73,9 @@
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />--> <!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>--> <add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/> <!--<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->

Loading…
Cancel
Save