|
|
@@ -35,8 +35,15 @@ public class rpt : IHttpHandler, IReadOnlySessionState
|
|
|
goodsCodes = context.Request["GOODSCODE"].ToString().Split(',');
|
|
|
}
|
|
|
|
|
|
- string goodssql = @"SELECT GOODSID
|
|
|
- FROM TP_MST_GOODS where 1=1 ";
|
|
|
+ string goodssql = @" insert into TMP_MST_GOODS_HG (goodsid, goodscode, goodsname, goodsspecification, goodsmodel, goodstypeid, glazetypeid, logoid ) SELECT t.goodsid,
|
|
|
+ t.goodscode,
|
|
|
+ t.goodsname,
|
|
|
+ t.goodsspecification,
|
|
|
+ t.goodsmodel,
|
|
|
+ t.goodstypeid,
|
|
|
+ t.glazetypeid,
|
|
|
+ t.logoid
|
|
|
+ FROM TP_MST_GOODS t where 1=1 ";
|
|
|
if (goodsCodes.Length > 1 || goodsCodes[0] != "")
|
|
|
{
|
|
|
|
|
|
@@ -355,6 +362,8 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno and pdd.checkflag = 3
|
|
|
{
|
|
|
sqltmp = sqltmp.Replace("{strFactoryInspectionCheckTime}", strFactoryInspectionCheckTime);
|
|
|
}
|
|
|
+
|
|
|
+ conn.ExecuteNonQuery(goodssql);
|
|
|
conn.ExecuteNonQuery(sqltmp);
|
|
|
|
|
|
if (buding != "IN('1#','2#')")
|
|
|
@@ -419,10 +428,9 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno and pdd.checkflag = 3
|
|
|
ON G.GLAZETYPEID = D.DICTIONARYID
|
|
|
LEFT JOIN TP_MST_LOGO O
|
|
|
ON G.LOGOID = O.LOGOID
|
|
|
- LEFT JOIN TP_MST_GOODS M
|
|
|
+ inner JOIN TMP_MST_GOODS_HG M
|
|
|
ON G.GOODSID = M.GOODSID
|
|
|
- WHERE 1=1
|
|
|
- AND M.GOODSID IN({goodsCodes})
|
|
|
+ WHERE 1=1
|
|
|
AND L.BUILDINGNO {BUILDINGNO}
|
|
|
AND ( @LOGOID@ IS NULL OR G.LOGOID = @LOGOID@ )
|
|
|
AND (@GLAZETYPEID@ IS NULL OR G.GLAZETYPEID = @GLAZETYPEID@)
|
|
|
@@ -440,7 +448,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno and pdd.checkflag = 3
|
|
|
or t.合格数_改判<>0
|
|
|
or t.包装数_本烧<>0
|
|
|
or t.包装数_本烧回收<>0 or t.包装数_重烧<>0 or t.包装数_重烧回收<>0
|
|
|
- ".Replace("{BUILDINGNO}", buding).Replace("{goodsCodes}", goodssql);
|
|
|
+ ".Replace("{BUILDINGNO}", buding) ;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
@@ -501,10 +509,10 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno and pdd.checkflag = 3
|
|
|
ON G.GLAZETYPEID = D.DICTIONARYID
|
|
|
LEFT JOIN TP_MST_LOGO O
|
|
|
ON G.LOGOID = O.LOGOID
|
|
|
- LEFT JOIN TP_MST_GOODS M
|
|
|
+ inner JOIN TMP_MST_GOODS_HG M
|
|
|
ON G.GOODSID = M.GOODSID
|
|
|
WHERE 1=1
|
|
|
- AND M.GOODSID IN({goodsCodes})
|
|
|
+
|
|
|
AND L.BUILDINGNO {BUILDINGNO}
|
|
|
AND ( @LOGOID@ IS NULL OR G.LOGOID = @LOGOID@ )
|
|
|
AND (@GLAZETYPEID@ IS NULL OR G.GLAZETYPEID = @GLAZETYPEID@)
|
|
|
@@ -520,7 +528,7 @@ and rpd.kilncarbatchno = pdd.kilncarbatchno and pdd.checkflag = 3
|
|
|
or t.合格数_改判<>0
|
|
|
or t.包装数_本烧<>0
|
|
|
or t.包装数_本烧回收<>0 or t.包装数_重烧<>0 or t.包装数_重烧回收<>0
|
|
|
- ".Replace("{BUILDINGNO}", buding).Replace("{goodsCodes}", goodssql);
|
|
|
+ ".Replace("{BUILDINGNO}", buding) ;
|
|
|
|
|
|
}
|
|
|
|