From fc25dda9baf3b5f4df23d35914f3dd343cf492e3 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期一, 28 七月 2025 17:30:21 +0800
Subject: [PATCH] 优化WCSHelper / 序列号生成逻辑 , 添加强制任务处理模块
---
api/ApiHelper.cs | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 7328525..08ce187 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -77,7 +77,6 @@
}
catch (Exception ex) {
return NewSimpleResult(ex, preLog);
-
}
}
@@ -239,16 +238,11 @@
var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, model.CntId, taskInfo.TaskName);
- if (needUpdateContainer) {
- cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�- cntr.T_MODIFY = DateTime.Now;
- }
- else {
- cntr = null;
- }
+ cntr.S_SOURCE = task.S_CODE; // 鐢ㄤ换鍔″彿浣滀负瀹瑰櫒鏇存柊鐨勪緷鎹�+ cntr.T_MODIFY = DateTime.Now;
(ok, msg) = DbTran.CreateTask(new CreateTaskObj {
- ContainerToUpdate = cntr,
+ ContainerToUpdate = needUpdateContainer ? cntr : null,
StartLocToUpdate = startLoc,
EndLocToUpdate = endLoc,
TaskToInsert = task,
@@ -659,9 +653,10 @@
}
private static string GenerateOrderNo(string snType, string prefix) {
- var id = SYSHelper.GetSerialNumber(snType, prefix);
- var date = DateTime.Now.ToString("yyMMdd");
- return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
+ //var id = SYSHelper.GetSerialNumberResetByDay(snType, prefix);
+ //var date = DateTime.Now.ToString("yyMMdd");
+ //return $"{prefix}{date}-{id.ToString().PadLeft(4, '0')}";
+ return SYSHelper.GenerateSN(snType, prefix, "yyMMdd");
}
/// <summary>
--
Gitblit v1.9.1