InOutPut
/
Put_MES
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

存储

master
songnan.zhang 2 years ago
parent
3abf9e678d
commit
6aaf1ef14a
14 changed files with 52 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      APP/QMAPP.Web/Web.config
  2. 15
      APPMD/QMAPP.MD.Web/Web.config
  3. 3
      APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs
  4. 2
      APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
  5. 2
      APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
  6. BIN
      APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx
  7. BIN
      APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx
  8. BIN
      APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx
  9. BIN
      APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx
  10. 7
      APPQ5/QMAPP.FJC.Web/Web.config
  11. 9
      APPQ5/QMAPP.WinForm/App.config
  12. 18
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
  13. 4
      APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs
  14. 8
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

8
APP/QMAPP.Web/Web.config
View File

@ -42,14 +42,20 @@
<!--<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=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" 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=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" 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"/>-->

15
APPMD/QMAPP.MD.Web/Web.config
View File

@ -33,8 +33,13 @@
<!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;max pool size=10240;" providerName="System.Data.SqlClient"/>-->
<!--<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" 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_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" 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"/>-->
@ -105,19 +110,19 @@
</basicHttpBinding> </basicHttpBinding>
</bindings> </bindings>
<client> <client>
<!--<endpoint address="http://localhost:8938/GeneralService.svc" <endpoint address="http://localhost:8938/GeneralService.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService"
contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" /> contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://localhost:8938/LoginService.svc" <endpoint address="http://localhost:8938/LoginService.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService"
contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />--> contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />
<endpoint address="http://10.117.133.49:8939/GeneralService.svc" <!--<endpoint address="http://10.117.133.49:8939/GeneralService.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService"
contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" /> contract="CenterGeneralService.IGeneralService" name="BasicHttpBinding_IGeneralService" />
<endpoint address="http://10.117.133.49:8939/LoginService.svc" <endpoint address="http://10.117.133.49:8939/LoginService.svc"
binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService" binding="basicHttpBinding" bindingConfiguration="BasicHttpBinding_IGeneralService"
contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" /> contract="LoginService.ILoginService" name="BasicHttpBinding_ILoginService" />-->
</client> </client>
</system.serviceModel> </system.serviceModel>
<!--日志组件配置结束--> <!--日志组件配置结束-->

3
APPQ5/QMAPP.FJC.DAL/Basic/MachineInfoDAL.cs
View File

@ -291,7 +291,8 @@ namespace QMAPP.FJC.DAL.Basic
//设备编号 //设备编号
if (string.IsNullOrEmpty(condition.MACHINECODDE) == false) if (string.IsNullOrEmpty(condition.MACHINECODDE) == false)
{ {
whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'"); //whereBuilder.Append(" AND MACHINECODDE LIKE '%'+" + "@MACHINECODDE" + "+'%'");
whereBuilder.Append(" AND MACHINECODDE = @MACHINECODDE");
parameters.Add(new DataParameter { ParameterName = "MACHINECODDE", DataType = DbType.String, Value = condition.MACHINECODDE }); parameters.Add(new DataParameter { ParameterName = "MACHINECODDE", DataType = DbType.String, Value = condition.MACHINECODDE });
} }

2
APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs
View File

@ -401,7 +401,7 @@ namespace QMAPP.FJC.DAL.TianJin
break; break;
} }
} }
sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],W.[ORDERPLAN_NO],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] ");
List<DataParameter> parameters = new List<DataParameter>(); List<DataParameter> parameters = new List<DataParameter>();
parameters.Add(new DataParameter("routecode", routecode)); parameters.Add(new DataParameter("routecode", routecode));
using (var session = AppDataFactory.CreateMainSession()) using (var session = AppDataFactory.CreateMainSession())

2
APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs
View File

@ -380,7 +380,7 @@ namespace QMAPP.FJC.Web.Controllers
{ {
dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt); dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt);
//格式转换 //格式转换
list = QMFrameWork.Common.Util.BindHelper.ConvertToList<OrderPlan>(dt).ToList(); list = QMFrameWork.Common.Util.BindHelper.ConvertToList<OrderPlan>(dt).OrderBy(w => w.PLAN_NO).ToList();
serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell); serviceResult = wcfAgent.InvokeServiceFunction<DataResult<ImportMessage>>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell);
if (serviceResult.Ex != null) if (serviceResult.Ex != null)
{ {

BIN
APPQ5/QMAPP.FJC.Web/Temp/68b954f7-cfc6-4e67-afc9-df7840250b0d.xlsx
View File

Binary file not shown.

BIN
APPQ5/QMAPP.FJC.Web/Temp/cd1538b0-f827-4ac7-9111-d27a5c0407be.xlsx
View File

Binary file not shown.

BIN
APPQ5/QMAPP.FJC.Web/Temp/de760407-2172-474d-8517-8a715069e144.xlsx
View File

Binary file not shown.

BIN
APPQ5/QMAPP.FJC.Web/Temp/e6609924-9e68-4d29-8dda-fd4beff0c1b4.xlsx
View File

Binary file not shown.

7
APPQ5/QMAPP.FJC.Web/Web.config
View File

@ -33,6 +33,11 @@
<!--<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=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
<!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>--> <!--<add name="maindb" connectionString="Data Source=119.3.213.202,13315;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=ChangkeTec@2020;" providerName="System.Data.SqlClient"/>-->
@ -43,7 +48,7 @@
<!--<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="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"/>--> <add name="maindbBZD" connectionString="Data Source=10.111.144.98;Initial Catalog=BZD;User Id=sa;Password=Password2018;" 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"/>-->
</connectionStrings> </connectionStrings>
<!--日志组件配置开始--> <!--日志组件配置开始-->

9
APPQ5/QMAPP.WinForm/App.config
View File

@ -13,10 +13,15 @@
<!--<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"/> <add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" 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.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>-->
</connectionStrings> </connectionStrings>

18
APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs
View File

@ -1401,15 +1401,15 @@ namespace QMAPP.WinForm.Forms.TianJin
vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString()); vinNumber = Convert.ToInt32(dgvMATChange.Rows[scanSum].Cells["REQUESTID"].Value.ToString());
} }
if ((vinNumber - lastvinNumber) > 1) //if ((vinNumber - lastvinNumber) > 1)
{ //{
var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo); // var dresult = MessageBox.Show("出现顺序号间隔,是否继续发货?", "提示", MessageBoxButtons.YesNo);
if (dresult == DialogResult.No) // if (dresult == DialogResult.No)
{ // {
ArragetxtCode(); // ArragetxtCode();
return; // return;
} // }
} //}
#endregion #endregion

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

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

8
ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
View File

@ -73,7 +73,13 @@
<!--<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=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" providerName="System.Data.SqlClient"/>
<add name="maindb" connectionString="Data Source=dev.ccwin-in.com,6191;Initial Catalog=ADIENT_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" providerName="System.Data.SqlClient"/>
-->
<add name="maindb" connectionString="Data Source=10.122.213.104;Initial Catalog=ADIENT_VW276_MES;User Id=MES;Password=Password1;" 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"/>-->

Write Preview
Loading…
Cancel
Save