1

wwwroot/mes/rpt/rpt340/rpt.ashx

@@ -48,7 +48,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 
 				string highFlag = context.Request["highFlagMaster"];
 				if (highFlag == "") highFlag = "-1";
-
+				//商标id
+				 string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
+				logoId = logoId==""?string.Empty:"AND GDD.LOGOID=" + logoId;
+				string inn=logoId==""?string.Empty:"INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON GDD.GROUTINGDAILYDETAILID = P.GROUTINGDAILYDETAILID";
 				string procedureId = context.Request["procedureidMaster[]"] is object ? context.Request["procedureidMaster[]"].ToString() : "0";
 				if (procedureId == "0" && context.Request["procedureidMaster"] is object) procedureId = context.Request["procedureidMaster"].ToString();
 				if (procedureId == "") procedureId = "0";
@@ -90,7 +93,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
-		
+							{LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( H.CREATETIME, 'YYYYMM' ), ( ) )
 					),
@@ -174,6 +177,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 							INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 							INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                            {INN}
 						WHERE
 							P.CREATETIME >= @DATEBEGIN@
 							AND P.CREATETIME < @DATEEND@
@@ -183,6 +187,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 					),
@@ -265,6 +270,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 							INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 							INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                            {INN}
 						WHERE
 							P.BACKOUTTIME >= @DATEBEGIN@
 							AND P.BACKOUTTIME < @DATEEND@
@@ -274,6 +280,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 					),二车间转三车间 AS (
@@ -294,6 +301,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                        {INN}
 						WHERE
 							P.CREATETIME >= @DATEBEGIN@
 							AND P.CREATETIME < @DATEEND@
@@ -303,6 +311,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 
@@ -324,6 +333,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                        {INN}
 						WHERE
 							P.BACKOUTTIME >= @DATEBEGIN@
 							AND P.BACKOUTTIME < @DATEEND@
@@ -333,6 +343,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 					),三车间转二车间 AS (
@@ -346,6 +357,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                        {INN}
 						WHERE
 							P.BACKOUTTIME >= @DATEBEGIN@
 							AND P.BACKOUTTIME < @DATEEND@
@@ -355,6 +367,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 					),三车间转二车间撤销 AS (
@@ -368,6 +381,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						INNER JOIN TP_MST_GOODS G ON G.GOODSID = P.GOODSID
 						INNER JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = G.GOODSTYPEID 
 						INNER JOIN TP_PC_GROUTINGLINE GL ON P.GROUTINGLINEID = GL.GROUTINGLINEID
+                        {INN}
 						WHERE
 							P.BACKOUTTIME >= @DATEBEGIN@
 							AND P.BACKOUTTIME < @DATEEND@
@@ -377,6 +391,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
 							--AND ( P.PROCEDUREID in ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' ) 
 							AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '')
+                            {LOGOID}
 						GROUP BY
 							GROUPING SETS ( TO_CHAR( P.CREATETIME, 'YYYYMM' ), ( ) )
 					)
@@ -482,7 +497,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				 .Replace("{GOODSID}", goodsId)
 				 .Replace("{GROUTINGLINEID}", groutinglineId)
 				 .Replace("{PROCEDUREID}", procedureId)
-				 .Replace("{GOODSTYPECODE}", goodstypeCode);
+				 .Replace("{GOODSTYPECODE}", goodstypeCode)
+				 .Replace("{LOGOID}", logoId).Replace("{INN}", inn);
 
 				//获取查询条件
 				List<CDAParameter> sqlPara = new List<CDAParameter>();

wwwroot/mes/rpt/rpt340/rpt_index.html

@@ -40,7 +40,9 @@
                     </div>
                     <div style="padding-top:10px;">
                         产品编码：
-                        <input class="easyui-combobox" id="goodsMaster" name="goodsMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSID',textField:'GOODSCODE',panelHeight:'300px',editable:true,multiple:true" style="width:415px;height:32px;">
+                        <input class="easyui-combobox" id="goodsMaster" name="goodsMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoods&select=1',method:'get',valueField:'GOODSID',textField:'GOODSCODE',panelHeight:'300px',editable:true,multiple:true" style="width:165px;height:32px;">
+                        产品商标：
+                        <input class="easyui-combobox" id="LOGONAME" name="LOGONAME" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLogoByGoods&select=1',method:'get',valueField:'ID',textField:'TEXT',panelHeight:'300px'" style="width:165px;height:32px;">
                         成型线号：
                         <input class="easyui-combobox" id="groutinglineMaster" name="groutinglineMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getLine&select=1',method:'get',valueField:'GROUTINGLINEID',textField:'GROUTINGLINECODE',panelHeight:'300px',editable:true,multiple:true" style="width: 322px; height: 32px;">
 
@@ -152,12 +154,13 @@
             $('#highFlagMaster').combobox('clear');
             $('#goodsMaster').combobox( 'clear');
             $('#groutinglineMaster').combobox('clear');
+            $('#LOGONAME').combobox('clear');
         }
 
         //搜索提交
         function tbSearchSubmit() {
             var index = $('#tableTabs').tabs('getTabIndex', $('#tableTabs').tabs('getSelected'));
-
+            console.log(index,'index')
             if (index == 0) {
                 if ($('#ffMaster').form("validate")) {
                     $('#DataGrid' + index).datagridLoadRpt({