From 7583978e1c6046b4cdfe9e1a18efd328a3b73e5d Mon Sep 17 00:00:00 2001
From: liulijun <liulijun@hnkhzn.com>
Date: 星期二, 10 三月 2026 17:26:22 +0800
Subject: [PATCH] 优化老厂排程单信息页面（添加物料编号和幅宽的数据显示）
---
项目代码/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
index 12bd851..aaf20c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_TaskInfoService/PackaxisTaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/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
{
--
Gitblit v1.9.3