111

wwwroot/mes/rpt/rpt420/rpt.ashx

@@ -19,10 +19,20 @@ public class rpt : IHttpHandler, IReadOnlySessionState
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
-            string barcodesql = @"SELECT DISTINCT  BARCODE from TP_PM_FQCITEMSDATA WHERE VALUEFLAG =1 and ACCOUNTID=1
-                                        AND (BARCODE = @BARCODE@ OR @BARCODE@  IS NULL  OR @BARCODE@='' )";
+            DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMasterStar"]);
+            DateTime dateEnd = Convert.ToDateTime(context.Request["datebeginMasterEnd"]).AddDays(1);
+            string barcodesql = @"SELECT DISTINCT  BARCODE from TP_PM_FQCITEMSDATA TPF
+                                        LEFT JOIN TP_PM_FQCITEMS TPFQ ON TPF.ITEMSID = TPFQ.ITEMSID
+                                        WHERE TPF.VALUEFLAG =1 and TPF.ACCOUNTID=1
+                                        AND TPF.CREATETIME>=@datebeginMasterStar@
+                                        AND TPF.CREATETIME<=@datebeginMasterEnd@
+                                        AND (TPF.ITEMSID = @ITEMSID@ OR @ITEMSID@  IS NULL  OR @ITEMSID@='')
+                                        AND (TPF.BARCODE = @BARCODE@ OR @BARCODE@  IS NULL  OR @BARCODE@='' )";
             List<CDAParameter> barcodePara = new List<CDAParameter>();
             barcodePara.Add(new CDAParameter("BARCODE", context.Request["BARCODE"].ToString(), DataType.NVarChar));
+            barcodePara.Add(new CDAParameter("ITEMSID", context.Request["INSPECTITEM"].ToString(), DataType.NVarChar));
+            barcodePara.Add(new CDAParameter("datebeginMasterStar", dateBegin, DataType.DateTime));
+            barcodePara.Add(new CDAParameter("datebeginMasterEnd", dateEnd, DataType.DateTime));
             DataTable dt2 = conn.ExecuteDatatable(barcodesql, barcodePara.ToArray());
             string barocdes = "";
             for (int i = 0; i < dt2.Rows.Count; i++) {
@@ -37,8 +47,6 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             //主表
             if (context.Request["m"].ToString() == "master")
             {
-                DateTime dateBegin = Convert.ToDateTime(context.Request["datebeginMasterStar"]);
-                DateTime dateEnd = Convert.ToDateTime(context.Request["datebeginMasterEnd"]).AddDays(1);
                 //读取报表数据
                 string sqlStr = @" SELECT * 
                                             FROM (select