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

临时存储

master
songnan.zhang 2 years ago
parent
2fe4251ac1
commit
39eb46c41a
13 changed files with 54 additions and 17 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/App_Data/MainPower.xml
  2. 3
      APP/QMAPP.Web/App_Data/Menu.xml
  3. 6
      APP/QMAPP.Web/Web.config
  4. 7
      APPMD/QMAPP.MD.Web/Web.config
  5. 7
      APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs
  6. 2
      APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs
  7. 11
      APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs
  8. 10
      APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj
  9. BIN
      APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls
  10. 1
      APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
  11. 4
      APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs
  12. 5
      APPQ5/QMAPP.FJC.Web/App_Data/Power.xml
  13. 6
      APPQ5/QMAPP.FJC.Web/Web.config

5
APP/QMAPP.Web/App_Data/MainPower.xml
View File

@ -279,6 +279,11 @@
<PowerInfo PowerID="CD10070000" PowerDes="出入库记录" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>
<PowerInfo PowerID="CD10080000" PowerDes="登记信息" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>
<PowerInfo PowerID="CD10080001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD10080000"/>
<!--<PowerInfo PowerID="CD10080002" PowerDes="导出" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD10080000"/>-->
<!--<PowerInfo PowerID="CD10040000" PowerDes="生产进度查询" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>-->
<PowerInfo PowerID="CD14000000" PowerDes="投料记录查询" PowerType="" ActionList="" Visible="true" Seq="1" SuperID=""/>

3
APP/QMAPP.Web/App_Data/Menu.xml
View File

@ -453,7 +453,8 @@
<MenuItem MenuID="10080000" SystemID="FJC" MenuDes="登记信息" Action="/SignInfo/List" Target="url" PowerID="CD10080000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">
<Actions>
<Action ContorllerName="SignInfo" ActionName="List" PowerID="CD10080001">查询</Action>
<Action ContorllerName="SignInfo" ActionName="ExportExcel" PowerID="CD10080002">导出</Action>
<!--<Action ContorllerName="SignInfo" ActionName="ExportExcel" PowerID="CD10080002">导出</Action>-->
</Actions>
</MenuItem>
<!--<MenuItem MenuID="10040000" SystemID="FJC" MenuDes="生产进度查询" Action="" Target="url" PowerID="CD10040000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="10000000" Seq="1">

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

@ -45,13 +45,13 @@
<!--<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=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=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" />-->

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

@ -31,16 +31,17 @@
<!--<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=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=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.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"/>-->
</connectionStrings>

7
APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs
View File

@ -109,6 +109,7 @@ namespace QMAPP.MESReport.DAL.LineQTY
,tsa.[EQUIPMENT_CODE]
,tsa.[WORKCELL_CODE]
,tsa.[MATRIAL_CODE] AS [MATERIAL_CODE]
,ma.MATERIAL_NAME
,tsa.[SHIFT_CODE]
,CONVERT(VARCHAR(10),tsa.[STATIS_DATE],120) as STATIS_DATE
,tsa.[QTY]
@ -126,6 +127,8 @@ namespace QMAPP.MESReport.DAL.LineQTY
sqlBuilder.AppendLine("on tmw.WORKCELL_CODE =tsa.WORKCELL_CODE ");
sqlBuilder.AppendLine("inner join T_MD_PROCESS_ROUTE_WORKCELL_SEQ tmprw ");
sqlBuilder.AppendLine("on tmprw.WORKCELL_CODE =tsa.WORKCELL_CODE ");
sqlBuilder.AppendLine("inner join T_MD_MATERIAL ma ");
sqlBuilder.AppendLine("on ma.MATERIAL_CODE =tsa.MATRIAL_CODE ");
if (string.IsNullOrEmpty(condition.START_DATE) == false)
{
@ -189,14 +192,14 @@ namespace QMAPP.MESReport.DAL.LineQTY
try
{
//构成查询语句
sqlBuilder.Append("select * from T_SA_WORKCELLQTYCOUNT");
sqlBuilder.Append("select tsa.*,ma.MATERIAL_NAME from T_SA_WORKCELLQTYCOUNT as tsa inner join T_MD_MATERIAL ma on ma.MATERIAL_CODE = tsa.MATRIAL_CODE ");
if (whereBuilder.Length > 0)
{
sqlBuilder.Append(whereBuilder.ToString());
}
sqlBuilder.Append(" ORDER BY STATIS_DATE DESC ");
sqlBuilder.Append(" ORDER BY tsa.STATIS_DATE DESC ");
using (IDataSession session = AppDataFactory.CreateMainSession())
{

2
APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs
View File

@ -58,5 +58,7 @@ namespace QMAPP.MESReport.Entity.LineQTY
public string WORKCENTER_NAME { get; set; }
public string MATERIAL_NAME { get; set; }
}
}

11
APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs
View File

@ -121,9 +121,18 @@ namespace QMAPP.MESReport.Web.Models.LineQTY
[Description("物料号")]
[HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = false, Sortable = true, Width = 150, DataAlign = DataAlign.center)]
[DGColumn(frozenColumns = false, Sortable = true, Width = 200, DataAlign = DataAlign.center)]
public string MATERIAL_CODE { get; set; }
///<summary>
///物料名称
///</summary>
[Description("物料名称")]
[HTMLInput(UpdateRead = false, required = false, MaxLength = 50, Width = 120)]
[InputType(inputType.text)]
[DGColumn(frozenColumns = false, Sortable = true, Width = 250, DataAlign = DataAlign.center)]
public string MATERIAL_NAME { get; set; }
///<summary>
///工序合格数
///</summary>

10
APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj
View File

@ -25,6 +25,12 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -46,6 +52,9 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="EmitMapper">
<HintPath>..\..\DLL\EmitMapper.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=692fbea5521e1304, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DLL\log4net.dll</HintPath>
@ -540,6 +549,7 @@
<None Include="App_Data\Excel\MenderTrendCountExp.xlsx">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\an_hui_geo.json" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\ao_men_geo.json" />
<None Include="Scripts\echarts-2.2.2\src\util\mapData\rawData\geoJson\bei_jing_geo.json" />

BIN
APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls
View File

Binary file not shown.

1
APPQ5/QMAPP.FJC.BLL/Operation/MainOperationBLL.cs
View File

@ -2825,6 +2825,7 @@ namespace QMAPP.FJC.BLL.Operation
proCodeInfo = new PrintCodeDAL().GetPrintCodeInfo(proCodeInfo);
if (proCodeInfo != null)
{
var sssss = proCodeInfo.UPDATETIME.ToShortDateString();
if (proCodeInfo.UPDATETIME.ToShortDateString() != DateTime.Now.ToShortDateString())
{
proCodeInfo.SERIAL_NUM = 0;

4
APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs
View File

@ -56,9 +56,9 @@ namespace QMAPP.FJC.Entity.Operation
public string EndTime { get; set; }
///<summary>
///停工、复工时间
///停工时间
///</summary>
[DBColumn(ColumnName = "SIGNDATE", DataType = DbType.DateTime2)]
[DBColumn(ColumnName = "SIGNDATEBEGIN", DataType = DbType.DateTime2)]
public string SIGNDATE { get; set; }
}
}

5
APPQ5/QMAPP.FJC.Web/App_Data/Power.xml
View File

@ -279,6 +279,11 @@
<PowerInfo PowerID="CD10070000" PowerDes="出入库记录" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>
<PowerInfo PowerID="CD10080000" PowerDes="登记信息" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>
<PowerInfo PowerID="CD10080001" PowerDes="查询" PowerType="button" ActionList="" Visible="true" Seq="1" SuperID="CD10080000"/>
<!--<PowerInfo PowerID="CD10080002" PowerDes="导出" PowerType="button" ActionList="" Visible="true" Seq="2" SuperID="CD10080000"/>-->
<!--<PowerInfo PowerID="CD10040000" PowerDes="生产进度查询" PowerType="" ActionList="" Visible="true" Seq="2" SuperID="CD10000000"/>-->
<PowerInfo PowerID="CD14000000" PowerDes="投料记录查询" PowerType="" ActionList="" Visible="true" Seq="1" SuperID=""/>

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

@ -36,12 +36,12 @@
<!--<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=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=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" providerName="System.Data.SqlClient"/>-->
<add name="maindb" connectionString="Data Source=10.111.144.98;Initial Catalog=ADIENT_CD_MES;User Id=CDMESADM;Password=CDmes123;" 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" />-->

Write Preview
Loading…
Cancel
Save