From 56b44780f640f4c5eec964e6e37a37424adc0e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE=E7=94=B7?= <446507344@qq.com>
Date: Thu, 15 Aug 2024 08:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4770=E5=9B=9E=E5=86=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 APP/QMAPP.Web/App_Data/Menu.xml               |   6 +
 .../CompleteStatisticsBLL.cs                  |  23 ++
 .../CompleteStatisticsDAL.cs                  | 201 +++++++++---------
 .../CompleteStatisticsEntity.cs               |   2 +-
 .../App_Data/Excel/CompleteStatisticsExp.xlsx | Bin 9329 -> 9583 bytes
 .../App_Data/Excel/CompleteStatisticsExp.xml  |  29 +--
 .../CompleteStatisticsController.cs           |   4 +-
 .../CompleteStatisticsModel.cs                |   8 +-
 .../CompleteStatisticsList.aspx               |   6 -
 9 files changed, 145 insertions(+), 134 deletions(-)

diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml
index 7f8ff69..a44890d 100644
--- a/APP/QMAPP.Web/App_Data/Menu.xml
+++ b/APP/QMAPP.Web/App_Data/Menu.xml
@@ -903,6 +903,12 @@
       <Action ContorllerName="Monitordata" ActionName="List" PowerID="CD20140001">查询</Action>
     </Actions>
   </MenuItem>
+  <MenuItem MenuID="20150000" SystemID="FJC" MenuDes="回冲统计" Action="/CompleteStatistics/CompleteStatisticsList" Target="url" PowerID="CD20140000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="20000000" Seq="1">
+    <Actions>
+      <Action ContorllerName="CompleteStatistics" ActionName="CompleteStatisticsList" PowerID="CD20150001">查询</Action>
+      <Action ContorllerName="CompleteStatistics" ActionName="ExportExcel" PowerID="CD20150005">导出Excel</Action>
+    </Actions>
+  </MenuItem>
   <!--<MenuItem MenuID="13150000" SystemID="MESReport" MenuDes="班次节拍统计" Action="/ProduceCycleTimeShift/Index" Target="url" PowerID="CD13101000" Visible="true" Ico="../../Content/Menu/images/ico/2.gif" SuperID="13000000" Seq="1">
     <Actions>
       <Action ContorllerName="ProduceCycleTimeShift" ActionName="Index" PowerID="CD13150001">查询</Action>
diff --git a/APPQ5/QMAPP.FJC.BLL/CompleteStatistics/CompleteStatisticsBLL.cs b/APPQ5/QMAPP.FJC.BLL/CompleteStatistics/CompleteStatisticsBLL.cs
index 2452483..c7adff9 100644
--- a/APPQ5/QMAPP.FJC.BLL/CompleteStatistics/CompleteStatisticsBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/CompleteStatistics/CompleteStatisticsBLL.cs
@@ -38,6 +38,29 @@ namespace QMAPP.FJC.BLL.CompleteStatistics
             return result;
         }
 
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="condition">条件</param>
+        /// <param name="page">数据页</param>
+        /// <returns>数据页</returns>
+        public DataResult<DataPage> GetNewList(CompleteStatisticsEntity condition, DataPage page)
+        {
+            DataResult<DataPage> result = new DataResult<DataPage>() { IsSuccess = true };
+
+            try
+            {
+                result.Result = new CompleteStatisticsDAL().GetNewList(condition, page);
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogHelper.Error(new LogInfo { ErrorInfo = ex, Tag = ex.StackTrace, Info = "获取统计信息列表错误!" });
+                result.IsSuccess = false;
+                result.Msg = "获取统计信息列表错误!";
+            }
+            return result;
+        }
+
         public int GenericCompleteStatistics(DateTime starTime, DateTime endTime)
         {
             try {
diff --git a/APPQ5/QMAPP.FJC.DAL/CompleteStatistics/CompleteStatisticsDAL.cs b/APPQ5/QMAPP.FJC.DAL/CompleteStatistics/CompleteStatisticsDAL.cs
index e2871c6..a87d53a 100644
--- a/APPQ5/QMAPP.FJC.DAL/CompleteStatistics/CompleteStatisticsDAL.cs
+++ b/APPQ5/QMAPP.FJC.DAL/CompleteStatistics/CompleteStatisticsDAL.cs
@@ -15,10 +15,10 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
         public DataPage GetList(CompleteStatisticsEntity condition, DataPage page)
         {
             DataParameter[] parameters;
-            string sql = this.GetQuerySql(condition, out parameters);
+            string sql = this.GetNewQuerySql(condition, out parameters);
             //分页关键字段及排序
             page.KeyName = "PID";
-            page.SortExpression = "ORDERNO ASC";
+            page.SortExpression = "ENDTIME ASC";
             using (IDataSession session = AppDataFactory.CreateMainSession()) {
                 page = session.GetDataPage<CompleteStatisticsEntity>(sql, parameters, page);
             }
@@ -26,10 +26,25 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
 
         }
 
+        public DataPage GetNewList(CompleteStatisticsEntity condition, DataPage page)
+        {
+            DataParameter[] parameters;
+            string sql = this.GetNewQuerySql(condition, out parameters);
+            //分页关键字段及排序
+            page.KeyName = "PID";
+            page.SortExpression = "ENDTIME desc";
+            using (IDataSession session = AppDataFactory.CreateMainSession())
+            {
+                page = session.GetDataPage<CompleteStatisticsEntity>(sql, parameters, page);
+            }
+            return page;
+
+        }
+
         public List<CompleteStatisticsEntity> GetList(CompleteStatisticsEntity condition)
         {
             DataParameter[] parameters;
-            string sql = this.GetQuerySql(condition, out parameters);
+            string sql = this.GetNewQuerySql(condition, out parameters);
             using (IDataSession session = AppDataFactory.CreateMainSession())
             {
                 return session.GetList<CompleteStatisticsEntity>(sql, parameters).ToList();
@@ -87,21 +102,21 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
             int count = 0;
             using (IDataSession session = AppDataFactory.CreateMainSession())
             {
-                
-                //DataParameter[] parameters = {
-                //    new DataParameter {ParameterName = "StartTime", DataType = DbType.DateTime, Value = starTime},
-                //    new DataParameter {ParameterName = "EndTime", DataType = DbType.DateTime, Value = endTime}
-                //};
+
+                DataParameter[] parameters = {
+                    new DataParameter {ParameterName = "StartTime", DataType = DbType.DateTime, Value = starTime},
+                    new DataParameter {ParameterName = "EndTime", DataType = DbType.DateTime, Value = endTime}
+                };
                 try {
                     session.OpenTs();
                     //string location = this.GetSystemConfig(CompleteStatisticsConstants.COMP_STATIS_SITE).CODEVALUE;
                     //string sql = location.Equals("080121") ? this.GetGenericStatisticsSqlForCC() : this.GetGenericStatisticsSqlForCD();
                     //成品
-                    //string sql = GetGenericStatisticsSqlForBORA();
-                    //count = session.ExecuteSql(sql, parameters);
-                    ////注塑件
-                    //sql = GetGenericStatisticsSqlForINJECT();
-                    //count += session.ExecuteSql(sql, parameters);
+                    string sql = GetGenericStatisticsSqlForBORA();
+                    count = session.ExecuteSql(sql, parameters);
+                    ////更新备份表
+                     var sql2 = GetGenericStatisticsSqlForINJECT();
+                    session.ExecuteSql(sql2, parameters);
 
 
                     this.UpdateLastGenericTime(endTime, session);
@@ -308,99 +323,31 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
         protected string GetGenericStatisticsSqlForBORA()
         {
             StringBuilder sql = new StringBuilder();                                                  
-            sql.AppendLine("    INSERT INTO T_AW_COMPLETE_STATISTICS	");
-            sql.AppendLine("        SELECT NEWID(),");
-            sql.AppendLine("    C.MFG_MATERIAL_CODE AS MATERIALNO,");
-            sql.AppendLine("        COUNT(*) AS SYSCOMPLETECOUNT,");
-            sql.AppendLine("        COUNT(*) AS COMPLETECOUNT,");
-            sql.AppendLine("        @StartTime AS STARTTIME,");
-            sql.AppendLine("        @EndTime AS ENDTIME,");
-            sql.AppendLine("        C.ORDERIDENTITY + ");
-            sql.AppendLine("        REPLACE(substring(CONVERT(VARCHAR(100), GETDATE(), 112),3,6) +				");
-            sql.AppendLine("                CONVERT(VARCHAR(100), GETDATE(), 8),':','') +			");	
-            sql.AppendLine("        REPLICATE('0', 2 - LEN(ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE))) + CAST (ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE) AS VARCHAR) AS ORDERNO,		");
-            sql.AppendLine("        GETDATE() AS CREATETIME,							                                            ");
-            sql.AppendLine("        USR.USERID AS CREATEUSER,							                                        ");
-            sql.AppendLine("        GETDATE() AS UPDATETIME,							                                            ");
-            sql.AppendLine("        USR.USERID AS UPDATEUSER,							                                        ");
-            sql.AppendLine("    '0' AS DELFLAG							                                                       ");
-            sql.AppendLine("    FROM T_AW_PRODUCT T	  ");
-            sql.AppendLine("    LEFT JOIN T_MD_MATERIAL_CLASS  S ON S.MATERIAL_TYPE_CODE=T.MATERIAL_TYPE 		        ");
-            sql.AppendLine("    LEFT JOIN T_AW_COMPLETE_MFG_CONFIG C ON C.MES_MATERIAL_CODE = T.MATERIAL_CODE 			        ");
-            sql.AppendLine("    LEFT JOIN T_QM_USER USR							                                               ");
-            sql.AppendLine("    ON USR.USERNAME = 'SYSTEM'							          					                   ");
-            sql.AppendLine("    WHERE   S.MATERIAL_ATTRIBUTE='2'                                                              ");
-            sql.AppendLine("    AND  C.MFG_MATERIAL_CODE IS NOT NULL                                                          ");
-            sql.AppendLine("    AND T.CREATEDATE >  @StartTime							                                     ");
-            sql.AppendLine("    AND T.CREATEDATE <= @EndTime							                                        ");
-            sql.AppendLine("    AND T.MACHINECODDE IS NOT NULL							                                        ");
-            sql.AppendLine("    GROUP BY C.MFG_MATERIAL_CODE, USR.USERID, C.ORDERIDENTITY		                                 ");
-            return sql.ToString();
-        }
-        //天津770发运  MFG回冲
-        protected string GetFrmPlaceStatisticsSql()
-        {
-            StringBuilder sql = new StringBuilder();
-            sql.AppendLine("    INSERT INTO T_AW_COMPLETE_STATISTICS	");
-            sql.AppendLine("        SELECT NEWID(),");
-            sql.AppendLine("    C.MFG_MATERIAL_CODE AS MATERIALNO,");
-            sql.AppendLine("        COUNT(*) AS SYSCOMPLETECOUNT,");
-            sql.AppendLine("        COUNT(*) AS COMPLETECOUNT,");
+            sql.AppendLine("    INSERT INTO T_AW_COMPLETE_STATISTICS SELECT NEWID(),MATERIALNO AS MATERIALNO,COUNT(MATERIALNO) AS SYSCOMPLETECOUNT,COUNT(MATERIALNO) AS COMPLETECOUNT, ");
             sql.AppendLine("        @StartTime AS STARTTIME,");
             sql.AppendLine("        @EndTime AS ENDTIME,");
-            sql.AppendLine("        C.ORDERIDENTITY + ");
-            sql.AppendLine("        REPLACE(substring(CONVERT(VARCHAR(100), GETDATE(), 112),3,6) +				");
-            sql.AppendLine("                CONVERT(VARCHAR(100), GETDATE(), 8),':','') +			");
-            sql.AppendLine("        REPLICATE('0', 2 - LEN(ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE))) + CAST (ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE) AS VARCHAR) AS ORDERNO,		");
-            sql.AppendLine("        GETDATE() AS CREATETIME,							                                            ");
-            sql.AppendLine("        USR.USERID AS CREATEUSER,							                                        ");
-            sql.AppendLine("        GETDATE() AS UPDATETIME,							                                            ");
-            sql.AppendLine("        USR.USERID AS UPDATEUSER,							                                        ");
-            sql.AppendLine("    '0' AS DELFLAG							                                                       ");
-            sql.AppendLine("    FROM T_AW_PRODUCT T	  ");
-            sql.AppendLine("    LEFT JOIN T_MD_MATERIAL_CLASS  S ON S.MATERIAL_TYPE_CODE=T.MATERIAL_TYPE 		        ");
-            sql.AppendLine("    LEFT JOIN T_AW_COMPLETE_MFG_CONFIG C ON C.MES_MATERIAL_CODE = T.MATERIAL_CODE 			        ");
-            sql.AppendLine("    LEFT JOIN T_QM_USER USR							                                               ");
-            sql.AppendLine("    ON USR.USERNAME = 'SYSTEM'							          					                   ");
-            sql.AppendLine("    WHERE   S.MATERIAL_ATTRIBUTE='2'                                                              ");
-            sql.AppendLine("    AND  C.MFG_MATERIAL_CODE IS NOT NULL                                                          ");
-            sql.AppendLine("    AND T.CREATEDATE >  @StartTime							                                     ");
-            sql.AppendLine("    AND T.CREATEDATE <= @EndTime							                                        ");
-            sql.AppendLine("    AND T.MACHINECODDE IS NOT NULL							                                        ");
-            sql.AppendLine("    GROUP BY C.MFG_MATERIAL_CODE, USR.USERID, C.ORDERIDENTITY		                                 ");
+            sql.AppendLine("        CASE MAX(line)  WHEN '770B' THEN 'DP20'  ELSE MAX(line) END AS ORDERNO, ");
+            sql.AppendLine("        GETDATE() AS CREATETIME,");
+            sql.AppendLine("        'b5c45b3e-724e-4d92-aad0-ef0cf3422a9e' AS CREATEUSER,");
+            sql.AppendLine("        GETDATE() AS UPDATETIME,");
+            sql.AppendLine("        'b5c45b3e-724e-4d92-aad0-ef0cf3422a9e' AS UPDATEUSER,");
+            sql.AppendLine("    '0' AS DELFLAG");
+            sql.AppendLine("    FROM T_AW_COMPLETE_TJSTATISTICS T");
+            sql.AppendLine("    WHERE   T.DELFLAG ='0' ");
+            sql.AppendLine("    AND T.ENDTIME >  @StartTime ");
+            sql.AppendLine("    AND T.ENDTIME <= @EndTime");
+            sql.AppendLine("    GROUP BY T.MATERIALNO	");
             return sql.ToString();
         }
-
+        
         protected string GetGenericStatisticsSqlForINJECT()
         {
             StringBuilder sql = new StringBuilder();
-            sql.AppendLine("    INSERT INTO T_AW_COMPLETE_STATISTICS					                                    ");
-            sql.AppendLine("        SELECT NEWID(),							                                              ");
-            sql.AppendLine("    C.MFG_MATERIAL_CODE AS MATERIALNO,							                                ");
-            sql.AppendLine("        COUNT(*) AS SYSCOMPLETECOUNT,							                                ");
-            sql.AppendLine("        COUNT(*) AS COMPLETECOUNT,							                                    ");
-            sql.AppendLine("        @StartTime AS STARTTIME,							                                       ");
-            sql.AppendLine("        @EndTime AS ENDTIME,								                                       ");
-            sql.AppendLine("        C.ORDERIDENTITY + 						                                              ");
-            sql.AppendLine("        REPLACE(substring(CONVERT(VARCHAR(100), GETDATE(), 112),3,6) +					                     ");
-            sql.AppendLine("            CONVERT(VARCHAR(100), GETDATE(), 8),':','') + 					                 ");
-            sql.AppendLine("            REPLICATE('0', 2 - LEN(ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE))) +      ");
-            sql.AppendLine("            CAST (ROW_NUMBER() OVER (ORDER BY C.MFG_MATERIAL_CODE) AS VARCHAR) AS ORDERNO,   ");
-            sql.AppendLine("        GETDATE() AS CREATETIME,							                                       ");
-            sql.AppendLine("        USR.USERID AS CREATEUSER,							                                    ");
-            sql.AppendLine("        GETDATE() AS UPDATETIME,							                                       ");
-            sql.AppendLine("        USR.USERID AS UPDATEUSER,							                                    ");
-            sql.AppendLine("    '0' AS DELFLAG							                                                  ");
-            sql.AppendLine("    FROM T_TM_MonitorCode T	                                                                ");
-            sql.AppendLine("        LEFT JOIN T_AW_COMPLETE_MFG_CONFIG C							                         ");
-            sql.AppendLine("        ON C.MES_MATERIAL_CODE = T.MATERIAL_CODE	                                           ");
-            sql.AppendLine("    LEFT JOIN T_QM_USER USR							                                           ");
-            sql.AppendLine("    ON USR.USERNAME = 'SYSTEM'							          						          ");
-            sql.AppendLine("    WHERE  T.CurrentMode='3'                                                                 ");
-            sql.AppendLine("    AND  C.MFG_MATERIAL_CODE IS NOT NULL       							                     ");
-            sql.AppendLine("    AND  T.CREATEDATE >  @StartTime					                                           ");
-            sql.AppendLine("    AND	 T.CREATEDATE <= @EndTime	                                                             ");
-            sql.AppendLine("    GROUP BY C.MFG_MATERIAL_CODE, USR.USERID, C.ORDERIDENTITY	                                ");
+           
+            sql.AppendLine(" update T_AW_COMPLETE_TJSTATISTICS set DELFLAG ='1' ");
+            sql.AppendLine("    WHERE   DELFLAG ='0'");
+            sql.AppendLine("    AND  ENDTIME >  @StartTime					                                           ");
+            sql.AppendLine("    AND	 ENDTIME <= @EndTime	                                                             ");
             return sql.ToString();
         }
         protected string GetQuerySql(CompleteStatisticsEntity condition, out DataParameter[] parameters)
@@ -457,7 +404,59 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
             parameters = parametersList.ToArray();
             return sql.ToString();
         }
-        
+
+        protected string GetNewQuerySql(CompleteStatisticsEntity condition, out DataParameter[] parameters)
+        {
+            List<DataParameter> parametersList = new List<DataParameter>();
+            StringBuilder sql = new StringBuilder();
+            sql.AppendLine("SELECT T.PID, ");
+            sql.AppendLine("       T.MATERIALNO, ");
+            sql.AppendLine("       T.SYSCOMPLETECOUNT,");
+            sql.AppendLine("       T.COMPLETECOUNT,");
+            sql.AppendLine("       T.STARTTIME, ");
+            sql.AppendLine("       T.ENDTIME, ");
+            sql.AppendLine("       T.ORDERNO, ");
+            sql.AppendLine("       T.CREATETIME,");
+            sql.AppendLine("       T.CREATEUSER,");
+            sql.AppendLine("       T.UPDATETIME,");
+            sql.AppendLine("       T.UPDATEUSER,");
+            sql.AppendLine("       T.DELFLAG,");
+            sql.AppendLine("       T.line as 'PRODUCTLINE',");
+            sql.AppendLine("       CUSER.USERNAME AS CREATEUSER_DISPLAY,");
+            sql.AppendLine("       UUSER.USERNAME AS UPDATEUSER_DISPLAY");
+            sql.AppendLine("  FROM T_AW_COMPLETE_TJSTATISTICS T");
+            sql.AppendLine("  LEFT JOIN T_QM_USER CUSER");
+            sql.AppendLine("    ON T.CREATEUSER = CUSER.USERID");
+            sql.AppendLine("  LEFT JOIN T_QM_USER UUSER");
+            sql.AppendLine("    ON T.UPDATEUSER = UUSER.USERID");
+            sql.AppendLine(" WHERE 1 = 1");
+            if (!string.IsNullOrWhiteSpace(condition.MATERIALNO))
+            {
+                sql.AppendLine("   AND T.MATERIALNO LIKE @MaterialNo");
+                parametersList.Add(new DataParameter { ParameterName = "MaterialNo", DataType = DbType.String, Value = string.Format("%{0}%", condition.MATERIALNO) });
+            }
+            if (!string.IsNullOrWhiteSpace(condition.DELFLAG))
+            {
+                if (condition.DELFLAG == "是")
+                    sql.AppendLine("   AND T.DELFLAG = '1'");
+                else if (condition.DELFLAG == "否")
+                    sql.AppendLine("   AND T.DELFLAG = '0'");
+            }
+
+            if (!string.IsNullOrWhiteSpace(condition.SENDTIME))
+            {
+                sql.AppendLine("   AND T.ENDTIME >= @SEndTime");
+                parametersList.Add(new DataParameter { ParameterName = "SEndTime", DataType = DbType.DateTime, Value = Convert.ToDateTime(condition.SENDTIME) });
+            }
+            if (!string.IsNullOrWhiteSpace(condition.EENDTIME))
+            {
+                sql.AppendLine("   AND T.ENDTIME <= @EEndTime");
+                parametersList.Add(new DataParameter { ParameterName = "EEndTime", DataType = DbType.DateTime, Value = Convert.ToDateTime(condition.EENDTIME) });
+            }
+            parameters = parametersList.ToArray();
+            return sql.ToString();
+        }
+
 
         public List<CompleteStatisticsEntity> GetExportData(CompleteStatisticsEntity model, IDataSession session)
         {
@@ -603,7 +602,7 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
         public DataTable ExportExcelData(CompleteStatisticsEntity model)
         {
             DataParameter[] parameters;
-            string sql = this.GetQuerySql(model, out parameters);
+            string sql = this.GetNewQuerySql(model, out parameters);
             using (IDataSession session = AppDataFactory.CreateMainSession())
             {
                 return session.GetTable(sql, parameters);
diff --git a/APPQ5/QMAPP.FJC.Entity/CompleteStatistics/CompleteStatisticsEntity.cs b/APPQ5/QMAPP.FJC.Entity/CompleteStatistics/CompleteStatisticsEntity.cs
index 806d26f..c76582b 100644
--- a/APPQ5/QMAPP.FJC.Entity/CompleteStatistics/CompleteStatisticsEntity.cs
+++ b/APPQ5/QMAPP.FJC.Entity/CompleteStatistics/CompleteStatisticsEntity.cs
@@ -53,7 +53,7 @@ namespace QMAPP.FJC.Entity.CompleteStatistics
             sql.AppendFormat(",'{0}'", this.MATERIALNO);//xxmes_bk_part
             sql.AppendFormat(",'{0}'", this.COMPLETECOUNT);//xxmes_bk_qty
             sql.AppendFormat(",'{0}'", this.PRODUCTLINE);//xxmes_bk_line
-            sql.AppendFormat(",'{0}'", this.ORDERNO);//xxmes_bk_doc
+            sql.AppendFormat(",'{0}'", "DP"+DateTime.Now.ToString("yyyyMMddHHmmssff"));//xxmes_bk_doc
             sql.AppendFormat(",'{0}'", "A");//xxmes_bk_shift
             sql.AppendFormat(",'{0}'", this.EMPLOYEE);//xxmes_bk_emp
             sql.AppendFormat(",'{0:yyyy-MM-dd HH:mm:ss}'", this.STARTTIME);//xxmes_bk_effdate   
diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xlsx b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xlsx
index 574d0b8b4012e36ee307955f307c3398e6f2d894..77934259f62c1d84ee2d704afc20d160df0ee4ff 100644
GIT binary patch
literal 9583
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
OZU_2NPL}vd@BaWC;I=;i

literal 9329
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
E2hZid(*OVf

diff --git a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xml b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xml
index a260473..2dd7809 100644
--- a/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xml
+++ b/APPQ5/QMAPP.FJC.Web/App_Data/Excel/CompleteStatisticsExp.xml
@@ -9,65 +9,54 @@
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="MATERIALNAME" ColumnTitle="零件名称" XPosition="B" YPosition="3" >
+      <DataInfoItem ColumnName="PRODUCTLINE" ColumnTitle="生产线" XPosition="B" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="PRODUCTLINE" ColumnTitle="生产线" XPosition="C" YPosition="3" >
-        <Observers>
-          <Observer name="Required" ></Observer>
-        </Observers>
-      </DataInfoItem>
-
-      <DataInfoItem ColumnName="SYSCOMPLETECOUNT" ColumnTitle="系统统计完工数量"   XPosition="D" YPosition="3" >
-        <Observers>
-          <Observer name="Required" ></Observer>
-        </Observers>
-      </DataInfoItem>
 
-      <DataInfoItem ColumnName="COMPLETECOUNT"    ColumnTitle="人工统计完工数量" XPosition="E" YPosition="3" >
+      <DataInfoItem ColumnName="COMPLETECOUNT"    ColumnTitle="人工统计完工数量" XPosition="C" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="STARTTIME"  ColumnTitle="统计开始时间"     XPosition="F" YPosition="3" >
+      <DataInfoItem ColumnName="STARTTIME"  ColumnTitle="统计开始时间"     XPosition="D" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="ENDTIME"  ColumnTitle="统计结束时间"     XPosition="G" YPosition="3" >
+      <DataInfoItem ColumnName="ENDTIME"  ColumnTitle="统计结束时间"     XPosition="E" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
-      <DataInfoItem ColumnName="ORDERNO"  ColumnTitle="订单号"     XPosition="H" YPosition="3" >
+      <DataInfoItem ColumnName="ORDERNO"  ColumnTitle="订单号"     XPosition="F" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
-      <DataInfoItem ColumnName="CREATEUSER_DISPLAY"    ColumnTitle="创建用户" XPosition="I" YPosition="3" >
+      <DataInfoItem ColumnName="CREATEUSER_DISPLAY"    ColumnTitle="创建用户" XPosition="G" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="CREATETIME"    ColumnTitle="创建时间" XPosition="J" YPosition="3" >
+      <DataInfoItem ColumnName="CREATETIME"    ColumnTitle="创建时间" XPosition="H" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="UPDATEUSER_DISPLAY"    ColumnTitle="更新用户" XPosition="K" YPosition="3" >
+      <DataInfoItem ColumnName="UPDATEUSER_DISPLAY"    ColumnTitle="更新用户" XPosition="I" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
       </DataInfoItem>
 
-      <DataInfoItem ColumnName="UPDATETIME"    ColumnTitle="更新时间" XPosition="K" YPosition="3" >
+      <DataInfoItem ColumnName="UPDATETIME"    ColumnTitle="更新时间" XPosition="J" YPosition="3" >
         <Observers>
           <Observer name="Required" ></Observer>
         </Observers>
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/CompleteStatisticsController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/CompleteStatisticsController.cs
index 2d43d12..1c651df 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/CompleteStatisticsController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/CompleteStatisticsController.cs
@@ -135,11 +135,11 @@ namespace QMAPP.FJC.Web.Controllers
 
                 //导出
                 QMFrameWork.WebUI.Util.IEFileTool efTool = new QMFrameWork.WebUI.Util.IEFileTool();
-                return efTool.GetExcelFileResult("CompleteStatisticsExp", "完工数量统计.xlsx", result.Result);
+                return efTool.GetExcelFileResult("CompleteStatisticsExp", "发运数量统计.xlsx", result.Result);
             }
             catch (Exception ex)
             {
-                LogManager.LogHelper.Error(new LogInfo { ErrorInfo = ex, Info = "导出excel", Tag = "完工数量统计" });
+                LogManager.LogHelper.Error(new LogInfo { ErrorInfo = ex, Info = "导出excel", Tag = "发运数量统计" });
                 this.SetMessage("导出excel失败");
                 return this.CompleteStatisticsList(true);
             }
diff --git a/APPQ5/QMAPP.FJC.Web/Models/CompleteStatistics/CompleteStatisticsModel.cs b/APPQ5/QMAPP.FJC.Web/Models/CompleteStatistics/CompleteStatisticsModel.cs
index 07a4446..8915088 100644
--- a/APPQ5/QMAPP.FJC.Web/Models/CompleteStatistics/CompleteStatisticsModel.cs
+++ b/APPQ5/QMAPP.FJC.Web/Models/CompleteStatistics/CompleteStatisticsModel.cs
@@ -25,11 +25,11 @@ namespace QMAPP.FJC.Web.Models.CompleteStatistics
         [Description("零件号")]
         [HTMLInput(UpdateRead = true, required = true, MaxLength = 20)]
         [InputType(inputType.text)]
-        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+        [DGColumn(frozenColumns = true, Sortable = true, Width = 180, DataAlign = DataAlign.center)]
         public string MATERIALNO { get; set; }
 
         [Description("零件名称")]
-        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center,Hidden = true)]
         public string MATERIALNAME { get; set; }
 
         [Description("生产线")]
@@ -51,10 +51,10 @@ namespace QMAPP.FJC.Web.Models.CompleteStatistics
         [Description("系统统计完工数量")]
         [HTMLInput(UpdateRead = true, required = true, MaxLength = 20, DataType = QDataType.number, NumberMin = 0)]
         [InputType(inputType.text)]
-        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
+        [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center,Hidden = true)]
         public int SYSCOMPLETECOUNT { get; set; }
 
-        [Description("人工统计完工数量")]
+        [Description("完工数量")]
         [HTMLInput(UpdateRead = false, required = true, MaxLength = 20, DataType = QDataType.number, NumberMin = 0)]
         [InputType(inputType.text)]
         [DGColumn(frozenColumns = true, Sortable = true, Width = 100, DataAlign = DataAlign.center)]
diff --git a/APPQ5/QMAPP.FJC.Web/Views/CompleteStatistics/CompleteStatisticsList.aspx b/APPQ5/QMAPP.FJC.Web/Views/CompleteStatistics/CompleteStatisticsList.aspx
index 218d26e..b036a1d 100644
--- a/APPQ5/QMAPP.FJC.Web/Views/CompleteStatistics/CompleteStatisticsList.aspx
+++ b/APPQ5/QMAPP.FJC.Web/Views/CompleteStatistics/CompleteStatisticsList.aspx
@@ -14,12 +14,6 @@
             <td>
                 <%=Html.QC(p => p.MATERIALNO)%> 
             </td>
-            <th align="right">
-                <%=Html.QV(p => p.DOESEXPORT) %>
-            </th>
-            <td>
-                <%=Html.QC(p => p.DOESEXPORT)%> 
-            </td>
             <th align="right">
                 <%=Html.QV(p => p.SENDTIME)%>
             </th>