Browse Source

存上

master
张松男 7 months ago
parent
commit
8703bb7837
  1. 4
      APP/QMAPP.Web/Web.config
  2. 7
      APPMD/QMAPP.MD.Web/Web.config
  3. 22
      APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs
  4. 2
      APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml
  5. BIN
      APPQ5/QMAPP.FJC.Web/Temp/10dd0d47-944d-4299-919a-05dcf58cf5a9.xlsx
  6. BIN
      APPQ5/QMAPP.FJC.Web/Temp/a9859cca-44fa-4a2f-9b58-a8287dd18ef9.xlsx
  7. 6
      APPQ5/QMAPP.FJC.Web/Web.config
  8. 6
      APPQ5/QMAPP.WinForm/App.config
  9. 1
      APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs
  10. 4
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  11. 6
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

4
APP/QMAPP.Web/Web.config

@ -62,10 +62,12 @@
<add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>

7
APPMD/QMAPP.MD.Web/Web.config

@ -50,9 +50,12 @@
<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />

22
APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs

@ -292,11 +292,17 @@ namespace QMAPP.FJC.BLL.FIS
if (model.MATERIAL_CODE.Contains("018"))
model.ROUTE_CODE = "DP_L_ASSEMBLY_018D";
else if (model.MATERIAL_CODE.Contains("493"))
{
model.ROUTE_CODE = "DP_L_ASSEMBLY_493D";
}
else if (model.MATERIAL_CODE.Contains("304"))
model.ROUTE_CODE = "DP_L_ASSEMBLY_304D";
else
model.ROUTE_CODE = "DP_L_ASSEMBLY_770B";
{
if (MA.MATERIALNAME.Contains("304"))
model.ROUTE_CODE = "DP_L_ASSEMBLY_304D";
else
model.ROUTE_CODE = "DP_L_ASSEMBLY_770B";
}
}
else if (MA.MATERIALNAME.Contains("右"))
{
@ -304,8 +310,16 @@ namespace QMAPP.FJC.BLL.FIS
model.ROUTE_CODE = "DP_R_ASSEMBLY_018D";
else if (model.MATERIAL_CODE.Contains("493"))
model.ROUTE_CODE = "DP_R_ASSEMBLY_493D";
else if (model.MATERIAL_CODE.Contains("304"))
model.ROUTE_CODE = "DP_R_ASSEMBLY_304D";
else
model.ROUTE_CODE = "DP_R_ASSEMBLY_770B";
{
if (MA.MATERIALNAME.Contains("304"))
model.ROUTE_CODE = "DP_R_ASSEMBLY_304D";
else
model.ROUTE_CODE = "DP_R_ASSEMBLY_770B";
}
}
}
}

2
APPQ5/QMAPP.FJC.Web/App_Data/Menu.xml

@ -298,7 +298,7 @@
</Actions>
</MenuItem>-->
<!--TJDoorPlankPlanPrint DoorPlankPlan-->
<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理" Action="/DoorPlankPlan/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
<MenuItem MenuID="02030000" SystemID="FJC" MenuDes="门板计划管理" Action="/TJDoorPlankPlanPrint/List?ORDER_TYPE=DOORPLANK" Target="url" PowerID="CD02030000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="02000000" Seq="1">
<Actions>
<Action ContorllerName="TJDoorPlankPlanPrint" ActionName="List" PowerID="CD02030001">查询</Action>
<Action ContorllerName="TJDoorPlankPlanPrint" ActionName="Add" PowerID="CD02030002">添加</Action>

BIN
APPQ5/QMAPP.FJC.Web/Temp/10dd0d47-944d-4299-919a-05dcf58cf5a9.xlsx

Binary file not shown.

BIN
APPQ5/QMAPP.FJC.Web/Temp/a9859cca-44fa-4a2f-9b58-a8287dd18ef9.xlsx

Binary file not shown.

6
APPQ5/QMAPP.FJC.Web/Web.config

@ -71,8 +71,10 @@
<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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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>

6
APPQ5/QMAPP.WinForm/App.config

@ -12,8 +12,10 @@
<!--<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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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>

1
APPQ5/QMAPP.WinForm/Forms/TianJin/PlanRePrintForm.cs

@ -288,6 +288,7 @@ namespace QMAPP.WinForm.Forms.TianJin
list.Add(new Linese() { NAME = "770B", CODE = "770B" });
list.Add(new Linese() { NAME = "278D", CODE = "278D" });
list.Add(new Linese() { NAME = "493D", CODE = "493D" });
list.Add(new Linese() { NAME = "304D", CODE = "304D" });
this.Lines.DataSource = list;
this.Lines.DisplayMember = "NAME";
this.Lines.ValueMember = "CODE";

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

@ -1221,8 +1221,10 @@ namespace QMAPP.WinForm.Forms.TianJin
plan.LINENO = "018D";
else if(mach.Substring(0, 3) == "493")
plan.LINENO = "493D";
else if (mach.Substring(0, 3) == "304")
plan.LINENO = "304D";
if (plan.LINENO == "770B")
if (plan.LINENO == "770B"|| plan.LINENO == "304D")
{
foreach (var s in "R,F".Split(','))
{

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

@ -75,9 +75,12 @@
<add name="maindb" connectionString="Data Source=10.111.144.111;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=123u3M12912@1;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.111;Initial Catalog=BZD;User Id=CDMESADM;Password=123u3M12912@1;" 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="maindbBZD" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=BZD;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"/>
<!--
@ -98,7 +101,6 @@
<!--<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.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;max pool size=10240;" providerName="System.Data.SqlClient"/>
<add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" providerName="System.Data.SqlClient"/>-->

Loading…
Cancel
Save