Merge repos.ubtob.net:usoft/mes-client

UAS_MES_BG/FunctionCode/Make/Make_ParseLog.cs

@@ -788,6 +788,10 @@ namespace UAS_MES_NEW.Make
                             if (dh.getRowCount("productsmtlocation", "PSL_PSID='" + ps_id +"'") > 0)
                             {
                                 dh.ExecuteSql("delete from productsmtlocation where PSL_PSID = '" + ps_id +"'", "delete");
+
+                                string wo = dh.getFieldDataByCondition("deviceline", "DL_MACODE", "dl_prodcode = "+ Part_ + "").ToString();
+                                LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, wo, User.UserLineCode, User.UserSourceCode, "贴片机对接", $"已删除更新站位: {ps_id}", "", "");
+
                             }
                             sql.Clear();
                             sql.Append("insert into productsmtlocation(PSL_ID, PSL_PSID, PSL_DETNO, PSL_PRODCODE, PSL_REPCODE, PSL_LOCATION, PSL_BASEQTY, PSL_TABLE)" +
@@ -1046,6 +1050,20 @@ namespace UAS_MES_NEW.Make
 
                     if (ishave_sn == "是")
                     {
+                        if (equiType == "AOI")
+                        {
+                            dt = (DataTable)dh.ExecuteSql($"select * from makeserial where ms_sncode = '{item.SN}' and ms_status = 3", "select");
+                            if (dt.Rows.Count > 0)
+                            {
+                                if (logs.IndexOf(item) == logs.Count - 1)
+                                {
+                                    return true;
+                                }
+                                LogMessage($"序列号: {item.SN}为不良品,不记录系统");
+                                break;
+                            }
+                        }
+
                         if (LogicHandler.CheckStepSNAndMacode(ma_code.Text, User.UserSourceCode, item.SN, User.UserCode, out omakeCode, out oMsid, out oErrorMessage))
                         {
                             string passStationRes = "OK";

UAS_MES_WEIP/FunctionCode/Make/Make_SMTBind.cs

@@ -679,10 +679,17 @@ namespace UAS_MES_NEW.Make
             List<string> nowcodelist = new List<string>();
             for (int i = 0; i < dt.Rows.Count; i++)
             {
-                if (dt.Rows[i]["工单"].ToString().Trim()==ma_code.Text&&dt.Rows[i]["拼板号"].ToString().Trim().Length >2
-                    && dt.Rows[i]["打码内容"].ToString().Trim()!=ma_code.Text 
-                    && dt.Rows[i]["打码内容"].ToString().Trim().Length > 7 && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2)
-                    == dt.Rows[i]["打码内容"].ToString().Trim().Substring(0, 2))
+                if (dt.Rows[i]["工单"].ToString().Trim() != ma_code.Text)
+                {
+                    OperateResult.AppendText(">>镭雕日志工单与所选工单不一致，请检查\n", Color.Red);
+                    return;
+                }
+
+                if (dt.Rows[i]["工单"].ToString().Trim() == ma_code.Text
+                    && dt.Rows[i]["拼板号"].ToString().Trim().Length >2
+                    && dt.Rows[i]["打码内容"].ToString().Trim()!= ma_code.Text 
+                    && dt.Rows[i]["打码内容"].ToString().Trim().Length > 7 
+                    && dt.Rows[i]["拼板号"].ToString().Trim().Substring(0, 2) == dt.Rows[i]["打码内容"].ToString().Trim().Substring(0, 2))
                 {
                         maincodelist.Add(dt.Rows[i]["拼板号"].ToString().Trim());
                         nowcodelist.Add(dt.Rows[i]["打码内容"].ToString().Trim());
@@ -725,6 +732,7 @@ namespace UAS_MES_NEW.Make
             MessageBox.Show("导入成功"+ number + "条!");
             OperateResult.AppendText(">>导入成功" + number + "条!\n", Color.Green);
 
+            LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, ma_code.Text, User.UserLineCode, User.UserSourceCode, "SMT拼版绑定", $"镭雕日志绑定拼板成功，已绑定: {number}", "", "");
             RefreshData();
 
         }