From 39eb46c41aca84e268a059a318ee095a06c5eae3 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Sun, 9 Oct 2022 09:54:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/App_Data/MainPower.xml | 5 +++++ APP/QMAPP.Web/App_Data/Menu.xml | 3 ++- APP/QMAPP.Web/Web.config | 6 +++--- APPMD/QMAPP.MD.Web/Web.config | 9 +++++---- .../LineQTY/LineDWQTYCountDAL.cs | 9 ++++++--- .../LINEQTY/LineDayQTYCount.cs | 2 ++ .../Models/LineQTY/LineDWQTYModel.cs | 11 ++++++++++- .../QMAPP.MESReport.Web.csproj | 10 ++++++++++ .../ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls | Bin 0 -> 16896 bytes .../QMAPP.FJC.BLL/Operation/MainOperationBLL.cs | 1 + APPQ5/QMAPP.FJC.Entity/Operation/SignInfo.cs | 4 ++-- APPQ5/QMAPP.FJC.Web/App_Data/Power.xml | 5 +++++ APPQ5/QMAPP.FJC.Web/Web.config | 6 +++--- 13 files changed, 54 insertions(+), 17 deletions(-) create mode 100644 APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls diff --git a/APP/QMAPP.Web/App_Data/MainPower.xml b/APP/QMAPP.Web/App_Data/MainPower.xml index 5ff8ee0..6fae65e 100644 --- a/APP/QMAPP.Web/App_Data/MainPower.xml +++ b/APP/QMAPP.Web/App_Data/MainPower.xml @@ -278,6 +278,11 @@ + + + + + diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index dca7b2c..d2795e0 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -453,7 +453,8 @@ 查询 - 导出 + + + - + --> - + diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config index 24b8e5c..dfba128 100644 --- a/APPMD/QMAPP.MD.Web/Web.config +++ b/APPMD/QMAPP.MD.Web/Web.config @@ -31,16 +31,17 @@ - + + - - + + + --> diff --git a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs index d8e4c2c..fca2410 100644 --- a/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs +++ b/APPMESReport/QMAPP.MESReport.DAL/LineQTY/LineDWQTYCountDAL.cs @@ -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,7 +127,9 @@ 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) { whereBuilder.Append(" AND STATIS_DATE >= @START_DATE "); @@ -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()) { diff --git a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs index 83f90b5..fd4b9cd 100644 --- a/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs +++ b/APPMESReport/QMAPP.MESReport.Entity/LINEQTY/LineDayQTYCount.cs @@ -58,5 +58,7 @@ namespace QMAPP.MESReport.Entity.LineQTY public string WORKCENTER_NAME { get; set; } + public string MATERIAL_NAME { get; set; } + } } diff --git a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs index b783cbf..85a7d68 100644 --- a/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs +++ b/APPMESReport/QMAPP.MESReport.Web/Models/LineQTY/LineDWQTYModel.cs @@ -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; } + /// + ///物料名称 + /// + [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; } + /// ///工序合格数 /// diff --git a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj index a7febb8..dc7f0fb 100644 --- a/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj +++ b/APPMESReport/QMAPP.MESReport.Web/QMAPP.MESReport.Web.csproj @@ -25,6 +25,12 @@ SAK SAK SAK + + + + + + true @@ -46,6 +52,9 @@ AllRules.ruleset + + ..\..\DLL\EmitMapper.dll + False ..\..\DLL\log4net.dll @@ -540,6 +549,7 @@ PreserveNewest + diff --git a/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls b/APPMESReport/QMAPP.MESReport.Web/Temp/ec10e4ca-e6a1-4ce0-a5a2-dceeb4fd79a7.xls new file mode 100644 index 0000000000000000000000000000000000000000..411274c75f79101fb302a4d9864196553677bf0a GIT binary patch literal 16896 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 - ///停工、复工时间 + ///停工时间 /// - [DBColumn(ColumnName = "SIGNDATE", DataType = DbType.DateTime2)] + [DBColumn(ColumnName = "SIGNDATEBEGIN", DataType = DbType.DateTime2)] public string SIGNDATE { get; set; } } } diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml index 2a6e5d7..e7b85a9 100644 --- a/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml +++ b/APPQ5/QMAPP.FJC.Web/App_Data/Power.xml @@ -279,6 +279,11 @@ + + + + + diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config index 6d0a56a..691353a 100644 --- a/APPQ5/QMAPP.FJC.Web/Web.config +++ b/APPQ5/QMAPP.FJC.Web/Web.config @@ -36,12 +36,12 @@ - + +--> - +