|
|
@@ -16517,7 +16517,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
List<OracleParameter> oracleParameters = new List<OracleParameter>();
|
|
|
oracleParameters.Add(new OracleParameter(":accountid", sUserInfo.AccountID));
|
|
|
|
|
|
- string sqlString = "select g.goodscode\n" +
|
|
|
+ /*string sqlString = "select g.goodscode\n" +
|
|
|
" ,tt.d_num\n" +
|
|
|
" ,tt.b_num\n" +
|
|
|
" ,tt.f_num\n" +
|
|
|
@@ -16559,7 +16559,70 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" group by t.goodsid) tt\n" +
|
|
|
" inner join tp_mst_goods g\n" +
|
|
|
" on tt.goodsid = g.goodsid\n" +
|
|
|
+ " order by g.goodscode";*/
|
|
|
+
|
|
|
+ //2021年11月12日08:40:51 by fy modify 增加干补列，报废率改为合格率。合格率= 1 – (半检不合格＋复检不合格＋损坯数–干补数) / 交坯数
|
|
|
+ ////*************************************************修改开始*******************************************************
|
|
|
+ string sqlString = "select g.goodscode\n" +
|
|
|
+ " ,tt.d_num\n" +
|
|
|
+ " ,tt.b_num\n" +
|
|
|
+ " ,tt.f_num\n" +
|
|
|
+ " ,tt.s_num\n" +
|
|
|
+ " ,tt.g_num\n" +
|
|
|
+ " ,decode(tt.d_num\n" +
|
|
|
+ " ,0\n" +
|
|
|
+ " ,to_number(null)\n" +
|
|
|
+ " ,round(1-(tt.b_num + tt.f_num + tt.s_num - tt.g_num) / tt.d_num,4)) hg_r\n" +
|
|
|
+ " from (select t.goodsid\n" +
|
|
|
+ " ,nvl(sum(decode(t.numtype, 'A', t.id_num, 0)), 0) d_num -- 交坯\n" +
|
|
|
+ " ,nvl(sum(decode(t.numtype, '2', t.id_num, 0)), 0) b_num -- 半检不合格数\n" +
|
|
|
+ " ,nvl(sum(decode(t.numtype, '3', t.id_num, 0)), 0) f_num -- 复检不合格数\n" +
|
|
|
+ " ,nvl(sum(decode(t.numtype, '0', t.id_num, 0)), 0) s_num -- 损坯数\n" +
|
|
|
+ " ,nvl(sum(decode(t.numtype, 'B', t.id_num, 0)), 0) g_num -- 干补数\n" +
|
|
|
+ " from (select gdd.goodsid\n" +
|
|
|
+ " ,'A' numtype\n" +
|
|
|
+ " ,count(gdd.groutingdailydetailid) id_num\n" +
|
|
|
+ " from tp_pm_groutingdailydetail gdd\n" +
|
|
|
+ " where gdd.groutingflag = '1'\n" +
|
|
|
+ " and gdd.valueflag = '1'\n" +
|
|
|
+ " and gdd.accountid = :accountid\n" +
|
|
|
+ " and gdd.deliverflag = '1'\n" +
|
|
|
+ " and gdd.delivertime >= :datebegin\n" +
|
|
|
+ " and gdd.delivertime < :dateend\n" +
|
|
|
+ " group by gdd.goodsid\n" +
|
|
|
+ " union all\n" +
|
|
|
+ " -- 半检不合格数 复检不合格数 损坯数\n" +
|
|
|
+ " select sp.goodsid\n" +
|
|
|
+ " ,sp.SCRAPTYPE numtype\n" +
|
|
|
+ " ,count(sp.scrapproductid) id_num\n" +
|
|
|
+ " from tp_pm_scrapproduct sp\n" +
|
|
|
+ " where sp.valueflag = '1'\n" +
|
|
|
+ " and sp.accountid = :accountid\n" +
|
|
|
+ " and sp.auditstatus = 1\n" +
|
|
|
+ " and sp.KILNID is null\n" +
|
|
|
+ " and sp.SCRAPTYPE <> '1'\n" +
|
|
|
+ " and sp.AUDITDATE >= :datebegin\n" +
|
|
|
+ " and sp.AUDITDATE < :dateend\n" +
|
|
|
+ " group by sp.goodsid, sp.SCRAPTYPE" +
|
|
|
+ " union all\n" +
|
|
|
+ " -- 干补数\n" +
|
|
|
+ " select pd.goodsid\n" +
|
|
|
+ " ,'B' numtype\n" +
|
|
|
+ " ,count( pd.productiondataid ) id_num \n" +
|
|
|
+ " from tp_pm_productiondata pd \n" +
|
|
|
+ " where pd.valueflag = 1 \n" +
|
|
|
+ " and pd.accountid = :accountid \n" +
|
|
|
+ " and pd.procedureid = 18 \n" +
|
|
|
+ " and pd.specialrepairflag = 1\n" +
|
|
|
+ " and pd.createtime >= :datebegin \n" +
|
|
|
+ " and pd.createtime < :dateend \n" +
|
|
|
+ " group by pd.goodsid \n" +
|
|
|
+ ") t\n" +
|
|
|
+ " group by t.goodsid) tt\n" +
|
|
|
+ " inner join tp_mst_goods g\n" +
|
|
|
+ " on tt.goodsid = g.goodsid\n" +
|
|
|
" order by g.goodscode";
|
|
|
+ //*************************************************修改结束*******************************************************
|
|
|
|
|
|
oracleParameters.Add(new OracleParameter(":datebegin", cre.Properties["datebegin"]));
|
|
|
oracleParameters.Add(new OracleParameter(":dateend", cre.Properties["dateend"]));
|
feiy