From 3942151eea031aee17de2dc2890df33d845aae6b Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期日, 29 九月 2024 16:46:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index db73aa9..8820828 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -262,7 +262,7 @@
{
TaskNo = modTask.TaskNo,
PalletNo = modTask.PalletNo,
- TaskType = ((int)TaskTypeEnum.In).ToString(),
+ TaskType = ((int)modTask.TaskType).ToString(),
TaskStatus = ((int)TaskStatusEnum.Complete).ToString()
};
//浠诲姟璇︽儏
@@ -299,6 +299,7 @@
/// </summary>
/// <param name="codeFlag"></param>
/// <returns></returns>
+ [NonAction]
public string GetTaskCode(string codeFlag="WCS")
{
var list = _db.Queryable<WcsTask>().Where(m => m.TaskNo.StartsWith("WCS")).ToList();
@@ -316,10 +317,10 @@
}
else
{
- if (maxNo.Length==15 && maxNo.Substring(0, 8) == date)
+ if (maxNo.Length==12 && maxNo.Substring(0, 8) == date)
{
- int lastNo = Convert.ToInt32(maxNo.Substring(8, 5)) + 1;
- no = codeFlag + date + (lastNo.ToString().PadLeft(5, '0'));
+ int lastNo = Convert.ToInt32(maxNo.Substring(8, 4)) + 1;
+ no = codeFlag + date + (lastNo.ToString().PadLeft(4, '0'));
}
else
{
--
Gitblit v1.8.0