|
|
@@ -682,7 +682,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
if (!string.IsNullOrEmpty(se.GroutingLineCode))
|
|
|
{
|
|
|
//sql.Append(" AND TP_PM_InProduction.GROUTINGLINECODE like :GROUTINGLINECODE ");
|
|
|
- sql.Append(" AND instr(pd.GROUTINGLINECODE,:GROUTINGLINECODE)>0");
|
|
|
+ sql.Append(" AND instr(pd.GROUTINGLINECODE,:GROUTINGLINECODE)>0 ");
|
|
|
parameters.Add(new OracleParameter(":GROUTINGLINECODE", OracleDbType.NVarchar2, se.GroutingLineCode, ParameterDirection.Input));
|
|
|
}
|
|
|
// 成型线类别
|
|
|
@@ -715,46 +715,46 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
if (!string.IsNullOrEmpty(se.GoodsTypeIDS))
|
|
|
{
|
|
|
// sql.Append(" and instr(','||:GoodsTypeIDS||',',','||gdt.GoodsTypeCode||',')=1");
|
|
|
- sql.Append("AND instr(gdt.GoodsTypeCode,:GoodsTypeIDS)=1 ");
|
|
|
+ sql.Append(" AND instr(gdt.GoodsTypeCode,:GoodsTypeIDS)=1 ");
|
|
|
parameters.Add(new OracleParameter(":GoodsTypeIDS", OracleDbType.NVarchar2, se.GoodsTypeIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
//产品类别IDS
|
|
|
if (!string.IsNullOrEmpty(se.GoodsIDS))
|
|
|
{
|
|
|
- sql.Append(" and instr(','||:GoodsIDS||',',','||pd.goodsid||',')>0");
|
|
|
+ sql.Append(" and instr(','||:GoodsIDS||',',','||pd.goodsid||',')>0 ");
|
|
|
parameters.Add(new OracleParameter(":GoodsIDS", OracleDbType.NVarchar2, se.GoodsIDS, ParameterDirection.Input));
|
|
|
}
|
|
|
// 备注
|
|
|
if (!string.IsNullOrEmpty(se.Remarks))
|
|
|
{
|
|
|
- sql.Append(" AND INSTR(pd.Remarks, :Remarks) > 0");
|
|
|
+ sql.Append(" AND INSTR(pd.Remarks, :Remarks) > 0 ");
|
|
|
parameters.Add(new OracleParameter(":Remarks", OracleDbType.NVarchar2, se.Remarks, ParameterDirection.Input));
|
|
|
}
|
|
|
|
|
|
// 注浆工号
|
|
|
if (!string.IsNullOrEmpty(se.GroutingUserCode))
|
|
|
{
|
|
|
- sql.Append(" AND INSTR( ','||:GroutingUserCode||',',','||pd.GroutingUserCode||',') > 0");
|
|
|
+ sql.Append(" AND INSTR( ','||:GroutingUserCode||',',','||pd.GroutingUserCode||',') > 0 ");
|
|
|
parameters.Add(new OracleParameter(":GroutingUserCode", OracleDbType.NVarchar2, se.GroutingUserCode, ParameterDirection.Input));
|
|
|
}
|
|
|
// 产品编码
|
|
|
if (!string.IsNullOrEmpty(se.GoodsCode))
|
|
|
{
|
|
|
- sql.Append(" AND INSTR(pd.GoodsCode, :GoodsCodeS) > 0");
|
|
|
+ sql.Append(" AND INSTR(pd.GoodsCode, :GoodsCodeS) > 0 ");
|
|
|
parameters.Add(new OracleParameter(":GoodsCodeS", OracleDbType.NVarchar2, se.GoodsCode, ParameterDirection.Input));
|
|
|
}
|
|
|
// 条码
|
|
|
if (!string.IsNullOrEmpty(se.BarCode))
|
|
|
{
|
|
|
//sql.Append(" AND INSTR(','||:BarCode||',',','||pd.BarCode||',') > 0");
|
|
|
- sql.Append(" AND INSTR(pd.BarCode,:BarCode) > 0");
|
|
|
+ sql.Append(" AND INSTR(pd.BarCode,:BarCode) > 0 ");
|
|
|
parameters.Add(new OracleParameter(":BarCode", OracleDbType.NVarchar2, se.BarCode, ParameterDirection.Input));
|
|
|
}
|
|
|
// 生产工号和注浆工号不同
|
|
|
if (se.ProdUserIsGroutingUserFlag == 1)
|
|
|
{
|
|
|
- sql.Append(" and pd.usercode<>pd.GroutingUserCode");
|
|
|
+ sql.Append(" and pd.usercode<>pd.GroutingUserCode ");
|
|
|
}
|
|
|
// 车间
|
|
|
if (!string.IsNullOrEmpty(se.WorkShop))
|
|
|
@@ -774,7 +774,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- sql.Append("AND INSTR(pd.GROUTINGLINECODE, :GroutingLineCodes) > 0");
|
|
|
+ sql.Append(" AND INSTR(pd.GROUTINGLINECODE, :GroutingLineCodes) > 0 ");
|
|
|
parameters.Add(new OracleParameter(":GroutingLineCodes", OracleDbType.NVarchar2, se.WorkShop, ParameterDirection.Input));
|
|
|
}
|
|
|
|