MES功能添加强制上传成功，以及关闭NG产品上传功能合并

zhouquan

2025-07-23 dbf68d954db78f369b87e87212e1f82b5513a894

 src/Bro.M141_AOI1.Process/AOI1Process.cs

@@ -229,7 +229,14 @@
                        string zwordstr = Task.Run(() => mqtt.MESForBasketAsync("2", "DS02217", barcode, "1", ConfigAOI1.mesnum2.ToString())).Result;

                        ConfigAOI1.mesnum2++;

                        if (ConfigAOI1.ISokMes)
                        {
                            Plc1.WriteSingleAddress(1524, 1, out _);
                            Plc1.WriteSingleAddress(1514, 1, out _);
                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Information, $"已强制读栏具码运行设备");
                        }
                        else
                        {
                        try
                        {
                            var obj = JsonConvert.DeserializeObject<AutoLineMacQueueBak>(zwordstr);
@@ -252,6 +259,7 @@
                            Plc1.WriteSingleAddress(1524, 2, out _);
                            Plc1.WriteSingleAddress(1514, 1, out _);
                            LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"RabbitMQ zwoid获取异常  返回数据为 {zwordstr} ");
                            }
                        }
                    }
                    else
@@ -364,7 +372,8 @@
                        if (datasZ.Count == CheckPointList.Count)
                        {
                            string Postion = "P" + opConfig.TriggerStr.Split('#')[0];
                            string csvhead = "Time,Pid,Postion";
                            string csvhead = "Time,Pid" +
                                ",Postion";
                            string csvdata = $"{DateTime.Now.ToString("yyyyMMddHHmmss")}T,{results[0].PID},{Postion}";

                            for (int i = 0; i < CheckPointList.Count; i++)
@@ -498,6 +507,15 @@
            if (ConfigAOI1.ISupMES)
            {
                string Msg = Task.Run(() => mqtt.MESForBasketAsync("1", "DS02216", "", "0", ConfigAOI1.mesnum1.ToString())).Result;

                if (ConfigAOI1.ISokMes)
                {
                    ConfigAOI1.mesnum1++;
                    Plc1.WriteSingleAddress(1590, 1, out _);
                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"已强制MES上传进料口空篮");
                }
                else
                {
                if (Msg != null)
                {
                    try
@@ -527,6 +545,7 @@
                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"RabbitMQ 篮具  进料口空篮 获取返回值失败  返回数据null ");
                }
            }
            }
            else
            {
                Plc1.WriteSingleAddress(1590, 1, out _);
@@ -549,6 +568,14 @@
            if (ConfigAOI1.ISupMES)
            {
                string Msg = Task.Run(() => mqtt.MESForBasketAsync("1", "DS02216", "", "1", ConfigAOI1.mesnum1.ToString())).Result;
                if (ConfigAOI1.ISokMes) 
                {
                    ConfigAOI1.mesnum1++;
                    Plc1.WriteSingleAddress(1590, 1, out _);
                    LogAsync(DateTime.Now, EnumHelper.LogLevel.Exception, $"已强制MES上传进料口满载");
                } 
                else
                {
                if (Msg != null)
                {

@@ -579,6 +606,7 @@
                    Plc1.WriteSingleAddress(1590, 2, out _);
                }
            }
            }
            else
            {
                Plc1.WriteSingleAddress(1590, 1, out _);
@@ -592,8 +620,6 @@
        public ResponseMessage MESup3(IOperationConfig config, IDevice invokeDevice, IDevice sourceDevice)
        {
            ResponseMessage msg = new ResponseMessage();



            if (ConfigAOI1.ISupMES)
            {