生产数据表(报工)

wwwroot/mes/rpt2/rpt8009/rpt.ashx

@@ -415,7 +415,6 @@ SELECT
 								GDD.MATERIALCODE SAPCODE,
 								PD.USERCODE,
 							CASE
-									
 									WHEN HGDI.WORKSHOP = 2 
 									AND INSTR( GT.GOODSTYPECODE, '001002' ) = 1 THEN
 										1 
@@ -2121,7 +2120,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 20
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2256,7 +2255,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (20,30,40)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.SCRAPNUM = a.SCRAPNUM ) s
@@ -2312,7 +2311,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.REPAIRNUM NOT IN (0)
 										 AND THDB.DATACODE IN ('20','30','40')
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,REPAIRNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2381,7 +2380,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 50
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2490,7 +2489,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (50)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2579,7 +2578,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0),NVL(s.countt,0)
  INNER JOIN TP_PM_GROUTINGDAILYDETAIL GDD ON TT.groutingdailydetailid = GDD.groutingdailydetailid
 INNER JOIN tp_mst_goods g ON g.goodsid = GDD.goodsid
 INNER JOIN tp_mst_goodstype gt ON g.goodstypeid = gt.goodstypeid WHERE TT.nodetype = @nodetype@ )TT1
- WHERE  TT1.车间 = @WORKSHOP@
+ WHERE  TT1.车间 = @WORKSHOP@ and TT1.BARCODE is not null
                 ";
                 if (context.Request["shorname"].ToString() == "注浆数")
                 {
@@ -2668,7 +2667,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 20
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2760,7 +2759,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.outputnum NOT IN (0)
 										 AND THDB.DATACODE = 50
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,outputnum) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -2969,7 +2968,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.REPAIRNUM NOT IN (0)
 										 AND THDB.DATACODE IN ('20','30','40')
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,REPAIRNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s
@@ -3137,7 +3136,7 @@ SELECT
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (20,30,40)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.SCRAPNUM = a.SCRAPNUM ) s
@@ -3278,7 +3277,7 @@ SELECT s.groutingdailydetailid,s.outputnum,NVL(s.counts,0) counts,NVL(s.countt,0
 											LEFT JOIN TSAP_HEGII_DATALOG_BG THDB ON THDBD.LOGID = THDB.LOGID
                      WHERE THDBD.SCRAPNUM NOT IN (0)
 										 AND THDB.DATACODE IN (50)
-										 AND THDB.YYYYMMDD=TO_CHAR(@DATEBEGIN@,'YYYYMMDD')
+										 AND THDB.YYYYMMDD>=TO_CHAR(@DATEBEGIN@,'YYYYMMDD') AND THDB.YYYYMMDD<TO_CHAR(@DATEEND@,'YYYYMMDD')
                      GROUP BY groutingdailydetailid,SCRAPNUM) tt
             ON tt.groutingdailydetailid = a.groutingdailydetailid
            AND tt.outputnum = a.outputnum ) s

wwwroot/mes/rpt2/rpt8009/rpt_index.html

@@ -24,7 +24,7 @@
 
             <div id="tbSearchDiv" style="display:block;padding:10px;">
                 <form id="ffMaster">
-                    <div>
+                    <div>   
                         开始日期：
                         <input class="easyui-datebox" id="datebeginMaster" name="datebeginMaster" data-options="required:true,prompt:'',tipPosition:'top'" style="width:120px; height:32px;">
                         截止日期：