From 0ed390381862dea0c7fd0210d16017eb09f12da4 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期三, 30 七月 2025 17:27:27 +0800
Subject: [PATCH] 封装插入容器表等业务代码, 修复部分底层旧框架方法问题
---
api/ApiHelper.cs | 36 ++++++++++++------------------------
1 files changed, 12 insertions(+), 24 deletions(-)
diff --git a/api/ApiHelper.cs b/api/ApiHelper.cs
index 7328525..909bdee 100644
--- a/api/ApiHelper.cs
+++ b/api/ApiHelper.cs
@@ -27,6 +27,7 @@
public static SimpleResult GoodpackOffline(GoodpackOfflineInfo model) {
var db = new SqlHelper<object>().GetInstance();
var (ok, msg) = (false, string.Empty);
+ var obj = new CreateTaskObj();
var taskInfo = ETask.M婊＄涓嬬嚎鍏ュ簱.Info();
const string preLog = "API:婊＄涓嬬嚎鍏ュ簱:";
@@ -53,10 +54,9 @@
}
// 鍜屾弧鎵樹笅绾垮叆搴撶殑閫昏緫涓�嚧,鐢变簬瀹瑰櫒绉诲姩涓嶄細鏇存敼缁戝畾淇℃伅,鎵�互蹇呴』鍒犻櫎鏃ф暟鎹�- var old = WCSHelper.GetLocCntrCg(cgDetail.S_CNTR_CODE, skipCgDetail: true);
+ WMSHelper.FindCntrOldInfo(obj, cgDetail.S_CNTR_CODE, skipCgDetail: true);
- var locCntrRel = WCSHelper.BindLocCntr(startLoc, cgDetail.S_CNTR_CODE);
- locCntrRel.S_CNTR_TYPE = cntrType;
+ var locCntrRel = WMSHelper.BindLocCntr(obj, startLoc, cgDetail.S_CNTR_CODE, cntrType);
var endLoc = db.Queryable<TN_Location>().Where(DbExpr.EndLoc(areas: taskInfo.EndAreas))
.OrderBy(l => new { l.N_LAYER }).First();
@@ -64,20 +64,12 @@
return NewSimpleResult(3, preLog + LogMsg.EndLocNotFound(areas: taskInfo.EndAreas));
}
- var task = WCSHelper.BuildTaskWithLocLock(startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
-
- (ok, msg) = DbTran.CreateTask(new CreateTaskObj {
- Old = old,
- New = new LocCntrCg { LocCntrRel = locCntrRel },
- StartLocToUpdate = startLoc,
- EndLocToUpdate = endLoc,
- TaskToInsert = task,
- });
+ WMSHelper.CreateTask(obj, startLoc, endLoc, locCntrRel.S_CNTR_CODE, taskInfo.TaskName);
+ (ok, msg) = DbTran.CreateTask(obj);
return NewSimpleResult(ok ? 0 : 500, preLog + msg);
}
catch (Exception ex) {
return NewSimpleResult(ex, preLog);
-
}
}
@@ -239,16 +231,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 +646,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