|
|
@@ -150,7 +150,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
// 成型线类型ids
|
|
|
if (!string.IsNullOrEmpty(se.GMouldTypeIDS))
|
|
|
{
|
|
|
- sql.Append("AND instr(','||:GMouldTypeIDS||',',','||TP_MST_GMouldType.gMouldTypeId||',')>0 ");
|
|
|
+ sql.Append(" AND instr(','||:GMouldTypeIDS||',',','||TP_MST_GMouldType.gMouldTypeId||',')>0 ");
|
|
|
parameters.Add(new OracleParameter(":GMouldTypeIDS", OracleDbType.NVarchar2, se.GMouldTypeIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
@@ -165,7 +165,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
// 产品编码模糊查询
|
|
|
if (!string.IsNullOrEmpty(se.GoodsCode))
|
|
|
{
|
|
|
- sql.Append("AND gdd.GOODSNAME LIKE " + "'%" + se.GoodsCode + "%'" + "");
|
|
|
+ sql.Append(" AND gdd.GOODSNAME LIKE " + "'%" + se.GoodsCode + "%'" + "");
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -173,28 +173,28 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
if (!string.IsNullOrEmpty(se.GoodsTypeIDS))
|
|
|
{
|
|
|
// sql.Append("AND instr(','||:GoodsTypeIDS||',',','||TP_MST_GOODSTYPE.GOODSTYPECode||',')=1 ");
|
|
|
- sql.Append("AND instr(TP_MST_GOODSTYPE.GOODSTYPECode,:GoodsTypeIDS)=1 ");
|
|
|
+ sql.Append(" AND instr(TP_MST_GOODSTYPE.GOODSTYPECode,:GoodsTypeIDS)=1 ");
|
|
|
parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
// 模具号
|
|
|
if (!string.IsNullOrEmpty(se.GroutingMouldCode))
|
|
|
{
|
|
|
- sql.Append("AND instr(gdd.GroutingMouldCode,:GroutingMouldCode)>0 ");
|
|
|
+ sql.Append(" AND instr(gdd.GroutingMouldCode,:GroutingMouldCode)>0 ");
|
|
|
parameters.Add(new OracleParameter(":GroutingMouldCode", OracleDbType.NVarchar2, se.GroutingMouldCode, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
// 注浆时间-开始
|
|
|
if (se.GroutingDateStart.HasValue)
|
|
|
{
|
|
|
- sql.Append("AND gdd.GroutingDate >= :GroutingDateStart ");
|
|
|
+ sql.Append(" AND gdd.GroutingDate >= :GroutingDateStart ");
|
|
|
parameters.Add(new OracleParameter(":GroutingDateStart", OracleDbType.Date, se.GroutingDateStart.Value, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
// 模具类型IDS
|
|
|
if (se.GroutingDateEnd.HasValue)
|
|
|
{
|
|
|
- sql.Append("AND gdd.GroutingDate <= :GroutingDateEnd ");
|
|
|
+ sql.Append(" AND gdd.GroutingDate <= :GroutingDateEnd ");
|
|
|
parameters.Add(new OracleParameter(":GroutingDateEnd", OracleDbType.Date, se.GroutingDateEnd.Value, ParameterDirection.Input));
|
|
|
}
|
|
|
if (se.GroutingBatchNo.HasValue)
|
|
|
@@ -207,20 +207,20 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
// 成型工号
|
|
|
if (!string.IsNullOrEmpty(se.GroutingUserCode))
|
|
|
{
|
|
|
- sql.Append("and gdd.UserCode LIKE " + "'%" + se.GroutingUserCode + "%'" + "");
|
|
|
+ sql.Append(" and gdd.UserCode LIKE " + "'%" + se.GroutingUserCode + "%'" + "");
|
|
|
}
|
|
|
|
|
|
// 未注浆原因
|
|
|
if (!string.IsNullOrEmpty(se.NoGroutingRreason))
|
|
|
{
|
|
|
- sql.Append("AND instr(b.dictionaryvalue,:NoGroutingRreason)>0 ");
|
|
|
+ sql.Append(" AND instr(b.dictionaryvalue,:NoGroutingRreason)>0 ");
|
|
|
parameters.Add(new OracleParameter(":NoGroutingRreason", OracleDbType.NVarchar2, se.NoGroutingRreason, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
// 生产工号IDS
|
|
|
if (!string.IsNullOrEmpty(se.CreateUserIDS))
|
|
|
{
|
|
|
- sql.Append("and instr(',' || :CreateUserIDS || ',' ,','||gdd.CreateUserID||',' )>0 ");
|
|
|
+ sql.Append(" and instr(',' || :CreateUserIDS || ',' ,','||gdd.CreateUserID||',' )>0 ");
|
|
|
parameters.Add(new OracleParameter(":CreateUserIDS", OracleDbType.NVarchar2, se.CreateUserIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
@@ -331,7 +331,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- sql.Append("AND INSTR(tp_pc_groutingline.GROUTINGLINECODE, :WorkShop) > 0");
|
|
|
+ sql.Append(" AND INSTR(tp_pc_groutingline.GROUTINGLINECODE, :WorkShop) > 0");
|
|
|
parameters.Add(new OracleParameter(":WorkShop", OracleDbType.NVarchar2, se.WorkShop, ParameterDirection.Input));
|
|
|
}
|
|
|
}
|