|
|
@@ -19629,7 +19629,8 @@ ORDER BY
|
|
|
parameters.Add(new OracleParameter(":GoodsCode", OracleDbType.NVarchar2, orderEntity.GoodsModel, ParameterDirection.Input));
|
|
|
}
|
|
|
//过滤撤销时间再交接产品
|
|
|
- if (orderEntity.FhFlag.ToString() == "1")
|
|
|
+ //if (orderEntity.FhFlag.ToString() == "1")
|
|
|
+ if (orderEntity.FhFlag + "" == "1")
|
|
|
{
|
|
|
sqlString = sqlString + " AND NOT EXISTS( " +
|
|
|
" SELECT * FROM TP_PM_FINISHEDPRODUCT FP WHERE FP.GROUTINGDAILYDETAILID = GDD.GROUTINGDAILYDETAILID AND FP.FHTIME IS NOT NULL " +
|