解决代码冲突更新WCS日志记录

wangxinhui

2026-03-07 d82252f08a32f5786ffe231b7fd301b6a60781d6

解决代码冲突更新WCS日志记录

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_IPackInfoRepository/IStationPackDetailRepository.cs

@@ -10,9 +10,6 @@
{
    public interface IStationPackDetailRepository : IRepository<Dt_StationPackDetail>
    {
<<<<<<< HEAD
=======

>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackDetailService.cs

@@ -10,9 +10,6 @@
{
    public interface IStationPackDetailService : IService<Dt_StationPackDetail>
    {
<<<<<<< HEAD
=======

>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_IPackInfoService/IStationPackInfoService.cs

@@ -3,10 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
<<<<<<< HEAD
=======
using WIDESEAWCS_Core;
>>>>>>> main
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Model.Models;

@@ -14,14 +11,11 @@
{
    public interface IStationPackInfoService : IService<Dt_StationPackInfo>
    {
<<<<<<< HEAD
=======
        /// <summary>
        /// æ‰‹åŠ¨æ¸…空码垛执行工位数据
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        WebResponseContent ManualClearPalletStationData(string StationCode);
>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs

@@ -7,10 +7,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
<<<<<<< HEAD
=======
using WIDESEAWCS_DTO.TaskInfo;
>>>>>>> main
using WIDESEAWCS_Model.Models;

namespace WIDESEAWCS_ITaskInfoService
@@ -33,17 +30,11 @@
        WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null);
        //码垛结托并上传码垛工位码垛明细数据
        WebResponseContent BoxingInBound(string stationCode);
<<<<<<< HEAD
=======

        ///// <summary>
        ///// åˆ é™¤ç åž›ä»»åŠ¡
        ///// </summary>
        ///// <param name="packaxisTasks"></param>
        ///// <returns></returns>
        WebResponseContent PickaixsTaskDele(int PackTaskNum);


>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_PackType.cs

@@ -15,12 +15,7 @@
        /// ä¸»é”®
        /// </summary>
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
<<<<<<< HEAD
        public int id { get; set; }
=======
        public int Id { get; set; }
>>>>>>> main

        /// <summary>
        /// ç åž›åž›åž‹é•¿åº¦
        /// </summary>
@@ -38,13 +33,10 @@
        /// </summary>
        [SugarColumn(IsNullable = false, ColumnDescription = "码垛垛型高度")]
        public int PackHeight { get; set; }
<<<<<<< HEAD
=======
        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "备注")]
        public string Remark { get; set; }
>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Model/Models/PackInfo/Dt_Packaxis.cs

@@ -15,11 +15,7 @@
        /// ä¸»é”®
        /// </summary>
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "主键")]
<<<<<<< HEAD
        public int id { get; set; }
=======
        public int Id { get; set; }
>>>>>>> main

        /// <summary>
        /// è®¾å¤‡ç¼–号
@@ -43,11 +39,7 @@
        /// ç åž›æ•°é‡
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "码垛数量")]
<<<<<<< HEAD
        public int PackNum { get; set; }
=======
        public int PackNum { get; set; } = 0;
>>>>>>> main

        /// <summary>
        /// X坐标
@@ -103,14 +95,7 @@
        [SugarColumn(IsNullable = true,  ColumnDescription = "Z坐标间距")]
        public int AxisZSpacing { get; set; }

        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
<<<<<<< HEAD
        [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "备注")]
=======
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "备注")]
>>>>>>> main
        public string Remark { get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoRepository/StationPackDetailRepository.cs

@@ -14,10 +14,5 @@
        public StationPackDetailRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
        {
        }
<<<<<<< HEAD
=======

       
>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackaxisService.cs

@@ -15,27 +15,20 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
<<<<<<< HEAD
=======
using WIDESEAWCS_IBasicInfoRepository;

>>>>>>> main

namespace WIDESEAWCS_PackInfoService
{
    public class PackaxisService : ServiceBase<Dt_Packaxis, IPackaxisRepository>, IPackaxisService
    {
<<<<<<< HEAD
        public PackaxisService(IPackaxisRepository BaseDal) : base(BaseDal)
        {
=======
        }
        private readonly IPackTypeRepository _packTypeRepository;
        private readonly IStationMangerRepository _stationMangerRepository;
        public PackaxisService(IPackaxisRepository BaseDal, IPackTypeRepository packTypeRepository, IStationMangerRepository stationMangerRepository) : base(BaseDal)
        {
            _packTypeRepository = packTypeRepository;
            _stationMangerRepository = stationMangerRepository;
>>>>>>> main
        }
        public override WebResponseContent Import(List<IFormFile> files)
        {
@@ -70,11 +63,6 @@
                using (ImportExcelHelper excelHelper = new ImportExcelHelper(fullPath))
                {
                    dtExcel = excelHelper.ExcelToDataTable();
<<<<<<< HEAD
                    
=======

>>>>>>> main
                }
                List<Dt_Packaxis> addAxis = new List<Dt_Packaxis>();
                List<Dt_Packaxis> updateAxis = new List<Dt_Packaxis>();
@@ -100,11 +88,8 @@
                    string AxisZCount = row["AxisZCount"]?.ToString() ?? string.Empty;
                    string AxisZSpacing = row["AxisZSpacing"]?.ToString() ?? string.Empty;
                    var axis = BaseDal.QueryFirst(x => x.DeviceCode == DeviceCode && x.StationCode == StationCode && x.PackType == PackType);
<<<<<<< HEAD
                    if(axis == null)
=======
                    if (axis == null)
>>>>>>> main
                    {
                        Dt_Packaxis packaxis = new Dt_Packaxis()
                        {
@@ -158,8 +143,6 @@

            return content;
        }
<<<<<<< HEAD
=======
        /// <summary>
        /// æ·»åŠ åæ ‡æ•°æ®
        /// </summary>
@@ -264,6 +247,5 @@
            return content;

        }
>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoService/PackinfoService.cs

@@ -45,11 +45,7 @@
                    Dt_PackType? packType = packTypes.FirstOrDefault(x=>x.PackWidth==item.Width && x.PackLength==item.Length && x.PackHeight==item.Height);
                    if (packType == null) throw new Exception($"未找到条码{item.BarCode},{item.Length}*{item.Width}*{item.Height}码垛配置");
                    Dt_Packinfo packinfo = _mapper.Map<Dt_Packinfo>(item);
<<<<<<< HEAD
                    packinfo.PackType = packType.id;
=======
                    packinfo.PackType = packType.Id;
>>>>>>> main
                    packinfos.Add(packinfo);
                }
                BaseDal.AddData(packinfos);

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackDetailService.cs

@@ -22,12 +22,7 @@
    {
        public StationPackDetailService(IStationPackDetailRepository BaseDal) : base(BaseDal)
        {
<<<<<<< HEAD
        }
=======

        }

>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoService/StationPackInfoService.cs

@@ -7,7 +7,6 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
<<<<<<< HEAD
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
@@ -16,7 +15,6 @@
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IPackInfoService;
=======
using WIDESEAWCS_Common.Utilities;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
@@ -27,16 +25,14 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_PackInfoRepository;
>>>>>>> main

namespace WIDESEAWCS_PackInfoService
{
    public class StationPackInfoService : ServiceBase<Dt_StationPackInfo, IStationPackInfoRepository>, IStationPackInfoService
    {
<<<<<<< HEAD
        public StationPackInfoService(IStationPackInfoRepository BaseDal) : base(BaseDal)
        {
=======
        }
        private readonly IStationPackDetailRepository _stationPackDetailRepository;
        private readonly IPackinfoRepository _packInfoRepository;
        private readonly IPackaxisTaskRepository _packaxisTaskRepository;
@@ -89,7 +85,6 @@
                WebResponseContent.Instance.Error(e.Message);
            }
            return content;
>>>>>>> main
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_PackInfoService/WIDESEAWCS_PackInfoService.csproj

@@ -7,13 +7,10 @@
  </PropertyGroup>

  <ItemGroup>
<<<<<<< HEAD
    <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
=======
    <ProjectReference Include="..\WIDESEAWCS_IBasicInfoRepository\WIDESEAWCS_IBasicInfoRepository.csproj" />
    <ProjectReference Include="..\WIDESEAWCS_IPackInfoService\WIDESEAWCS_IPackInfoService.csproj" />
    <ProjectReference Include="..\WIDESEAWCS_ITaskInfoRepository\WIDESEAWCS_ITaskInfoRepository.csproj" />
>>>>>>> main
  </ItemGroup>

</Project>

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs

@@ -24,8 +24,6 @@
        {
            return Service.TaskCompleted(taskNum);
        }
<<<<<<< HEAD
=======

        [HttpPost, Route("PickaixsTaskDele")]
        public WebResponseContent PickaixsTaskDele(int PackTaskNum)
@@ -33,6 +31,5 @@

            return Service.PickaixsTaskDele(PackTaskNum);
        }
>>>>>>> main
    }
}

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Server/appsettings.json

@@ -12,21 +12,8 @@
  "MainDB": "DB_WIDESEA", //当前项目的主库，所对应的连接字符串的Enabled必须为true
  "DBType": "SqlServer",
  //连接字符串
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  //"ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
<<<<<<< HEAD
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
=======
  "ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.35.3;Initial Catalog=WIDESEA_WCSLLD;User ID=sa;Password=Sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=10.30.4.92;Initial Catalog=TESTWCSCP_WCS;User ID=sa;Password=duo123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "WMSConnectionStrings": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
>>>>>>> main
  //"WMSConnectionStrings": "Data Source=.;Initial Catalog=WIDESEA_WMSLLD;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"WMSConnectionStrings": "Data Source=10.30.4.92;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs

@@ -15,10 +15,7 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
<<<<<<< HEAD
=======
using WIDESEAWCS_DTO.TaskInfo;
>>>>>>> main
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IPackInfoRepository;
using WIDESEAWCS_ITaskInfoRepository;
@@ -255,8 +252,6 @@
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }
<<<<<<< HEAD
=======
        /// <summary>
        /// åˆ é™¤ç åž›ä»»åŠ¡ä¿¡æ¯
        /// </summary>
@@ -289,9 +284,6 @@
            }
            return content;
        }


>>>>>>> main
    }
    public class MDCount
    {

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPB.cs

@@ -132,6 +132,10 @@
                        else if (item.StationType == StationTypeEnum.StationType_InboundAndOutbound.ObjToInt() && deviceProRead != null)
                        {//入库RGV接驳位交互
                            R_ConveyorLineCPInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineCPInfo>(deviceProRead.DeviceProAddress);
                            if (conveyorLineInfoRead != null)
                            {
                                WriteInfo(item.StationName, $"状态{conveyorLineInfoRead}");
                            }
                            if (conveyorLineInfoRead != null && conveyorLineInfoRead.Command == 4 && conveyorLineInfoRead.TaskNo > 0)
                            {
                                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == conveyorLineInfoRead.TaskNo && x.CurrentAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.Line_Execute.ObjToInt() && x.DeviceCode == device.DeviceCode);
@@ -221,7 +225,8 @@
                            }
                        }
                        else if (item.StationType == StationTypeEnum.StationType_StackingPlates.ObjToInt() && item.IsOccupied==StationOccupiedEnum.None.ObjToInt() && deviceProRead != null && deviceProWrite != null)
                        {//叠盘机工位叫料
                        {
                            //叠盘机工位叫料
                            R_ConveyorLineCPInfo conveyorLineInfoRead = device.Communicator.ReadCustomer<R_ConveyorLineCPInfo>(deviceProRead.DeviceProAddress);

                            if (conveyorLineInfoRead != null && conveyorLineInfoRead.Command == 7 && conveyorLineInfoRead.TaskNo <= 0)

 ÏîÄ¿´úÂë/WCS/WCSServices/WIDESEAWCS_Tasks/³ÉÆ·²Ö/ConveyorLineJob_CPC.cs

@@ -65,6 +65,7 @@
            try
            {
                bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
                bool isUpdate = false;
                if (flag && value != null)
                {
                    OtherDevice device = (OtherDevice)value;
@@ -96,20 +97,27 @@
                                    Thread.Sleep(1000);
                                }
                            }
                            if (conveyorLineInfoRead != null && conveyorLineInfoRead.StatusPV == 2 && conveyorLineInfoRead.Command == 10)
                            if (conveyorLineInfoRead != null && conveyorLineInfoRead.StatusPV == 2 && conveyorLineInfoRead.Command == 10 && item.IsOccupied == 1)
                            {
                                item.IsOccupied = 0;
                                isUpdate = true;
                                WriteInfo("码垛工位状态更新",$"{item.StationCode}{DateTime.Now}更新工位状态:{conveyorLineInfoRead.Command}");
                            }
                            else
                            else if (item.IsOccupied == 0)
                            {
                                item.IsOccupied = 1;
                                isUpdate = true;
                                WriteInfo("码垛工位状态更新", $"{item.StationCode}{DateTime.Now}更新工位状态不可用");
                            }
                        }

                    }
                    if (isUpdate)
                    {
                    _stationMangerRepository.UpdateData(stationMangers);
                }
            }
            }
            catch (Exception ex)
            {
                WriteError(nameof(ConveyorLineJob_CPC),ex.Message);

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/Ö½±­ÉÏÁÏèì¼ÜͨѶЭÒé.xlsx

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/Ö½±­Ö½ÏäÉÏÁÏèì¼ÜͨѶЭÒé-251118.xlsx

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬÈý̨ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_1763189335703.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬÈý̨ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_17631893492052.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬÁ½Ì¨ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_17631892881691.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬÁ½Ì¨ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_17631893013030.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬËĄ̈ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_17631895456628.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬËĄ̈ÁϼÜDB¿éÊý¾Ý/Æóҵ΢ÐŽØͼ_17631895685290.png

Binary files differ

 ÏîÄ¿×ÊÁÏ/ͨÐÅЭÒé/ֽƬÁϼÜDB¿éÊý¾Ý.zip

Binary files differ