修改mes篮具扫码确认收到单号才修改产品单号,以及S9打印条码与plc的交互完成信号
4个文件已修改
53 ■■■■ 已修改文件
src/Bro.M141.Process/M141Process.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Bro.M141.Process/M141Process_ImageCheck.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Bro.M141.Process/UI/DataPrinter.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Bro.M141_AOI1.Process/AOI1Process.cs 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/Bro.M141.Process/M141Process.cs
@@ -1896,16 +1896,16 @@
                int ttheigh = 80;
                Printmessage = str;
                this.printDocument1.DefaultPageSettings.PrinterSettings.PrinterName = "Honeywell PX240S (300 dpi)";
                this.printDocument1.DefaultPageSettings.PrinterSettings.PrinterName = PrinterName;
                this.printDocument1.DefaultPageSettings.PaperSize = new PaperSize("Custum", ttwith, ttheigh);
                this.printDocument1.PrintController = new System.Drawing.Printing.StandardPrintController();
                this.printDocument1.Print();
            }
            catch
            catch(Exception ex)
            {
                LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"打印机打印出错:{ex.ToString()}");
            }
        }
src/Bro.M141.Process/M141Process_ImageCheck.cs
@@ -1063,8 +1063,9 @@
            if (M141Config.MES_codes.Count >= 1)
            {
                string message = M141Config.MES_codes[0].Printers_code;
                StartPrint(message, "Honeywell PX240S(300 dpi)1");
                StartPrint(message, "Honeywell PX240S (300 dpi)1");
                M141Config.MES_codes.RemoveAt(0);
                PlcwritePrinter(1510,1);
            }                               
            return msg;
        }
src/Bro.M141.Process/UI/DataPrinter.cs
@@ -151,7 +151,7 @@
                                        if (Config141.Isprint && !string.IsNullOrEmpty(obj.tary_label))
                                        {
                                            Process141.StartPrint(obj.tary_label, "Honeywell PX240S(300 dpi)");
                                            Process141.StartPrint(obj.tary_label, "Honeywell PX240S (300 dpi)");
                                        }
                                    }
                                    else
src/Bro.M141_AOI1.Process/AOI1Process.cs
@@ -329,10 +329,10 @@
                        {
                            try
                            {
                                var obj = JsonConvert.DeserializeObject<AutoLineMacQueueBak>(zwordstr);
                                ConfigAOI1.zwoid = obj.zwoid;
                                var obj = JsonConvert.DeserializeObject<AutoLineMacQueueBak>(zwordstr);
                                if (!string.IsNullOrEmpty(obj.zwoid) && obj.zstatus == "200")
                                {
                                    ConfigAOI1.zwoid = obj.zwoid;
                                    Plc1.WriteSingleAddress(1524, 1, out _);
                                    Plc1.WriteSingleAddress(1514, 1, out _);
                                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"RabbitMQ zwoid获取成功 {obj.zstatus} {obj.zwoid} ");
@@ -896,11 +896,11 @@
            string saveTary_ID=string.Empty;
            if (!Issuccess && !Issuccess1)
            {
                Plc3.WriteSingleAddress(2120, 2, out _);
                return msg;
            }
            //if (!Issuccess && !Issuccess1)
            //{
            //    Plc3.WriteSingleAddress(2120, 2, out _);
            //    return msg;
            //}
                      
            LogAsync(DateTime.Now, EnumHelper.LogLevel.Assist, $"产品信息上传MES触发,产品信息数量为:{M141Config.Productioncode.Count}");
@@ -926,7 +926,7 @@
                    if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
                    {
                        saveTary_ID = tary_ID;
                        StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
                        StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
                        M141Config.MES_codes.Add(new MES_code
                        {
                            Printers_code = tary_ID
@@ -961,7 +961,7 @@
                    if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
                    {
                        saveTary_ID = tary_ID;
                        StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
                        StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
                        M141Config.MES_codes.Add(new MES_code
                        {
                            Printers_code = tary_ID
@@ -1004,7 +1004,7 @@
                    if (M141Config.Isprint && !string.IsNullOrEmpty(tary_ID))
                    {
                        saveTary_ID = tary_ID;
                        StartPrint(tary_ID, "Honeywell PX240S(300 dpi)");
                        StartPrint(tary_ID, "Honeywell PX240S (300 dpi)");
                        M141Config.MES_codes.Add(new MES_code
                        {
                            Printers_code = tary_ID
@@ -1019,19 +1019,19 @@
            {
                if (M141Config.Isprint && !string.IsNullOrEmpty(saveTary_ID))
                {
                    StartPrint(saveTary_ID, "Honeywell PX240S(300 dpi)");
                    StartPrint(saveTary_ID, "Honeywell PX240S (300 dpi)");
                }      
            }
            if (Issuccess && Issuccess1)
            {
                Plc3.WriteSingleAddress(2120, 1, out _);
                return msg;
            }
            else
            {
                Plc3.WriteSingleAddress(2120, 2, out _);
                return msg;
            }
            //if (Issuccess && Issuccess1)
            //{
               Plc3.WriteSingleAddress(2120, 1, out _);
               return msg;
            //}
            //else
            //{
            //    Plc3.WriteSingleAddress(2120, 2, out _);
            //    return msg;
            //}
            
        }