|
|
@@ -54,7 +54,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
string groutinglineId = context.Request["groutinglineMaster[]"] is object ? context.Request["groutinglineMaster[]"].ToString() : "0,0";
|
|
|
if (groutinglineId == "0,0" && (context.Request["groutinglineMaster"] is object)) groutinglineId = context.Request["groutinglineMaster"].ToString();
|
|
|
if (groutinglineId == "") groutinglineId = "0,0";
|
|
|
-
|
|
|
+
|
|
|
string goodsId = context.Request["goodsMaster[]"] is object ? context.Request["goodsMaster[]"].ToString() : "0,0";
|
|
|
if (goodsId == "0,0" && (context.Request["goodsMaster"] is object)) goodsId = context.Request["goodsMaster"].ToString();
|
|
|
if (goodsId == "") goodsId = "0,0";
|
|
|
@@ -125,7 +125,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
|
|
|
WHERE GH.CREATETIME >= @DATEBEGIN@
|
|
|
AND GH.CREATETIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -162,7 +162,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
WHERE
|
|
|
GH.CREATETIME >= @DATEBEGIN@
|
|
|
AND GH.CREATETIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (@HIGHPRESSUREFLAG@ = '-1' OR GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ )
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -204,7 +204,7 @@ SELECT
|
|
|
SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -238,7 +238,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (2)
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -307,7 +307,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (2)
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -359,7 +359,7 @@ SELECT
|
|
|
SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -393,7 +393,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (3)
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -460,7 +460,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (3)
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -490,13 +490,15 @@ SUM(T.二车间) 半成品损坯数_二部全部,
|
|
|
SUM(T.三车间) 半成品损坯数_三部全部
|
|
|
FROM(
|
|
|
SELECT
|
|
|
- SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
|
|
|
- AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN 1 ELSE 0
|
|
|
+ SUM( CASE WHEN HGDI.WORKSHOP = 2
|
|
|
+ AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN
|
|
|
+ 1 ELSE 0
|
|
|
END) AS 一车间,
|
|
|
- SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'B') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
|
|
|
- AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN 1 ELSE 0
|
|
|
+ SUM(CASE WHEN HGDI.WORKSHOP = 2
|
|
|
+ AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN
|
|
|
+ 1 ELSE 0
|
|
|
END ) AS 二车间,
|
|
|
- SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN 1 ELSE 0
|
|
|
+ SUM(CASE WHEN HGDI.WORKSHOP = 3 THEN 1 ELSE 0
|
|
|
END ) 三车间,
|
|
|
TO_CHAR(SP.AUDITDATE, 'YYYYMM') 时间
|
|
|
FROM
|
|
|
@@ -513,7 +515,7 @@ SELECT
|
|
|
SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -522,13 +524,15 @@ SELECT
|
|
|
GROUP BY TO_CHAR(SP.AUDITDATE, 'YYYYMM')
|
|
|
UNION ALL-- 工序报损撤销
|
|
|
SELECT
|
|
|
- SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'A') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
|
|
|
- AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN -1 ELSE 0
|
|
|
+ SUM( CASE WHEN HGDI.WORKSHOP = 2
|
|
|
+ AND INSTR(GT.GOODSTYPECODE, '001002') = 1 THEN
|
|
|
+ -1 ELSE 0
|
|
|
END) AS 一车间,
|
|
|
- SUM(CASE WHEN (INSTR(GDD.GROUTINGLINECODE, 'B') = 1 OR INSTR(GDD.GROUTINGLINECODE, 'D') = 1)
|
|
|
- AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN -1 ELSE 0
|
|
|
+ SUM(CASE WHEN HGDI.WORKSHOP = 2
|
|
|
+ AND INSTR(GT.GOODSTYPECODE, '001001') = 1 THEN
|
|
|
+ -1 ELSE 0
|
|
|
END ) AS 二车间,
|
|
|
- SUM(CASE WHEN INSTR(GDD.GROUTINGLINECODE, 'C') = 1 THEN -1 ELSE 0
|
|
|
+ SUM(CASE WHEN HGDI.WORKSHOP = 3 THEN -1 ELSE 0
|
|
|
END ) 三车间,
|
|
|
TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') 时间
|
|
|
FROM
|
|
|
@@ -546,7 +550,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (0)
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@ -- AND SP.SCRAPTYPE IN (0, 2, 3)
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -555,9 +559,9 @@ SELECT
|
|
|
-- 干补报损
|
|
|
---------------------------------------------------
|
|
|
SELECT
|
|
|
- COUNT(CASE WHEN WORKSHOP = 1 THEN 1 ELSE 0 END) 一车间,
|
|
|
- COUNT(CASE WHEN WORKSHOP = 2 THEN 1 ELSE 0 END) 二车间,
|
|
|
- COUNT(CASE WHEN WORKSHOP = 3 THEN 1 ELSE 0 END) 三车间,
|
|
|
+ SUM(CASE WHEN WORKSHOP = 1 THEN 1 ELSE 0 END) 一车间,
|
|
|
+ SUM(CASE WHEN WORKSHOP = 2 THEN 1 ELSE 0 END) 二车间,
|
|
|
+ SUM(CASE WHEN WORKSHOP = 3 THEN 1 ELSE 0 END) 三车间,
|
|
|
TO_CHAR(AUDITDATE, 'YYYYMM') 时间
|
|
|
FROM
|
|
|
(
|
|
|
@@ -612,7 +616,7 @@ SELECT
|
|
|
AND SP.SCRAPTYPE IN (0)
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -665,7 +669,7 @@ SELECT
|
|
|
AND SP.GOODSLEVELTYPEID = 9
|
|
|
AND SP.SPECIALREPAIRTIME >= @DATEBEGIN@
|
|
|
AND SP.SPECIALREPAIRTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -729,7 +733,7 @@ SELECT
|
|
|
INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
|
|
|
WHERE PD.CREATETIME >= @DATEBEGIN@
|
|
|
AND PD.CREATETIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -821,7 +825,7 @@ SELECT BAR.GOODSCODE,
|
|
|
INNER JOIN TP_PC_GROUTINGLINE GL ON GDD.GROUTINGLINEID = GL.GROUTINGLINEID
|
|
|
WHERE GH.FHUSERID IS NOT NULL
|
|
|
AND GH.FHTIME >= @DATEBEGIN@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -906,7 +910,7 @@ SELECT BAR.GOODSCODE,
|
|
|
WHERE GH.FHUSERID IS NOT NULL
|
|
|
AND GH.FHTIME >= @DATEBEGIN@
|
|
|
AND GH.FHTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -989,7 +993,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1070,7 +1074,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1149,7 +1153,7 @@ SELECT GOODSCODE,
|
|
|
--AND SP.SCRAPTYPE = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1252,7 +1256,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1306,7 +1310,7 @@ SELECT GOODSCODE,
|
|
|
GT.GOODSTYPECODE,
|
|
|
DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
|
|
|
G.GOODS_LINE_CODE,
|
|
|
- TO_CHAR(SP.AUDITDATE, 'YYYYMM') AS CHARG,
|
|
|
+ TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') AS CHARG,
|
|
|
--TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
|
|
|
HGDI.WORKSHOP AS HGDIWORKSHOP,
|
|
|
-- 如果参与了重烧，则判断这个条码是否走过3#卸窑
|
|
|
@@ -1333,7 +1337,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1414,7 +1418,7 @@ SELECT GOODSCODE,
|
|
|
--AND SP.SCRAPTYPE = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1518,7 +1522,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1599,7 +1603,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1680,7 +1684,7 @@ SELECT GOODSCODE,
|
|
|
--AND SP.SCRAPTYPE = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1783,7 +1787,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1837,7 +1841,7 @@ SELECT GOODSCODE,
|
|
|
GT.GOODSTYPECODE,
|
|
|
DECODE(GDD.TESTMOULDFLAG, 0, 'C', 1, 'Y', '-') AS TESTMOULDFLAG,
|
|
|
G.GOODS_LINE_CODE,
|
|
|
- TO_CHAR(SP.AUDITDATE, 'YYYYMM') AS CHARG,
|
|
|
+ TO_CHAR(SP.BACKOUTTIME, 'YYYYMM') AS CHARG,
|
|
|
--TO_CHAR(SP.AUDITDATE, 'yyyymm') AS CHARG,
|
|
|
HGDI.WORKSHOP AS HGDIWORKSHOP,
|
|
|
-- 如果参与了重烧，则判断这个条码是否走过3#卸窑
|
|
|
@@ -1864,7 +1868,7 @@ SELECT GOODSCODE,
|
|
|
WHERE SP.AUDITSTATUS = 1
|
|
|
AND SP.BACKOUTTIME >= @DATEBEGIN@
|
|
|
AND SP.BACKOUTTIME < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
|
|
@@ -1945,7 +1949,7 @@ SELECT GOODSCODE,
|
|
|
--AND SP.SCRAPTYPE = 1
|
|
|
AND SP.AUDITDATE >= @DATEBEGIN@
|
|
|
AND SP.AUDITDATE < @DATEEND@
|
|
|
- AND (G.GOODSID IN (0,0) OR '0,0' = '0,0')
|
|
|
+ AND (G.GOODSID IN ({GOODSID}) OR '{GOODSID}' = '0,0')
|
|
|
AND (GDD.GROUTINGLINEID IN (0,0) OR '0,0' = '0,0')
|
|
|
AND (GL.HIGHPRESSUREFLAG = @HIGHPRESSUREFLAG@ OR @HIGHPRESSUREFLAG@ = '-1')
|
|
|
{TESTMOULDFLAG}
|
xuwei