|
|
@@ -22042,7 +22042,7 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
|
|
|
DateTime? createTime = null;
|
|
|
// 1 条码是否在产成品表中
|
|
|
- string sql = "select createTime,FHUserCode,GoodsCode,GoodsLevelID,GoodsLevelTypeID from " +
|
|
|
+ string sql = "select createTime,FHUserCode,GoodsCode,GoodsLevelID,GoodsLevelTypeID,GoodsID from " +
|
|
|
"tp_pm_finishedproduct where barcode=:barcode and valueflag=1";
|
|
|
OracleParameter[] Paras = new OracleParameter[] {
|
|
|
new OracleParameter(":barcode",OracleDbType.Varchar2,
|
|
|
@@ -22070,24 +22070,20 @@ updateuserid=:updateuserid where barcode=:barcode";
|
|
|
goodsLevelTypeID = Convert.ToInt32(ds.Tables[0].Rows[0]["goodsLevelTypeID"]);
|
|
|
|
|
|
}
|
|
|
- #region 是否功能权限表里
|
|
|
- //sql = @" SELECT us.userid
|
|
|
- // ,us.usercode
|
|
|
- // ,us.username
|
|
|
- // FROM tp_mst_userright ur
|
|
|
- // INNER JOIN tp_mst_user us ON ur.userid = us.userid
|
|
|
- // WHERE us.usercode = :USERCODE AND functioncode = '807042'
|
|
|
- //";
|
|
|
- //Paras = new OracleParameter[] {
|
|
|
- // new OracleParameter(":USERCODE",OracleDbType.Varchar2, sUserInfo.UserCode,ParameterDirection.Input)
|
|
|
- // };
|
|
|
- // ds = oracleTrConn.GetSqlResultToDs(sql, Paras);
|
|
|
- //if (ds.Tables[0].Rows.Count == 0)
|
|
|
- //{
|
|
|
- // //不存在产成品
|
|
|
- // errMsg = "工号【" + sUserInfo.UserCode + "】没有复检操作权限，不能进行该操作";
|
|
|
- // return errMsg;
|
|
|
- //}
|
|
|
+ #region 条码对应的产品编码 没有在该工序中配置
|
|
|
+ sql = @" select * from TP_PC_ProcedureGoods
|
|
|
+ where GoodsID = :GoodsID
|
|
|
+ and ProcedureID = :ProcedureID ";
|
|
|
+ Paras = new OracleParameter[] {
|
|
|
+ new OracleParameter(":GoodsID",OracleDbType.Int32, Convert.ToInt32(ds.Tables[0].Rows[0]["GoodsID"]),ParameterDirection.Input),
|
|
|
+ new OracleParameter(":ProcedureID",OracleDbType.Int32,procedureID,ParameterDirection.Input)
|
|
|
+ };
|
|
|
+ ds = oracleTrConn.GetSqlResultToDs(sql, Paras);
|
|
|
+ if (ds.Tables[0].Rows.Count == 0)
|
|
|
+ {
|
|
|
+ errMsg = "条码对应的产品编码【" + ds.Tables[0].Rows[0]["GoodsCode"] + "】 没有在该工序中配置";
|
|
|
+ return errMsg;
|
|
|
+ }
|
|
|
|
|
|
#endregion
|
|
|
|
