调整770回冲

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>

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 {

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();
@@ -88,20 +103,20 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
             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)
@@ -458,6 +405,58 @@ namespace QMAPP.FJC.DAL.CompleteStatistics
             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);

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   

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>

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);
             }

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)]

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>