综合合格率分析表 加商标条件

wwwroot/mes/rpt/rpt135/rpt.ashx

@@ -77,6 +77,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND gdd.delivertime <  @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
 								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
+                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
+
 							GROUP BY
 								gdd.goodsid 
 							UNION ALL-- 干补数
@@ -87,6 +89,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							FROM
 								TP_PM_PRODUCTIONDATA p 
 									LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=p.GROUTINGLINEID
+                                left join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = p.groutingdailydetailid
 							WHERE
 								p.VALUEFLAG = 1 
 								AND p.accountid = 1
@@ -95,6 +98,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND p.createtime < @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
 								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
+                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
 							GROUP BY
 								p.goodsid 
 							UNION ALL-- 半检不合格数  复检不合格数  损坯数
@@ -105,6 +109,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 							FROM
 								tp_pm_scrapproduct sp 
 									LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=sp.GROUTINGLINEID
+                                left join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = sp.groutingdailydetailid
 							WHERE
 								sp.valueflag = '1' 
 								AND sp.accountid = 1
@@ -115,6 +120,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								AND sp.AUDITDATE < @dateend@
 								AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)
 								AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)
+                                AND (@LOGOID@ IS NULL OR instr(gdd.logoid , @LOGOID@) > 0)
 							GROUP BY
 								sp.goodsid,
 								sp.SCRAPTYPE 
@@ -133,6 +139,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     }
                     sqlStr += " order by g.goodscode";
                     sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["workshopcodeMaster"].ToString()));
+                    sqlPara.Add(new CDAParameter("LOGOID", context.Request["LOGONAME"].ToString()));
                     sqlPara.Add(new CDAParameter("HIGHPRESSUREFLAG", context.Request["HIGHPRESSUREFLAG"]));
                     sqlPara.Add(new CDAParameter("goodstypecode", context.Request["goodstypecode"].ToString()));
                     //直接获取不分页数据
@@ -166,11 +173,13 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                    "       INNER JOIN tp_mst_goods g ON p.goodsid = g.goodsid\n" +
                     "       LEFT JOIN TP_MST_GOODSTYPE GT ON g.GOODSTYPEID=GT.GOODSTYPEID\n" +
                     "       LEFT JOIN TP_PC_GROUTINGLINE gl on gl.GROUTINGLINEID=p.GROUTINGLINEID\n" +
+                    "       LEFT JOIN tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = p.groutingdailydetailid\n" +
                    "      where p.accountid = @accountid@\n" +
                    "         and p.procedureid in (11, 58, 104)\n" +
                    "         and p.createtime >= @datebegin@\n" +
                    "         and p.createtime <  @dateend@\n" +
                    "		AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0) " +
+                   "		AND (@LOGOID@ IS NULL OR instr(gdd.LOGOID , @LOGOID@) > 0) " +
                    "		AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)" +
                    "        AND (@groutinglineMaster@ IS NULL OR instr(gl.GROUTINGLINEID , @groutinglineMaster@) > 0)" +
                    "		AND (@goodstypecode@ IS NULL OR instr(gt.goodstypecode,@goodstypecode@) = 1)";
@@ -207,6 +216,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                          and p.createtime >= @datebegin@
                                          and p.createtime <  @dateend@
 				                                AND (@BUILDINGNO@ IS NULL OR instr(gl.BUILDINGNO , @BUILDINGNO@) > 0)   
+				                                AND (@LOGOID@ IS NULL OR instr(gdd.LOGOID , @LOGOID@) > 0)    
 				                                AND (@HIGHPRESSUREFLAG@ IS NULL OR instr(gl.HIGHPRESSUREFLAG , @HIGHPRESSUREFLAG@) > 0)	
                                                 AND (@groutinglineMaster@ IS NULL OR instr(gl.GROUTINGLINEID , @groutinglineMaster@) > 0)
 				                                AND (@goodstypecode@ IS NULL OR instr(gt.goodstypecode,@goodstypecode@) = 1) ";
@@ -230,6 +240,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                     "ROUND((SUM(本烧合格数) + SUM(重烧合格数)) / NULLIF(SUM(本烧出窑数), 0), 4) * 100 || '%' AS 综合合格率\n " +
                     "FROM ppp_details ";
                     sqlPara.Add(new CDAParameter("BUILDINGNO", context.Request["workshopcodeMaster"].ToString()));
+                    sqlPara.Add(new CDAParameter("LOGOID", context.Request["LOGONAME"].ToString()));
                     sqlPara.Add(new CDAParameter("HIGHPRESSUREFLAG", context.Request["HIGHPRESSUREFLAG"]));
                     sqlPara.Add(new CDAParameter("groutinglineMaster", context.Request["groutinglineMaster"]));
                     sqlPara.Add(new CDAParameter("goodstypecode", context.Request["goodstypecode"].ToString()));

wwwroot/mes/rpt/rpt135/rpt_index.html

@@ -33,8 +33,11 @@
                         高压标识
                         <input class="easyui-combobox" id="HIGHPRESSUREFLAG" name="HIGHPRESSUREFLAG" data-options="required:false,prompt:'',tipPosition:'top',
                         data:[{'value':'','text':'全部'},{'value':'1','text':'高压'},{'value':'0','text':'普通'}],method:'get',valueField:'value',textField:'text',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;"> &nbsp;
-                        <br/>成型线号：
-                        <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" style="width: 322px; height: 32px;">
+                        <br />成型线号：
+                        <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" 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="usercodeMaster" name="usercodeMaster" data-options="required:false,prompt:'',tipPosition:'top',url:'../rpt.ashx?m=getUser&select=1',method:'get',valueField:'USERCODE',textField:'USERCODE',panelHeight:'300px',editable:'true'" style="width:120px;height:32px;">
                         <a href="javascript:void(0)" id="btnSearchSubmit" title="清空" class="easyui-linkbutton" plain="false" onclick="$('#ffMaster').form('clear')">清空</a>&nbsp;&nbsp;&nbsp;&nbsp;