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

wangxinhui

2026-03-07 d82252f08a32f5786ffe231b7fd301b6a60781d6

 ÏîÄ¿´úÂë/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
    }
}