From 311af0e12107da928e0633f0b3a274e9bccc7e05 Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期三, 11 三月 2026 10:31:24 +0800
Subject: [PATCH] 继续优化老厂排程单页面（按照要求单独增加幅宽一列数据）
---
项目代码/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
index 40d3c7a..8dfe4f1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Server/Controllers/Task/PackaxisTaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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
}
}
--
Gitblit v1.9.3