|
|
@@ -50,18 +50,18 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- DataTable goodsTable = conn.ExecuteDatatable(goodssql,goodsnull.ToArray());
|
|
|
+ // DataTable goodsTable = conn.ExecuteDatatable(goodssql,goodsnull.ToArray());
|
|
|
|
|
|
|
|
|
|
|
|
- if (goodsTable.Rows.Count > 0)
|
|
|
- {
|
|
|
- for (int i = 0; i < goodsTable.Rows.Count; i++)
|
|
|
- {
|
|
|
- if (i > 0) goodsStr += ",";
|
|
|
- goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
|
|
|
- }
|
|
|
- }
|
|
|
+ //if (goodsTable.Rows.Count > 0)
|
|
|
+ //{
|
|
|
+ // for (int i = 0; i < goodsTable.Rows.Count; i++)
|
|
|
+ // {
|
|
|
+ // if (i > 0) goodsStr += ",";
|
|
|
+ // goodsStr += "'" + goodsTable.Rows[i]["GOODSCODE"].ToString() + "'";
|
|
|
+ // }
|
|
|
+ // }
|
|
|
//主表
|
|
|
if (context.Request["m"].ToString() == "master")
|
|
|
{
|
|
|
@@ -269,7 +269,7 @@ SELECT GROUPING_ID ( PT.M_USERNAME, PT.LINE_NO,PT.GROUTINGLINEID, PT.GOODS_CODE,
|
|
|
,COALESCE(G.GOODSMODEL, P.GOODSMODEL, GL2.GOODSMODEL)
|
|
|
,NVL(G.USERCODE, P.USERCODE)) PT
|
|
|
GROUP BY GROUPING SETS((PT.M_USERNAME, PT.LINE_NO,PT.GROUTINGLINEID,PT.GL_MOULDQUANTITY, PT.GOODS_CODE, PT.G_USERCODE, PT.G_USERNAME, PT.HIGHPRESSUREFLAG, PT.GOODSTYPECODE2),(PT.M_USERNAME, PT.LINE_NO, PT.HIGHPRESSUREFLAG),(PT.M_USERNAME))
|
|
|
- ORDER BY PT.M_USERNAME, PT.LINE_NO, PT.G_USERCODE, PT.GOODS_CODE) TT".Replace("{goodsCodes}", goodsStr);
|
|
|
+ ORDER BY PT.M_USERNAME, PT.LINE_NO, PT.G_USERCODE, PT.GOODS_CODE) TT".Replace("{goodsCodes}", goodssql);
|
|
|
//获取查询条件
|
|
|
DateTime datebegin = Convert.ToDateTime(context.Request["datebeginMaster"]);
|
|
|
DateTime dateend = Convert.ToDateTime(context.Request["dateendMaster"]);
|