张忠帅 пре 1 година
родитељ
комит
f08c3b65d8

+ 1 - 1
wwwroot/App_Data/PublishProfiles/192.168.0.101.pubxml

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>\\192.168.0.101\d$\dongke\mes\dk.mes.web</PublishUrl>
+    <PublishUrl>\\192.168.0.101\d$\dongke\mes\dk.mes.web_9000</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <SiteUrlToLaunchAfterPublish />
   </PropertyGroup>

+ 3 - 3
wwwroot/mes/rpt/rpt201/rpt.ashx

@@ -45,7 +45,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            TP_MST_DEFECT MDF 
                             WHERE
 	                            MDF.DEFECTTYPEID = 1 
-	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTCODE");
+	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dt.Rows.Count; i++) {
                     if (i > 0) defect += ",";
                     defect += dt.Rows[i]["DEFECTCODE"].ToString()+" "+dt.Rows[i]["DEFECTNAME"].ToString();
@@ -59,7 +59,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 	                            TP_MST_DEFECT MDF 
                             WHERE
 	                            MDF.DEFECTTYPEID = 1 
-	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTCODE");
+	                            AND MDF.VALUEFLAG = 1 ORDER BY  MDF.DEFECTID");
                 for (int i = 0; i < dts.Rows.Count; i++) {
                     if (i > 0) sumdefect += ",";
                     sumdefect += dts.Rows[i]["DEFECTCODE"].ToString()+" "+dts.Rows[i]["DEFECTNAME"].ToString();
@@ -67,7 +67,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 
 
-                string sqlStr = @"SELECT* FROM(
+                string sqlStr = @"SELECT * FROM(
                    SELECT   GROUPING_ID(GD.GOODSNAME,GD.GOODSSPECIFICATION,MD.DICTIONARYVALUE,LG.LOGONAME) AS GID, 
 											CASE WHEN GROUPING_ID(GD.GOODSNAME,GD.GOODSSPECIFICATION,MD.DICTIONARYVALUE,LG.LOGONAME) =15 then '合计'  ELSE TO_CHAR(GD.GOODSCODE )END AS 产品编码,
 	                                TO_CHAR(GD.GOODSNAME) AS 产品名称,

+ 3 - 3
wwwroot/mes/rpt/rpt201/rpt_index.html

@@ -163,8 +163,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(成型)).xls',
-                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(成型))'
+                fileName: '导出数据_' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'_(成品质量分析日报表(成型)).xls',
+                workSheet: '成品质量分析日报表(成型)'
             });
         }
 
@@ -176,7 +176,7 @@
         //帮助事件
         function tbHelp() {
             $('#DataGridMaster').datagridDialog({
-                title: '帮助',
+                title: '帮助11',
                 width: 640,
                 height: 480,
                 url: '成品质量分析日报表(成型).html'

+ 2 - 2
wwwroot/mes/rpt/rpt202/rpt_index.html

@@ -92,8 +92,8 @@
 
             $('#DataGridMaster').datagridExport({
                 headers: headers,
-                fileName: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检)).xls',
-                workSheet: '  导出数据' + $("#datebeginMaster").datebox("getValue") + '       ' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检))'
+                fileName: '导出数据' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检)).xls',
+                workSheet: '导出数据' + $("#datebeginMaster").datebox("getValue") + '_' + $("#dateendMaster").datebox("getValue")+'(成品质量分析日报表(半检))'
             });
         }
         //帮助事件

+ 54 - 42
wwwroot/mes/rpt/rpt305/rpt.ashx

@@ -14,20 +14,31 @@ using DK.XuWei.WebMes;
 
 public class rpt : IHttpHandler, IReadOnlySessionState
 {
-	public void ProcessRequest(HttpContext context)
-	{
-		context.Response.ContentType = "text/plain";
+    public void ProcessRequest(HttpContext context)
+    {
+        context.Response.ContentType = "text/plain";
 
-		using (IDataAccess conn = DataAccess.Create())
-		{
-			DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
-			DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
-			//主表
-			string sqlStr = "";
-			if (context.Request["m"].ToString() == "master")
-			{
-				//读取报表数据
-				sqlStr = @" WITH 数据源 AS ( SELECT
+        using (IDataAccess conn = DataAccess.Create())
+        {
+            DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
+            DateTime dateEnd = Convert.ToDateTime(context.Request["dateendMaster"]).AddDays(1);
+            string test = context.Request["procedureMaster"];
+            string procedureID = "";
+            if (test == null && test == "") {
+                procedureID = "6,9,";
+            }
+            else {
+                procedureID = context.Request["procedureMaster"]+",";
+
+            }
+
+
+            //主表
+            string sqlStr = "";
+            if (context.Request["m"].ToString() == "master")
+            {
+                //读取报表数据
+                sqlStr = @" WITH 数据源 AS ( SELECT
                                                  CASE WHEN  GOODSCODE IS NULL  THEN '合计'  ELSE to_char(GOODSCODE) END AS 产品编码,
                                                 GOODSNAME 产品名称,
                                                 LOGONAME 商标,
@@ -35,14 +46,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 GOODSSPECIFICATION 产品规格,
                                                 COUNT(DISTINCT  CASE WHEN  PROCEDUREID=16 THEN BARCODE ELSE NULL END ) as 出窑量_出窑量,
                                                 COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_产量,
-                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID NOT IN (4,5) THEN BARCODE ELSE NULL END) AS 出窑量_残品,
-                                                COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
+                                                COUNT(DISTINCT CASE WHEN   GOODSLEVELTYPEID IN (" + procedureID + "7) THEN BARCODE ELSE NULL END) AS 出窑量_残品,";
+                sqlStr+=@" COUNT(DISTINCT CASE WHEN   DEFECTTYPEID IN (9,10) THEN BARCODE ELSE NULL END) 原料缺陷,
                                                 COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'A') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成A,
                                                 COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'B') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成B,
                                                 COUNT(DISTINCT CASE WHEN   instr(GROUTINGLINECODE, 'C') > 0 AND HIGHPRESSUREFLAG=0 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_成C,
                                                 COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_高压,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=2 THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
-                                                COUNT(DISTINCT CASE WHEN   HIGHPRESSUREFLAG=1 AND DEFECTTYPEID=3 THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('10','12','13','14','15','16','17','18','19','20') THEN BARCODE ELSE NULL END) 成型缺陷_打磨,
+                                                COUNT(DISTINCT CASE WHEN   DEFECTCODE IN('01','02','03','04','05','06','07','08','09','10','25','34') THEN BARCODE ELSE NULL END) 成型缺陷_擦洗,
                                                 COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=1 THEN BARCODE ELSE NULL END) 成型缺陷_半检,
                                                 COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=4 THEN BARCODE ELSE NULL END) 烧成窑缺陷_施釉,
                                                 COUNT(DISTINCT CASE WHEN   DEFECTTYPEID=5 THEN BARCODE ELSE NULL END) 烧成窑缺陷_擦坯,
@@ -61,6 +72,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                                 good.GOODSSPECIFICATION,
                                                 TP_MST_DataDictionary.DICTIONARYVALUE,
                                                 DEFECT.DEFECTTYPEID,
+                                                DEFECT.DEFECTCODE,
                                                 GL.HIGHPRESSUREFLAG,
                                                 pd.PROCEDUREID AS  PROCEDUREID
                                                 FROM
@@ -131,35 +143,35 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       DECODE( NVL(  其他缺陷, 0 ), 0, '0%', TO_CHAR( (    ( NVL(其他缺陷, 0 ) / DECODE( NVL( 出窑量_出窑量, 1 ), 0, 1, NVL(  出窑量_出窑量, 1 ) ) ) ) * 100, 'fm99990.0' ) || '%' ) 
                                         FROM 数据源
                                         WHERE 产品编码='合计' )  ORDER BY 产品编码";
-			}
-			//获取查询条件
-			List<CDAParameter> sqlPara = new List<CDAParameter>();
-			sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));
-			sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
-			//sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
-			//获取分页参数
-			int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
-			int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10;
-			string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
-			string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
+            }
+            //获取查询条件
+            List<CDAParameter> sqlPara = new List<CDAParameter>();
+            sqlPara.Add(new CDAParameter("DATEBEGIN", dateBegin, DataType.DateTime));
+            sqlPara.Add(new CDAParameter("DATEEND", dateEnd, DataType.DateTime));
+            //sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
+            //获取分页参数
+            int page = HttpContext.Current.Request["page"] is object ? Convert.ToInt32(HttpContext.Current.Request["page"]) : 1;
+            int rows = HttpContext.Current.Request["rows"] is object ? Convert.ToInt32(HttpContext.Current.Request["rows"]) : 10;
+            string sort = HttpContext.Current.Request["sort"] is object ? HttpContext.Current.Request["sort"] : "m.REPORTCODE";
+            string order = HttpContext.Current.Request["order"] is object ? HttpContext.Current.Request["order"] : "";
 
-			//获取分页数据    
-			int total = 0;
-			DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
-			string jsonStr = new JsonResult(dt) { total = total }.ToJson();
+            //获取分页数据    
+            int total = 0;
+            DataTable dt = conn.SelectPages(page, rows, out total, sqlStr, sqlPara.ToArray());
+            string jsonStr = new JsonResult(dt) { total = total }.ToJson();
 
-			context.Response.Write(jsonStr);
+            context.Response.Write(jsonStr);
 
-		}
+        }
 
-	}
+    }
 
-	public bool IsReusable
-	{
-		get
-		{
-			return false;
-		}
-	}
+    public bool IsReusable
+    {
+        get
+        {
+            return false;
+        }
+    }
 
 }

+ 6 - 0
wwwroot/mes/rpt/rpt305/rpt_index.html

@@ -31,6 +31,12 @@
 						<input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:190px; height:32px;">
 						截止日期:
 						<input class="easyui-datebox" id="dateendMaster" name="dateendMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width: 190px; height: 32px;">
+						数据源:
+	<input class="easyui-combobox" id="procedureMaster" name="procedureMaster" data-options="required:false,prompt:'请选择...',tipPosition:'top',
+		   data:[
+		   {'text':'冷修','value':'9,'},
+		   {'text':'回烧','value':'6,'},
+		   ],valueField:'value',textField:'text',panelHeight:'200px',editable:'true'" style="width:160px;height:32px;">
 						<!--产品名称:<input class="easyui-combobox" id="goodsid" name="goodsid" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSNAME',textField:'GOODSNAME',panelHeight:'300px',editable:'true',multiple:true" style="width:120px;height:32px;">-->
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="toClear()">清空</a>
 						<a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>

+ 48 - 0
wwwroot/website.publishproj

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+
+***********************************************************************************************
+website.publishproj
+
+警告: 请勿修改此文件,它将用于 Web 发布过程。
+
+版权所有 (C) Microsoft Corporation。保留所有权利。
+
+***********************************************************************************************
+-->
+
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.30319</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{49dd4857-064e-4b11-905f-02f1c85d5220}</ProjectGuid>
+    <SourceWebPhysicalPath>$(MSBuildThisFileDirectory)</SourceWebPhysicalPath>
+    <SourceWebVirtualPath>/wwwroot</SourceWebVirtualPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SourceWebProject></SourceWebProject>
+    <SourceWebMetabasePath></SourceWebMetabasePath>
+  </PropertyGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <!-- for VS2010 we need to use 10.5 but for VS2012+ we should use VisualStudioVersion -->
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)' =='' and '$(VisualStudioVersion)' == 10.0 ">10.5</WebPublishTargetsVersion>
+    <WebPublishTargetsVersion Condition=" '$(WebPublishTargetsVersion)'=='' ">$(VisualStudioVersion)</WebPublishTargetsVersion>
+
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(WebPublishTargetsVersion)</VSToolsPath>
+    <_WebPublishTargetsPath Condition=" '$(_WebPublishTargetsPath)'=='' ">$(VSToolsPath)</_WebPublishTargetsPath>
+    <AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">1.0.0.0</AssemblyFileVersion>
+    <AssemblyVersion Condition="'$(AssemblyVersion)' == ''">1.0.0.0</AssemblyVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <AssemblyAttributes Include="AssemblyFileVersion">
+      <Value>$(AssemblyFileVersion)</Value>
+    </AssemblyAttributes>
+    <AssemblyAttributes Include="AssemblyVersion">
+      <Value>$(AssemblyVersion)</Value>
+    </AssemblyAttributes>
+  </ItemGroup>
+  <Import Project="$(_WebPublishTargetsPath)\Web\Microsoft.WebSite.Publishing.targets" />
+</Project>