生产过渡表的 日期 任意选择 修改

wwwroot/mes/rpt/rpt023/rpt_index.html

@@ -61,8 +61,9 @@
 
         $(document).ready(function () {
             var ctime = new Date();
-            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth()) + "-01" + " 00:00:00";
-            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-01" + " 00:00:00";
+            var beginDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-01" + " 00:00:00";
+            // var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) + "-01" + " 00:00:00";
+            var endDate = ctime.getFullYear() + "-" + (ctime.getMonth() + 1) +  ctime.getDate() + " 23:59:59";
             $("#datebeginMaster").datetimebox("setValue", beginDate);
             $("#dateendMaster").datetimebox("setValue", endDate);
 

wwwroot/mes/rpt/rpt026/rpt.ashx

@@ -123,7 +123,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
                     END) Z_Y_1
                ,SUM(CASE
                       WHEN gl.buildingno = '1#' AND
-                           (T.PROCEDUREID IN (31,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
+                           (T.PROCEDUREID IN (31,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
                        1
                       ELSE
                        0
@@ -144,7 +144,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
                     END) Z_Y_2
                ,SUM(CASE
                       WHEN gl.buildingno = '2#' AND
-                           (T.PROCEDUREID IN (31,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
+                           (T.PROCEDUREID IN (31,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
                        1
                       ELSE
                        0
@@ -205,7 +205,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
                     END) A_Y_1
                ,SUM(CASE
                       WHEN gl.buildingno = '1#' AND
-                           (T.PROCEDUREID IN (31,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
+                           (T.PROCEDUREID IN (31,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
                        1
                       ELSE
                        0
@@ -226,7 +226,7 @@ select g.GOODSNAME 产品名称,g.GOODSSPECIFICATION 产品规格,g.GOODSMODEL
                     END) A_Y_2
                ,SUM(CASE
                       WHEN gl.buildingno = '2#' AND
-                           (T.PROCEDUREID IN (31,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
+                           (T.PROCEDUREID IN (31,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (1, 2))) THEN
                        1
                       ELSE
                        0
@@ -908,7 +908,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     END) Z_Y_1
                ,SUM(CASE
                       WHEN gl.buildingno = '1#' AND
-                           (T.PROCEDUREID IN (21,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (3, 4))) THEN
+                           (T.PROCEDUREID IN (21,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (3, 4))) THEN
                        1
                       ELSE
                        0
@@ -990,7 +990,7 @@ SELECT DECODE(GROUPING_ID(TT.GOODS_CODE), 1, '总计', TT.GOODS_CODE) AS 产品
                     END) A_Y_1
                ,SUM(CASE
                       WHEN gl.buildingno = '1#' AND
-                           (T.PROCEDUREID IN (21,52) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (3, 4))) THEN
+                           (T.PROCEDUREID IN (21,52,53) OR (T.PROCEDUREID IN (7, 8, 9) AND T.KILNID IN (3, 4))) THEN
                        1
                       ELSE
                        0