33
schangxiang@126.com
2024-12-08 68214ef234e825f50ccadeb56fb6893c4262b6cd
33
已添加1个文件
已重命名1个文件
已修改8个文件
49 ■■■■■ 文件已修改
CC/iWareCC_ASRS/ThreadService/00_269工位/DataProcess_269.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/01_BZ01工位(清灰,洗板后工位)/DataProcess_BZ01.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/02_BZ39工位(补板后工位)/Inbound/1、DataProcess_BZ39.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/1、DataProcess_BZ12.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/03_BZ12(机器人码包工位)/2、DataProcess_BZ12_IssueTask.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/04_BZ21(搬运整垛机器人)/1、DataProcess_BZ21.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCommon/Common/Globle/PlcAddressGloble.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCommon/Common/Globle/PlcWarningAddressGloble.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCommon/iWareCommon.csproj 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
CC/iWareCC_ASRS/ThreadService/00_269¹¤Î»/DataProcess_269.cs
@@ -78,7 +78,7 @@
                                    }
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_269_1);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_269_1);
                                    SystemWarningMsg._lbl_alert_DataProcess_269 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
CC/iWareCC_ASRS/ThreadService/01_BZ01¹¤Î»£¨Çå»Ò£¬Ï´°åºó¹¤Î»£©/DataProcess_BZ01.cs
@@ -72,7 +72,7 @@
                                if (upiObj == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ01_1);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ01_1);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ01 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
CC/iWareCC_ASRS/ThreadService/02_BZ39¹¤Î»£¨²¹°åºó¹¤Î»£©/Inbound/1¡¢DataProcess_BZ39.cs
@@ -73,7 +73,7 @@
                                if (upiObj == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ39_2);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ39_2);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
@@ -83,7 +83,7 @@
                                if (stock != null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ39_1);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ39_1);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},UPI:{upiCode}已经在缓存库中了 ";
                                    continue;
@@ -94,7 +94,7 @@
                                if (place == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ39_3);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ39_3);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ39 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到缓存区岛的空库位 ";
                                    continue;
CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/1¡¢DataProcess_BZ12.cs
@@ -87,7 +87,7 @@
                                if (upiObj == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_1);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_1);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},根据UPI:{upiCode}没有找到对象 ";
                                    continue;
@@ -99,7 +99,7 @@
                                if (upiObj.UpiStatus == (int)UpiStatusEnum.已码垛 || upiObj.UpiStatus == (int)UpiStatusEnum.码垛中)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_3);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_3);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},根据UPI:{upiCode}状态已是'已码垛'或'码垛中' ";
                                    continue;
@@ -118,7 +118,7 @@
                                        if (upiObj.PackageCode != wms_rbline_runmode.PalletizingUPI)
                                        {
                                            //写入报警信息
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_4);
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_4);
                                            SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}码包部件混批 ";
                                            continue;
@@ -145,7 +145,7 @@
                                        else
                                        {
                                            //写入报警信息
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_6);
                                            await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_6);
                                            SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}无可用码垛目标位 ";
                                            continue;
@@ -166,7 +166,7 @@
                                if (oldupi != null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_5);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_5);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ12 = $"{rgvLocation.ToString()},UPI:{upiCode}码包顺序错误 ";
                                    continue;
CC/iWareCC_ASRS/ThreadService/03_BZ12(»úÆ÷ÈËÂë°ü¹¤Î»)/2¡¢DataProcess_BZ12_IssueTask.cs
@@ -86,7 +86,7 @@
                            if (isrotate != 1 && isrotate != 2)
                            {
                                //写入报警信息
                                await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ12_7);
                                await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ12_7);
                                SystemWarningMsg._lbl_Alert_DataProcess_BZ12_IssueTask = $"{rgvLocation.ToString()},根据UPI:{task.Upi}的旋转方向值不是1或2 ";
                                continue;
CC/iWareCC_ASRS/ThreadService/04_BZ21£¨°áÔËÕû¶â»úÆ÷ÈË£©/1¡¢DataProcess_BZ21.cs
@@ -98,7 +98,7 @@
                                if (upiObj == null)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ21_1);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ21_1);
                                    SystemWarningMsg._lbl_alert_DataProcess_BZ21 = $"{rgvLocation.ToString()},根据UPI:{result}没有找到对象 ";
                                    continue;
@@ -109,7 +109,7 @@
                                if (validteReslt == false)
                                {
                                    //写入报警信息
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningGloble.Num_BZ21_2);
                                    await MyExtendHelper.WriteBoolPlcDataForWarning(PlcWarningAddressGloble.Num_BZ21_2);
                                    continue;
                                }
CC/iWareCommon/Common/Globle/PlcAddressGloble.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,14 @@

using iWareModel;
using System.Collections.Generic;
namespace iWareCommon.Common.Globle
{
    public static class PlcAddressGloble
    {
        ///// <summary>
        ///// å†™å…¥çš„心跳
        ///// </summary>
        //public static string Num_269_1 = "3000|80.0";
    }
}
CC/iWareCommon/Common/Globle/PlcWarningAddressGloble.cs
ÎļþÃû´Ó CC/iWareCommon/Common/Globle/PlcWarningGloble.cs ÐÞ¸Ä
@@ -3,7 +3,7 @@
using System.Collections.Generic;
namespace iWareCommon.Common.Globle
{
    public static class PlcWarningGloble
    public static class PlcWarningAddressGloble
    {
        #region 269
CC/iWareCommon/iWareCommon.csproj
@@ -74,7 +74,8 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="Common\Dao\CommonDao.cs" />
    <Compile Include="Common\Globle\PlcWarningGloble.cs" />
    <Compile Include="Common\Globle\PlcAddressGloble.cs" />
    <Compile Include="Common\Globle\PlcWarningAddressGloble.cs" />
    <Compile Include="Common\Globle\SysGloble.cs" />
    <Compile Include="Common\Service\CommonService.cs" />
    <Compile Include="Utils\CSharpHelper.cs" />
SDA/iWareSda/Devices/4-Station/StationModel/Station_CacheEntity.cs
@@ -27,6 +27,8 @@
        public static string W_DBHeaderWithSeparate_269 = "3006" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
        public static string W_DBHeaderWithSeparate_3007 = "3007" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
        public static string W_DBHeaderWithSeparate_3000 = "3000" + WareSdaStruct.PLCDBADDRESS_SEPARATE;
        /// <summary>
        /// è¯»å–DB
        /// </summary>
@@ -140,7 +142,7 @@
            {
                //TODO:这里写配置的DB地址
                #region å†™å…¥
                // W_HandShake = W_DBHeaderWithSeparate + "0.0",
                W_HandShake = W_DBHeaderWithSeparate_3000 + "80.0",
                #endregion