From 75c4ed0d3c640e66bc95dc170de52b753629e3ed Mon Sep 17 00:00:00 2001
From: 雷神教育集团 <2244205553@qq.com>
Date: 星期五, 06 三月 2026 09:09:14 +0800
Subject: [PATCH] 最新
---
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
index 2a109eb..39f47d6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs"
@@ -7,7 +7,10 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseServices;
+<<<<<<< HEAD
+=======
using WIDESEAWCS_DTO.TaskInfo;
+>>>>>>> main
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITaskInfoService
@@ -30,6 +33,8 @@
WebResponseContent TaskCompleted(int taskNum=0,Dt_PackaxisTask? packaxisTask=null);
//鐮佸灈缁撴墭骞朵笂浼犵爜鍨涘伐浣嶇爜鍨涙槑缁嗘暟鎹�
WebResponseContent BoxingInBound(string stationCode);
+<<<<<<< HEAD
+=======
///// <summary>
///// 鍒犻櫎鐮佸灈浠诲姟
@@ -39,5 +44,6 @@
WebResponseContent PickaixsTaskDele(int PackTaskNum);
+>>>>>>> main
}
}
\ No newline at end of file
--
Gitblit v1.9.3