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

11

master
songnan.zhang 2 years ago
parent
3417a9a72c
commit
f62c6e0b30
11 changed files with 36 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      APP/QMAPP.Web/Web.config
  2. 5
      APPMD/QMAPP.MD.Web/Web.config
  3. 2
      APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
  4. 6
      APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
  5. 4
      APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
  6. 2
      APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs
  7. 6
      APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx
  8. 8
      APPQ5/QMAPP.FJC.Web/Web.config
  9. 8
      APPQ5/QMAPP.WinForm/App.config
  10. 4
      APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
  11. 6
      ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config

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

@ -55,10 +55,11 @@
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=sa;Password=Password2018;" 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"/>-->

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

@ -30,7 +30,9 @@
<!--<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=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_VW276PA_MES;User Id=sa;Password=Microsoft@2021;" 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" />
@ -42,7 +44,6 @@
<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"/>

2
APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs
View File

@ -164,7 +164,7 @@ namespace QMAPP.FJC.DAL.FIS
sqlBuilder.AppendLine(" LEFT JOIN T_QM_USER C ON C.USERID=O.CREATEUSER ");
sqlBuilder.AppendLine(" LEFT JOIN T_QM_USER U ON U.USERID=O.UPDATEUSER ");
whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE='{0}')", condition.ORDER_TYPE);
whereBuilder.AppendFormat(" AND O.WORKCENTER_CODE in (select distinct WORKCENTER from T_PP_ORDERINDENTITY where ORDER_TYPE IN ('{0}','DOORPLANK018D'))", condition.ORDER_TYPE);
//查询条件
if (string.IsNullOrEmpty(condition.FACTORY_CODE) == false)

6
APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs
View File

@ -185,6 +185,12 @@ namespace QMAPP.FJC.DAL.TianJin
whereBuilder.Append(" AND A.ProductCode = @ProductCode");
parameters.Add(new DataParameter { ParameterName = "ProductCode", DataType = DbType.String, Value = condition.ProductCode });
}
if (string.IsNullOrEmpty(condition.MATERIALNAME) == false)
{
whereBuilder.Append(" AND m.MATERIAL_NAME = @MATERIALNAME");
parameters.Add(new DataParameter { ParameterName = "MATERIALNAME", DataType = DbType.String, Value = condition.MATERIALNAME });
}
if (condition.BeginTime != DateTime.MinValue)
whereBuilder.Append($" and A.CREATEDATE >= '{condition.BeginTime}' ");
if (condition.EndTime != DateTime.MinValue)

4
APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs
View File

@ -1323,8 +1323,8 @@ namespace QMAPP.FJC.DAL.TianJin
strValues.Append("'" + ppastecard.PASTECARDNO + "',");
strValues.Append("'" + ppastecard.PASTECARDDATE + "',");
strValues.Append("'" + ppastecard.PRODUCTIONNAME + "'");
//strValues.Append("'" + ppastecard.PLANTNAME + "'");
strValues.Append("'" + ppastecard.PRODUCTIONNAME + "',");
strValues.Append("'" + ppastecard.PLANTNAME + "'");
strSql.Append(" INSERT INTO T_DAS_PASTE_CARDINDEX ");
strSql.Append(" (" + strFields.ToString() + ")");

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

@ -34,7 +34,7 @@ namespace QMAPP.FJC.Web.Controllers
StorageModel seachModel = new StorageModel();
if (callback == true)
TryGetSelectBuffer<StorageModel>(out seachModel);
seachModel.rownumbers = false;
seachModel.rownumbers = true;
seachModel.url = "/Storage/GetList";
return View("StorageList", seachModel);
}

6
APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx
View File

@ -20,6 +20,12 @@
</th>
<td>
<%=Html.QC(p => p.MATERIALCODE)%>
</td>
<th align="right">
<%=Html.QV(p => p.MATERIALNAME)%>
</th>
<td>
<%=Html.QC(p => p.MATERIALNAME)%>
</td>
<th align="right">
<%=Html.QV(p => p.BeginTime)%>

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

@ -42,14 +42,14 @@
<!--<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=sa;Password=Password2018;" 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=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="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>
<!--日志组件配置开始-->

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

@ -15,13 +15,13 @@
<!--<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_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.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"/>-->
<!--<add name="maindb" connectionString="Data Source=123.56.115.74;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=qwe123$%^;" providerName="System.Data.SqlClient" />-->

4
APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs
View File

@ -547,7 +547,7 @@ namespace QMAPP.WinForm.Forms.TianJin
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
PrintLabel(labels);
//PrintLabel(labels);
WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
@ -738,7 +738,7 @@ namespace QMAPP.WinForm.Forms.TianJin
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始打印" + labeldata.OrderNo);
PrintLabel(labels);
//PrintLabel(labels);
//WriteLog.Write(System.DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " 开始变成打印状态" + labeldata.OrderNo);
//变更打印状态 0=>1

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

@ -75,16 +75,16 @@
<!--
<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"/>
<!--<add name="maindb" connectionString="Data Source=10.117.133.48;Initial Catalog=ADIENT_TJ_MES;User Id=sa;Password=ASDqwe123!@#;" providerName="System.Data.SqlClient"/>-->

Write Preview
Loading…
Cancel
Save