|
|
@@ -3235,6 +3235,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
parameters.Add(new OracleParameter(":in_AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input));
|
|
|
parameters.Add(new OracleParameter(":in_rptProcedureId", OracleDbType.Int32, se.RptProcedureID, ParameterDirection.Input));
|
|
|
parameters.Add(new OracleParameter(":in_rptSprocedureId", OracleDbType.Int32, se.RptSProcedureID, ParameterDirection.Input));
|
|
|
+ parameters.Add(new OracleParameter(":in_finishedprocedureids", OracleDbType.Varchar2, se.RptCJProcedureIDS, ParameterDirection.Input));
|
|
|
|
|
|
string sqlString = "select qdgroup.gid\n" +
|
|
|
" ,qdgroup.productionlinename\n" +
|
|
|
@@ -3287,6 +3288,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,0\n" +
|
|
|
" ,to_number(null)\n" +
|
|
|
" ,round(qdgroup.ReFireCount / qdgroup.OutKilnCount, 4)) ReFirePercent\n" +
|
|
|
+ " ,qdgroup.cjprocedurename\n " +//add xiacm 2022-10-25
|
|
|
" from (select grouping_id(pcpl.productionlinename\n" +
|
|
|
" ,pcp.procedurename\n" +
|
|
|
" ,mstkiln.kilncode\n" +
|
|
|
@@ -3306,6 +3308,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 6, 1, 0)), 0) ReFireCount\n" +
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 7, 1, 0)), 0) SubstandardCount\n" +
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 0, 1, 5, -1, 6, -1, 7, -1, 0)), 0) GoodCount\n" +
|
|
|
+ " ,ppcc.cjprocedurename\n" + //add xiacm 2022-10-25
|
|
|
" from (select 0 goodsleveltypeid -- 出窑数量\n" +
|
|
|
" ,pd.barcode\n" +
|
|
|
" ,pd.productionlineid\n" +
|
|
|
@@ -3314,10 +3317,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,pd.kilncarbatchno\n" +
|
|
|
" ,0 procedureid\n" +
|
|
|
" ,1 cc\n" +
|
|
|
+ " ,tp.procedurename cjprocedurename\n" +//add xiacm 2022-10-25
|
|
|
" from tp_pm_productiondata pd\n" +
|
|
|
+ " left join tp_pc_procedure tp--成检工序\n" +//add xiacm 2022-10-25
|
|
|
+ " on pd.finishedprocedureid = tp.procedureid\n" +
|
|
|
" where pd.valueflag = '1'\n" +
|
|
|
" and pd.procedureid = :in_rptSprocedureId\n" +
|
|
|
- " and pd.accountid = :in_AccountID\n";
|
|
|
+ " and pd.accountid = :in_AccountID\n" +
|
|
|
+ " and（:in_finishedprocedureids is null or :in_finishedprocedureids = '' " +//add xiacm 2022-10-25
|
|
|
+ " or instr (','||:in_finishedprocedureids||',',','||pd.finishedprocedureid||',')>0)--成检工序\n";
|
|
|
|
|
|
StringBuilder selSql = new StringBuilder(sqlString);
|
|
|
if (se.CreateTimeStart.HasValue)
|
|
|
@@ -3356,15 +3364,21 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,ppd.kilncarbatchno\n" +
|
|
|
" ,dd.defectprocedureid procedureid\n" +
|
|
|
" ,1 cc\n" +
|
|
|
+ " ,ppd.cjprocedurename\n" +//add xiacm 2022-10-25
|
|
|
" from (select pd.productiondataid\n" +
|
|
|
" ,pd.goodsleveltypeid\n" +
|
|
|
" ,pd.kilnid\n" +
|
|
|
" ,pd.kilncarbatchno\n" +
|
|
|
+ " ,pcpd.procedurename cjprocedurename\n" + //add xiacm 2022-10-25
|
|
|
" from tp_pm_productiondata pd\n" +
|
|
|
+ " left join tp_pc_procedure pcpd\n" +//add xiacm 2022-10-25
|
|
|
+ " on pd.finishedprocedureid = pcpd.procedureid\n" +
|
|
|
" where pd.valueflag = '1'\n" +
|
|
|
" and pd.AccountID = :in_AccountID\n" +
|
|
|
" and length(pd.kilncarbatchno) > 0\n" +
|
|
|
- " and pd.modeltype = -1\n";
|
|
|
+ " and pd.modeltype = -1\n" +
|
|
|
+ //add xiacm 2022-10-25
|
|
|
+ "and（:in_finishedprocedureids is null or :in_finishedprocedureids = '' or instr (','||:in_finishedprocedureids||',',','||pd.finishedprocedureid||',')>0)--成检工序\n";
|
|
|
selSql.Append(sqlString);
|
|
|
if (se.CreateTimeStart.HasValue)
|
|
|
{
|
|
|
@@ -3453,7 +3467,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
sqlString =
|
|
|
- " group by grouping sets((pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, pdata.usercode, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode),(pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode),(pcpl.productionlinename, pcp.displayno, pcp.procedurename))\n" +
|
|
|
+ " group by grouping sets((pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, pdata.usercode, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode,ppcc.cjprocedurename),(pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, pcp.displayno, pcp.procedurename, mstkiln.kilncode),(pcpl.productionlinename, pcp.displayno, pcp.procedurename))\n" +
|
|
|
" order by pcpl.productionlinename\n" +
|
|
|
" ,pcp.displayno\n" +
|
|
|
" ,pcp.procedurename\n" +
|
|
|
@@ -3863,7 +3877,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
{
|
|
|
parameters.Add(new OracleParameter(":in_AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input));
|
|
|
parameters.Add(new OracleParameter(":in_rptSprocedureId", OracleDbType.Int32, se.RptSProcedureID, ParameterDirection.Input));
|
|
|
-
|
|
|
+ parameters.Add(new OracleParameter(":in_CJprocedureids", OracleDbType.Varchar2,se.CJProcedureIDS,ParameterDirection.Input));
|
|
|
string sqlString = "select qdgroup.gid\n" +
|
|
|
" ,decode(qdgroup.gid, 7, '总计', qdgroup.productionlinename) productionlinename\n" +
|
|
|
" ,decode(qdgroup.gid\n" +
|
|
|
@@ -3908,6 +3922,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,0\n" +
|
|
|
" ,to_number(null)\n" +
|
|
|
" ,round(qdgroup.ReFireCount / qdgroup.OutKilnCount, 4)) ReFirePercent\n" +
|
|
|
+ " ,qdgroup.cjprocedurename --成检工序\n" + //add xiacm 2022-10-26
|
|
|
" from (select grouping_id(pcpl.productionlinename\n" +
|
|
|
" ,mstkiln.kilncode\n" +
|
|
|
" ,mstgoodstype2.goodstypecode\n" +
|
|
|
@@ -3922,6 +3937,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 6, 1, 0)), 0) ReFireCount\n" +
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 7, 1, 0)), 0) SubstandardCount\n" +
|
|
|
" ,nvl(sum(decode(ppcc.goodsleveltypeid, 0, 1, 5, -1, 6, -1, 7, -1, 0)), 0) GoodCount\n" +
|
|
|
+ " ,ppcc.cjprocedurename --成检工序\n" + //add xiacm 2022-10-26
|
|
|
" from (select 0 goodsleveltypeid -- 出窑数量\n" +
|
|
|
" ,pd.barcode\n" +
|
|
|
" ,pd.productionlineid\n" +
|
|
|
@@ -3929,12 +3945,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,pd.kilnid\n" +
|
|
|
" ,pd.kilncarbatchno\n" +
|
|
|
" ,1 cc\n" +
|
|
|
+ " ,cjpd.procedurename cjprocedurename --成检工序\n" + //add xiacm 2022-10-26
|
|
|
" from tp_pm_productiondata pd\n" +
|
|
|
" inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = pd.groutingdailydetailid\n" +
|
|
|
+ " LEFT join TP_PC_PROCEDURE cjpd on pd.FINISHEDPROCEDUREID = cjpd.procedureid --成检工序\n" + //add xiacm 2022-10-26
|
|
|
// 恒洁三车间特殊处理（质量相关）
|
|
|
//" where pd.valueflag = '1'\n" +
|
|
|
//" and pd.procedureid = :in_rptSprocedureId\n" +
|
|
|
" where pd.accountid = :in_AccountID\n" +
|
|
|
+ " and (:in_CJprocedureids='' or :in_CJprocedureids is null or instr(','||:in_CJprocedureids||',',','||pd.finishedprocedureid||',')>0)--成检工序\n" +//add xiacm 2022-10-26
|
|
|
" AND ((:in_rptSprocedureId = 11 AND ((pd.procedureid = 11 AND pd.valueflag = '1') OR (pd.procedureid =104 AND pd.isrefire = '0' AND pd.checkflag = '1'))) \n" +
|
|
|
" OR (:in_rptSprocedureId = 58 AND ((pd.procedureid = 58 AND pd.valueflag = '1') OR (pd.procedureid =104 AND pd.isrefire = '6' AND pd.checkflag = '1'))) \n" +
|
|
|
" OR (:in_rptSprocedureId not in (11,58) AND pd.valueflag = '1' AND pd.procedureid = :in_rptSprocedureId))\n"
|
|
|
@@ -4017,11 +4036,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,pd.kilnid\n" +
|
|
|
" ,pd.kilncarbatchno\n" +
|
|
|
" ,1 cc\n" +
|
|
|
+ " ,cjpd.procedurename cjprocedurename --成检工序\n" +
|
|
|
" from tp_pm_productiondata pd\n" +
|
|
|
" inner join tp_pm_groutingdailydetail gdd on gdd.groutingdailydetailid = pd.groutingdailydetailid\n" +
|
|
|
+ " LEFT join TP_PC_PROCEDURE cjpd on pd.FINISHEDPROCEDUREID = cjpd.procedureid --成检工序\n" +
|
|
|
" where pd.valueflag = '1'\n" +
|
|
|
" and pd.modeltype = -1\n" +
|
|
|
" and pd.AccountID = :in_AccountID\n" +
|
|
|
+ " and (:in_CJprocedureids='' or :in_CJprocedureids is null or instr(','||:in_CJprocedureids||',',','||pd.finishedprocedureid||',')>0)--成检工序\n" +//add xiacm 2022-10-26
|
|
|
" and length(pd.kilncarbatchno) > 0\n";
|
|
|
selSql.Append(sqlString);
|
|
|
// 试验标识
|
|
|
@@ -4125,7 +4147,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
sqlString =
|
|
|
- " group by grouping sets((pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode),(pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, mstkiln.kilncode),(pcpl.productionlinename))\n" +
|
|
|
+ " group by grouping sets((pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename, mstgoodstype.goodstypecode, mstgoodstype.goodstypename, mstgoods.goodscode,ppcc.cjprocedurename),(pcpl.productionlinename, mstkiln.kilncode, mstgoodstype2.goodstypecode, mstgoodstype2.goodstypename),(pcpl.productionlinename, mstkiln.kilncode),(pcpl.productionlinename))\n" +
|
|
|
" order by pcpl.productionlinename\n" +
|
|
|
" ,mstkiln.kilncode\n" +
|
|
|
" ,mstgoodstype2.goodstypecode\n" +
|
|
|
@@ -4703,6 +4725,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" 0,\n" +
|
|
|
" to_number(NULL),\n" +
|
|
|
" ROUND(Defect.DefectCount / OUT.outNum, 4)) DefectPercent\n" +
|
|
|
+ " ,pcpd.procedurename CJprocedurename --成检工序\n" + //add xiacm 2022-11-02
|
|
|
" FROM (SELECT tp_pc_productionline.productionlinename\n" +
|
|
|
" ,tp_pc_procedure.procedurename\n" +
|
|
|
" ,TP_MST_DefectType.Defecttypename\n" +
|
|
|
@@ -4749,6 +4772,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,goodstype2.goodstypecode\n" +
|
|
|
" ,goodstype2.goodstypename) Defect\n" +
|
|
|
" LEFT JOIN ( SELECT gt2.goodstypecode goodstypecode2, COUNT(pd.barcode) outNum\n" +
|
|
|
+ " ,pd.finishedprocedureid\n" + //add xiacm 2022-11-02
|
|
|
" FROM tp_pm_productiondata pd\n" +
|
|
|
" LEFT JOIN tp_mst_goods g on g.goodsid = pd.goodsid\n" +
|
|
|
" LEFT JOIN tp_mst_goodstype gt on g.goodstypeid = gt.goodstypeid\n" +
|
|
|
@@ -4764,8 +4788,15 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" AND pd.AccountID = :AccountID\n" +
|
|
|
" AND (:createtimebegin is null or pd.createtime >= :createtimebegin)\n" +
|
|
|
" AND (:createtimeend is null or pd.createtime <= :createtimeend)\n" +
|
|
|
- " GROUP BY gt2.goodstypecode) OUT \n" +
|
|
|
- " ON OUT.goodstypecode2 = Defect.goodstypecode2 \n";
|
|
|
+ " GROUP BY gt2.goodstypecode,pd.finishedprocedureid) OUT \n" +//add xiacm 2022-11-02 pd.finishedprocedureid
|
|
|
+ " ON OUT.goodstypecode2 = Defect.goodstypecode2 \n" +
|
|
|
+ " left join tp_pc_procedure pcpd on pcpd.procedureid=OUT.finishedprocedureid\n";
|
|
|
+
|
|
|
+ if (!string.IsNullOrEmpty(se.CJprocedureids))
|
|
|
+ {
|
|
|
+ sqlString += " where (:CJprocedureid is null or :CJprocedureid = '' or instr(','||:CJprocedureid||',',','||pcpd.procedureid||',')>0)";
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
parameters = new OracleParameter[]
|
|
|
{
|
|
|
@@ -4777,6 +4808,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
new OracleParameter(":DefectName", OracleDbType.NVarchar2, se.DefectName, ParameterDirection.Input),
|
|
|
//new OracleParameter(":OutKilnCount", OracleDbType.Int32, outKilnCount, ParameterDirection.Input),
|
|
|
new OracleParameter(":in_rptSprocedureId", OracleDbType.Int32, se.RptSProcedureID, ParameterDirection.Input),
|
|
|
+ new OracleParameter(":CJprocedureid",OracleDbType.Varchar2,se.CJprocedureids,ParameterDirection.Input),
|
|
|
};
|
|
|
}
|
|
|
else
|
|
|
@@ -4786,6 +4818,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
// 恒洁三车间特殊处理（质量相关）
|
|
|
//" WHERE pd.valueflag = '1'\n" +
|
|
|
//" AND pd.procedureid = :procedureid\n" +
|
|
|
+ " left join tp_pc_procedure pcpd on pd.finishedprocedureid = pcpd.procedureid\n" +
|
|
|
" where ((pd.procedureid <> 104 and pd.valueflag = '1') or (pd.procedureid = 104 and pd.checkflag = '1')) \n" +
|
|
|
" and ((:in_rptSprocedureId = 11 AND ((pd.procedureid = 11 ) OR (pd.procedureid =104 AND pd.isrefire = '0'))) \n" +
|
|
|
" OR (:in_rptSprocedureId = 58 AND ((pd.procedureid = 58) OR (pd.procedureid =104 AND pd.isrefire = '6'))) \n" +
|
|
|
@@ -4794,13 +4827,18 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" AND pd.AccountID = :AccountID\n" +
|
|
|
" AND (:createtimebegin is null or pd.createtime >= :createtimebegin)\n" +
|
|
|
" AND (:createtimeend is null or pd.createtime <= :createtimeend)";
|
|
|
-
|
|
|
+ //add xiacm 2022-11-02
|
|
|
+ if(!string.IsNullOrEmpty(se.ProcedureIDS))
|
|
|
+ {
|
|
|
+ sqlString += " AND (:CJprocedureids is null or :CJprocedureid = '' or instr(','||:CJprocedureid||',',','||pd.finishedprocedureid||',')>0)";
|
|
|
+ }
|
|
|
parameters = new OracleParameter[]
|
|
|
{
|
|
|
new OracleParameter(":AccountID", OracleDbType.Int32, user.AccountID, ParameterDirection.Input),
|
|
|
new OracleParameter(":in_rptSprocedureId", OracleDbType.Int32, se.RptSProcedureID, ParameterDirection.Input),
|
|
|
new OracleParameter(":createtimebegin", OracleDbType.Date, se.CreateTimeStart, ParameterDirection.Input),
|
|
|
new OracleParameter(":createtimeend", OracleDbType.Date, se.CreateTimeEnd, ParameterDirection.Input),
|
|
|
+ new OracleParameter(":CJprocedureids", OracleDbType.Varchar2, se.CJprocedureids, ParameterDirection.Input),
|
|
|
};
|
|
|
int outKilnCount = Convert.ToInt32(conn.GetSqlResultToStr(sqlString, parameters));
|
|
|
|
|
|
@@ -10236,6 +10274,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
selSql += " ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear\n";
|
|
|
}
|
|
|
selSql += " ,tmdd.DICTIONARYVALUE AS KilnLocation\n" +
|
|
|
+ " ,pcpd.procedurename CJprocedurename\n" +//add xiacm 2022-10-31 成检工序名称
|
|
|
" FROM tp_pm_defect pmd\n" +
|
|
|
" LEFT JOIN TP_MST_Goods g\n" +
|
|
|
" ON pmd.Goodsid = g.Goodsid\n" +
|
|
|
@@ -10263,7 +10302,11 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" AND ((:HandOverProcedureID = 1 AND ((hopd.procedureid = 11 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '0' AND hopd.checkflag = '1'))) \n" +
|
|
|
" OR (:HandOverProcedureID = 5 AND ((hopd.procedureid = 58 AND hopd.valueflag = '1') OR (hopd.procedureid =104 AND hopd.isrefire = '6' AND hopd.checkflag = '1'))) \n" +
|
|
|
" OR (:HandOverProcedureID not in (1,5) AND hopd.valueflag = '1' AND hopd.procedureid = (select procedureid from tp_mst_rptsprocedure t where t.rptprocedureid = :HandOverProcedureID)))\n" +
|
|
|
- // end
|
|
|
+ // end
|
|
|
+ //add xiacm 2022-10-31 成检工序表 start
|
|
|
+ " left join tp_pc_procedure pcpd\n" +
|
|
|
+ " on hopd.finishedprocedureid = pcpd.procedureid\n" +
|
|
|
+ //end
|
|
|
" LEFT JOIN TP_MST_DefectFine mstdf\n" +
|
|
|
" ON pmd.DefectFine = mstdf.DefectFineID\n" +
|
|
|
" LEFT JOIN tp_mst_logo logo\n" +
|
|
|
@@ -10418,6 +10461,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
selSql += " AND gdd.TestMouldFlag = :TestMouldFlag ";
|
|
|
parameters.Add(new OracleParameter(":TestMouldFlag", OracleDbType.Char, se.TestMouldFlag, ParameterDirection.Input));
|
|
|
}
|
|
|
+ // 成检工序 add xiacm 2022-10-31
|
|
|
+ if (!string.IsNullOrEmpty(se.CJProcedureIDS))
|
|
|
+ {
|
|
|
+ selSql += " and (:CJprocedureid is null or :CJprocedureid = '' or instr(','||:CJprocedureid||',',','||pcpd.procedureid||',')>0)";
|
|
|
+ parameters.Add(new OracleParameter(":CJprocedureid", OracleDbType.Char, se.CJProcedureIDS, ParameterDirection.Input));
|
|
|
+ }
|
|
|
//if (!string.IsNullOrEmpty(se.PurViewUserCodeIDS))
|
|
|
//{
|
|
|
// selSql = selSql + " AND instr(','||:PurViewUserCodeIDS||',',','||TP_PM_Defect.DefectUserID||',')>0 ";
|
|
|
@@ -10586,6 +10635,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 3 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) -1 ) AS Kcode1\n" +
|
|
|
" ,SUBSTR( pd.KILNCARBATCHNO, INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) + 1, INSTR( pd.KILNCARBATCHNO, '$', 1, 2 ) - INSTR( pd.KILNCARBATCHNO, '$', 1, 1 ) -1 ) AS Fyear1\n" +
|
|
|
" ,tmdd.DICTIONARYVALUE AS KilnLocation \n" +
|
|
|
+ " ,PCPD.Procedurename QXCJProcedurename\n" + //add xiacm 2022-11-01
|
|
|
" FROM tp_pm_defect pmd\n" +
|
|
|
" LEFT JOIN TP_PC_Procedure p\n" +
|
|
|
" ON p.procedureid = pmd.procedureid\n" +
|
|
|
@@ -10628,13 +10678,14 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ON pd.logoid = logo.logoid\n" +
|
|
|
" LEFT JOIN TP_MST_DATADICTIONARY tmdd ON pd.kilncarposition = tmdd.dictionaryid\n" +
|
|
|
" AND tmdd.dictionarytype = 'TPC003'\n" +
|
|
|
+ " LEFT JOIN TP_PC_PROCEDURE PCPD ON HOPD.Finishedprocedureid = pcpd.procedureid\n" + //add xiacm 2022-11-01
|
|
|
//" LEFT JOIN (SELECT def.barcode, wmsys.wm_concat( to_char(def.defectcode)) alldefectcode\n" +
|
|
|
//" FROM tp_pm_defect def\n" +
|
|
|
//" WHERE def.valueflag = '1'\n" +
|
|
|
////def.createtime
|
|
|
//" group by def.barcode ) d\n" +
|
|
|
//" ON d.barcode = pmd.barcode\n" +
|
|
|
- " WHERE pmd.valueflag = '1' \n" +
|
|
|
+ " WHERE pmd.valueflag = '1' \n" +
|
|
|
" AND pd.ModelType = -1\n" +
|
|
|
" AND pmd.AccountID = :AccountID\n";
|
|
|
|
|
|
@@ -10791,7 +10842,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
selSql = selSql + " AND hopd.CreateTime<= :HandOverTimeEnd ";
|
|
|
parameters.Add(new OracleParameter(":HandOverTimeEnd", OracleDbType.Date, se.HandOverTimeEnd.Value, ParameterDirection.Input));
|
|
|
}
|
|
|
-
|
|
|
+ //add xiacm 2022-11-01
|
|
|
+ if(!string.IsNullOrEmpty(se.CJProcedureIDS))
|
|
|
+ {
|
|
|
+ selSql += "AND (:CJprocedureid is null or :CJprocedureid = '' or instr(','||:CJprocedureid||',',','||pcpd.procedureid||',')>0) ";
|
|
|
+ parameters.Add(new OracleParameter(":CJprocedureid", OracleDbType.Varchar2, se.CJProcedureIDS, ParameterDirection.Input));
|
|
|
+ }
|
|
|
//selSql = selSql + " order by pmd.productionlinename,pmd.procedurename,pmd.defectprocedurename,pmd.defectusercode ";
|
|
|
selSql = selSql + " order by pmd.productionlinename,p.DISPLAYNO,pdd.DISPLAYNO,dt.DISPLAYNO,mstd.DISPLAYNO,pmd.defectusercode,pmd.barcode ";
|
|
|
return selSql;
|
|
|
@@ -10930,6 +10986,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
" ,proddata.UserCode prousercode\n" +
|
|
|
" ,proddata.PROCEDURENAME proname\n" +
|
|
|
" ,pd.KILNCARCODE KILNCARCODE\n" +
|
|
|
+ " ,pcpd.procedurename GXCJprocedurename\n"+ //add xiacm 2022-11-01
|
|
|
" FROM tp_pm_defect pmd\n" +
|
|
|
" INNER JOIN tp_pm_productiondata proddata\n" +
|
|
|
" ON proddata.barcode = pmd.barcode\n " +
|
|
|
@@ -10976,6 +11033,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
////def.createtime
|
|
|
//" group by def.barcode ) d\n" +
|
|
|
//" ON d.barcode = pmd.barcode\n" +
|
|
|
+ "left join tp_pc_procedure pcpd on hopd.finishedprocedureid = pcpd.procedureid\n" + //add xiacm 2022-11-01
|
|
|
" WHERE pmd.valueflag = '1' \n" +
|
|
|
" AND pd.ModelType = -1\n" +
|
|
|
" AND pmd.AccountID = :AccountID\n";
|
|
|
@@ -11121,7 +11179,12 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
selSql = selSql + " AND hopd.CreateTime<= :HandOverTimeEnd ";
|
|
|
parameters.Add(new OracleParameter(":HandOverTimeEnd", OracleDbType.Date, se.HandOverTimeEnd.Value, ParameterDirection.Input));
|
|
|
}
|
|
|
-
|
|
|
+ //add xiacm 2022-11-01
|
|
|
+ if (!string.IsNullOrEmpty(se.CJProcedureIDS))
|
|
|
+ {
|
|
|
+ selSql += " AND (:CJprocedureid is null or :CJprocedureid = '' or instr(','||:CJprocedureid||',',','||pcpd.procedureid||',')>0) ";
|
|
|
+ parameters.Add(new OracleParameter(":CJprocedureid", OracleDbType.Varchar2, se.CJProcedureIDS, ParameterDirection.Input));
|
|
|
+ }
|
|
|
//selSql = selSql + " order by pmd.productionlinename,p.DISPLAYNO,pdd.DISPLAYNO,dt.DISPLAYNO,mstd.DISPLAYNO,pmd.defectusercode,pmd.barcode ";
|
|
|
selSql = selSql + " order by proddata.CheckTime ";
|
|
|
return selSql;
|
xiacm