Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-001...

pulg

2025-07-05 db825ff9bb1352e79c3e018a647b3c88713d6f69

 HH.WCS.QingXiNongfu/process/DeviceProcess.cs

@@ -1733,9 +1733,42 @@
               状态2   送空完成之后为状态2
               状态3   满托取走，送空之前为状态3，开机默认状态也为状态3
           */
            //3F 00 12 22 0D 0A--无任务信号
            //3F 00 11 22 0D 0A--A口工作信号
            //3F 00 12 21 0D 0A--B口信号
            //3F 00 11 21 0D 0A--A、B口工作信号

            //A口复位信号 - 3F 00 10 0D 0A
            //B口复位信号 - 3F 00 20 0D 0A

            if (data.Length == 4)
            {
                //if (data == "1122")//A口工作信号
                //{
                //    if (BottlePEMInfoFullTwo(plc, plc.location[0]))
                //    {

                //    }
                //}
                //else if (data == "1221")//B口工作信号
                //{
                //    if (BottlePEMInfoFullTwo(plc, plc.location[1]))
                //    {

                //    }
                //}
                //else if (data == "1121")//B口工作信号
                //{
                //    if (BottlePEMInfoFullTwo(plc, plc.location[0]))
                //    {

                //    }
                //    if (BottlePEMInfoFullTwo(plc, plc.location[1]))
                //    {

                //    }
                //}

                if (data.Substring(1, 1) == "1")
                {
                    if (BottlePEMInfoFull(plc, plc.location[0]))
@@ -1964,6 +1997,26 @@
                }
            }
        }
        static bool BottlePEMInfoFullTwo(Settings.deviceInfo plc, string location)
        {
            try
            {
                if (location != "")
                {
                    var workOrder = WCSHelper.GetWorkOrder(plc.deviceName);
                    if (workOrder == null)
                    {
                        LogHelper.Info(plc.deviceName + "没有【执行中】的工单");
                        return false;
                    }
                }
                return false;
            }
            catch (Exception ex)
            {
                return false;
            }
        }


        //瓶坯满入库