在产产品在滞数汇总表 增加商标条件

wwwroot/mes/rpt2/rpt4001/rpt.ashx

@@ -29,6 +29,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			string groutinglineCode = context.Request["groutinglineMaster[]"] is object ? context.Request["groutinglineMaster[]"].ToString() : "0";
 			if (groutinglineCode == "0" && context.Request["groutinglineMaster"] is object) groutinglineCode = context.Request["groutinglineMaster"].ToString();
             if (groutinglineCode == "") groutinglineCode = "0";
+			//商标id
+			string logoId = context.Request["LOGONAME"] is object ? context.Request["LOGONAME"].ToString() : "";
+			logoId = logoId==""?string.Empty:"AND INP.LOGOID=" + logoId;
 
 			//主表
             if(context.Request["m"].ToString()=="0")
@@ -98,6 +101,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							AND (INP.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0' )
 							AND (P.PROCEDUREID IN ({PROCEDUREID}) OR '{PROCEDUREID}' = '0' )
 							AND (INP.GROUTINGLINEID IN ({GROUTINGLINECODE}) OR '{GROUTINGLINECODE}' = '0') 
+							{LOGOID}
 	                    GROUP BY
 		                    GROUPING SETS (
 			                    (P.DISPLAYNO,P.PROCEDUREID,P.PROCEDURENAME,G.GOODSCODE ),
@@ -119,7 +123,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 .Replace("{GOODSID}",goodsidMaster)
                 .Replace("{GOODSTYPECODE}", goodstypeCode)
 				.Replace("{PROCEDUREID}",procedureId)
-				.Replace("{GROUTINGLINECODE}",groutinglineCode);
+				.Replace("{GROUTINGLINECODE}",groutinglineCode)
+				.Replace("{LOGOID}", logoId);
 
                 //获取查询条件
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
@@ -172,6 +177,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						END AS 产品类型,
 						INP.BARCODE AS 产品条码,
 						INP.GOODSCODE AS 产品编码,
+						LG.LOGONAME AS 产品商标,
 						--INP.PRODUCTIONLINECODE AS 生产线,
 						PLINE.PRODUCTIONLINECODE AS 生产线, --生产线名称显示 xcm  2023-3-28
 						INP.GOODSLEVELTYPEID AS 产品分级编号,
@@ -189,6 +195,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						INNER JOIN TP_PC_PRODUCTIONLINE PLINE ON PLINE.PRODUCTIONLINEID = INP.PRODUCTIONLINEID
 						INNER JOIN TP_MST_USER U ON INP.USERID = U.USERID
 						INNER JOIN TP_MST_GOODS G ON INP.GOODSID = G.GOODSID
+						INNER JOIN TP_MST_LOGO LG ON INP.LOGOID = LG.LOGOID
 						INNER JOIN TP_MST_GOODSTYPE GT ON G.GOODSTYPEID = GT.GOODSTYPEID
 						LEFT JOIN TP_MST_GMOULDTYPE MT ON INP.GMOULDTYPEID = MT.GMOULDTYPEID
 						LEFT JOIN TP_PM_GROUTINGDAILYDETAIL GD ON INP.GROUTINGDAILYDETAILID = GD.GROUTINGDAILYDETAILID
@@ -201,9 +208,11 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 						AND ( INP.GOODSID IN ( {GOODSID} ) OR '{GOODSID}' = '0' ) 
 						AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL ) 
 						AND ( INP.GROUTINGLINEID IN ( {GROUTINGLINECODE} ) OR '{GROUTINGLINECODE}' = '0' )
+						{LOGOID}
                 ".Replace("{GOODSID}", goodsidMaster)
 				.Replace("{GOODSTYPECODE}", goodstypeCode)
-				.Replace("{GROUTINGLINECODE}",groutinglineCode);
+				.Replace("{GROUTINGLINECODE}",groutinglineCode)
+				.Replace("{LOGOID}", logoId);
 
                 List<CDAParameter> sqlPara = new List<CDAParameter>();
                 sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["id"]));

wwwroot/mes/rpt2/rpt4001/rpt_index.html

@@ -31,7 +31,8 @@
                         <input class="easyui-combobox" id="goodsidMaster" name="goodsidMaster" 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:200px;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: 120px; 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;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#ffMaster').form('clear')">清空</a>
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="搜索" class="easyui-linkbutton" plain="false" onclick="tbSearchSubmit()">搜索</a>
                     </div>