From 55d902f1a23eefd3e3ead5491bf97612e8b9a1e4 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期四, 19 三月 2026 17:19:57 +0800
Subject: [PATCH] 修复老厂排程在没生成任务就不更新缺料状态的问题，按照要求修改库位平面图
---
项目代码/WCS/WCSServices/WIDESEAWCS_ITaskInfoService/IPackaxisTaskService.cs | 9 ---------
1 files changed, 0 insertions(+), 9 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 39f47d6..70b399f 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,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
}
}
\ No newline at end of file
--
Gitblit v1.9.3