Merge branch 'master' of ssh://10.10.101.21/source/mes-client

:

UAS-MES/PublicMethod/LogicHandler.cs

@@ -1170,6 +1170,13 @@ namespace UAS_MES.PublicMethod
                     else ErrMessage = "序列号" + iSN + "不存在";
                     break;
                 case "BARCODE":
+                    //判定条码是否已经上料了
+                    dt = (DataTable)dh.ExecuteSql("select cm_barcode from craftmaterial where cm_barcode='" + iSN + "'", "select");
+                    if (dt.Rows.Count > 0)
+                    {
+                        ErrMessage = "条码" + iSN + "已经上料";
+                        return false;
+                    }
                     dt = (DataTable)dh.ExecuteSql("select bar_prodcode,bar_code from barcode where bar_code='" + iSN + "'", "select");
                     if (dt.Rows.Count > 0)
                     {