月度成品入库报表增加商标查询 条件

wwwroot/mes/rpt/rpt341/rpt.ashx

@@ -72,6 +72,9 @@ 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 procedureId = context.Request["procedureidMaster[]"] is object ? context.Request["procedureidMaster[]"].ToString() : "0";
                 if (procedureId == "0" && context.Request["procedureidMaster"] is object) procedureId = context.Request["procedureidMaster"].ToString();
@@ -151,6 +154,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             AND (@USERCODE@ IS NULL OR INSTR(GDD.USERCODE, @USERCODE@) > 0)
 						    AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
 						    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
+						    {LOGOID}
 						    AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
                             AND ( '{WORKSHOPCODE}' =  '0' 
                                         OR ( '{WORKSHOPCODE}' =  '1'AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1) ) 
@@ -181,6 +185,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             AND (@USERCODE@ IS NULL OR INSTR(GDD.USERCODE, @USERCODE@) > 0)
 						    AND (GL.GROUTINGLINEID IN ({GROUTINGLINEID}) OR '{GROUTINGLINEID}' = '0') 
 						    AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
+                            {LOGOID}
 						    AND ( INSTR( GT.GOODSTYPECODE, '{GOODSTYPECODE}' ) = 1 OR '{GOODSTYPECODE}' IS NULL OR '{GOODSTYPECODE}' = '') 
                             AND ( '{WORKSHOPCODE}' =  '0' 
                                         OR ( '{WORKSHOPCODE}' =  '1'AND (INSTR( GDD.GROUTINGLINECODE, 'A' ) = 1 OR INSTR( GT.GOODSTYPECODE, '001002' ) = 1)  ) 
@@ -221,7 +226,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                  .Replace("{GROUTINGLINEID}",groutinglineId)
                  .Replace("{PROCEDUREID}",procedureId)
                  .Replace("{WORKSHOPCODE}",workshopcodeMaster)
-                 .Replace("{GOODSTYPECODE}",goodstypeCode);
+                 .Replace("{GOODSTYPECODE}",goodstypeCode)
+                 .Replace("{LOGOID}", logoId);
 
 
 

wwwroot/mes/rpt/rpt341/rpt_index.html

@@ -37,6 +37,8 @@
                                data:[{'text': '按日统计', 'value': 'YYYY-MM-DD'},{'text': '按月统计', 'value': 'YYYY-MM'}, {'text': '按年统计', 'value': 'YYYY'}]" style=" width: 120px; height: 32px;">
                         产品类别：
                         <input class="easyui-combotree" id="goodstypecodeMaster" name="goodstypecodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../../rpt/rpt.ashx?m=getGoodsType',method:'get',panelHeight:'200px',editable:true" style="width:180px;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;">
                     </div>
                     <div style="padding-top:10px;">
                         产品编码：