|
|
@@ -1242,7 +1242,7 @@ namespace UAS_MES.PublicMethod
|
|
|
break;
|
|
|
case "BARCODE":
|
|
|
//判定条码是否已经上料了
|
|
|
- dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' cm_status=0", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
ErrMessage = "条码" + iSN + "已经上料";
|
|
|
@@ -1273,7 +1273,7 @@ namespace UAS_MES.PublicMethod
|
|
|
else ErrMessage = "条码" + iSN + "不存在";
|
|
|
break;
|
|
|
case "RULE":
|
|
|
- dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "'", "select");
|
|
|
+ dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "' and cm_status=0", "select");
|
|
|
if (dt.Rows.Count > 0)
|
|
|
{
|
|
|
ErrMessage = "条码" + iSN + "已经上料";
|