|
|
@@ -9236,6 +9236,7 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
string groutingUserCode = string.Empty;
|
|
|
// 次品标识
|
|
|
bool substandardFlag = false;
|
|
|
+ string test = productionData.MouldCode;
|
|
|
|
|
|
#region 校验条码有效性
|
|
|
errMsg = CheckBarcode(oracleTrConn, procedure.ProcedureID, productionData.Barcode, out goodsID, out goodsCode, out goodsName, out groutingUserCode, sUserInfo);
|
|
|
@@ -9247,7 +9248,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
return errMsg;
|
|
|
}
|
|
|
#endregion
|
|
|
-
|
|
|
int isInProduction = 1;
|
|
|
#region 修改条码
|
|
|
if (productionData.ProductionDataID > 0) //表示编辑条码
|
|
|
@@ -9275,7 +9275,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
return string.Format(Messages.MSG_S_PM_009, createtime.ToString("yyyy-MM-dd"), days.ToString(), createtime.AddDays(days - 1).ToString("yyyy-MM-dd"));
|
|
|
}
|
|
|
#endregion
|
|
|
-
|
|
|
//
|
|
|
string sqlOPTimeStamp = "";
|
|
|
OracleParameter[] parmetersSql = null;
|
|
|
@@ -9295,8 +9294,8 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
Tp_Pm_Inproductiontrash.BarCode=:BarCode and Tp_Pm_Inproductiontrash.OPTimeStamp = :OPTimeStamp ";
|
|
|
parmetersSql = new OracleParameter[]
|
|
|
{
|
|
|
- new OracleParameter(":OPTimeStamp", OracleDbType.TimeStamp, productionData.OPTimeStamp, ParameterDirection.Input),
|
|
|
- new OracleParameter(":BarCode", OracleDbType.NVarchar2, productionData.Barcode, ParameterDirection.Input),
|
|
|
+ new OracleParameter(":OPTimeStamp", OracleDbType.TimeStamp,productionData.OPTimeStamp, ParameterDirection.Input),
|
|
|
+ new OracleParameter(":BarCode", OracleDbType.NVarchar2, productionData.Barcode, ParameterDirection.Input),
|
|
|
};
|
|
|
}
|
|
|
else
|
|
|
@@ -9319,15 +9318,16 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
};
|
|
|
|
|
|
}
|
|
|
+ if (test != "挂起跳过") {
|
|
|
+
|
|
|
DataSet returnDataset = oracleTrConn.GetSqlResultToDs(sqlOPTimeStamp, parmetersSql);
|
|
|
- if (returnDataset != null
|
|
|
- && returnDataset.Tables[0].Rows.Count == 0)
|
|
|
+ if (returnDataset != null && returnDataset.Tables[0].Rows.Count == 0)
|
|
|
{
|
|
|
return "数据已经被修改，请重新进行编辑";
|
|
|
+
|
|
|
+ }
|
|
|
+ isInProduction = Convert.ToInt32(returnDataset.Tables[0].Rows[0][0]);
|
|
|
}
|
|
|
-
|
|
|
- isInProduction = Convert.ToInt32(returnDataset.Tables[0].Rows[0][0]);
|
|
|
-
|
|
|
#endregion
|
|
|
//如果原来是 次品 / 废品 xuwei modify 2019-12-13 加入 废品识别
|
|
|
if (productionData.OrgGoodsLevelTypeID == Constant.GoodsLevelType.Reject.GetHashCode()
|
|
|
@@ -10152,7 +10152,6 @@ namespace Dongke.IBOSS.PRD.Service.PMModuleLogic
|
|
|
}
|
|
|
return errMsg;
|
|
|
}
|
|
|
-
|
|
|
#endregion
|
|
|
|
|
|
/// <summary>
|
zhangzhongshuai