From c4e968254a4f1c5d538a9fd91284b4843ea08198 Mon Sep 17 00:00:00 2001
From: kazelee <1847801760@qq.com>
Date: 星期五, 23 五月 2025 10:44:58 +0800
Subject: [PATCH] 内部联调，修复问题，添加取消任务功能
---
api/DebugController.cs | 121 ++++++++++++++++++++++++---------------
1 files changed, 74 insertions(+), 47 deletions(-)
diff --git a/api/DebugController.cs b/api/DebugController.cs
index b59eb96..7f8d113 100644
--- a/api/DebugController.cs
+++ b/api/DebugController.cs
@@ -100,57 +100,61 @@
return gzResults;
}
- /// <summary>
- /// 鍒濆鍖栨暟鎹簱
- /// </summary>
- /// <returns></returns>
- [HttpPost]
- [Route("CreateDatabase")]
- public string CreateDatabase(CoverInfo model) {
- try {
- var db = new SqlHelper<object>().GetInstance();
- var cover = model.IsCover;
+ ///// <summary>
+ ///// 鍒濆鍖栨暟鎹簱
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost]
+ //[Route("CreateDatabase")]
+ //public string CreateDatabase(CoverInfo model) {
+ // try {
+ // var db = new SqlHelper<object>().GetInstance();
+ // var cover = model.IsCover;
- var entityTypes = new Type[] {
- typeof(TN_CAR_IN),
- typeof(TN_CG_Detail),
- typeof(TN_Container),
- typeof(TN_Loc_Container),
- typeof(TN_Location),
- typeof(TN_Task),
- typeof(TN_Task_Action),
- typeof(SYSHelper.OI_SYS_MAXID),
+ // var entityTypes = new Type[] {
+ // typeof(TN_CAR_IN),
+ // typeof(TN_CG_Detail),
+ // typeof(TN_Container),
+ // typeof(TN_Loc_Container),
+ // typeof(TN_Location),
+ // typeof(TN_Task),
+ // typeof(TN_Task_Action),
+ // typeof(SYSHelper.OI_SYS_MAXID),
- };
+ // typeof(TN_Count_Plan),
+ // typeof(TN_Count_Order),
+ // typeof(TN_Count_CG_Detail),
+ // typeof(TN_Count_Diff),
+ // };
- using (var tran = db.Ado.UseTran()) {
- if (cover) {
- // 鍒犻櫎鎵�湁琛紙鎸変緷璧栧叧绯诲�搴忥級
- var tables = db.DbMaintenance.GetTableInfoList();
- foreach (var table in tables.OrderByDescending(t => t.Name)) {
- db.DbMaintenance.DropTable(table.Name);
- }
+ // using (var tran = db.Ado.UseTran()) {
+ // if (cover) {
+ // // 鍒犻櫎鎵�湁琛紙鎸変緷璧栧叧绯诲�搴忥級
+ // var tables = db.DbMaintenance.GetTableInfoList();
+ // foreach (var table in tables.OrderByDescending(t => t.Name)) {
+ // db.DbMaintenance.DropTable(table.Name);
+ // }
- // 鍒涘缓鏂拌〃
- db.CodeFirst.InitTables(entityTypes);
+ // // 鍒涘缓鏂拌〃
+ // db.CodeFirst.InitTables(entityTypes);
- //db.CodeFirst.BackupTable().InitTables(entityTypes);
- }
- else {
- db.CodeFirst.InitTables(entityTypes);
- }
+ // //db.CodeFirst.BackupTable().InitTables(entityTypes);
+ // }
+ // else {
+ // db.CodeFirst.InitTables(entityTypes);
+ // }
- tran.CommitTran();
- }
+ // tran.CommitTran();
+ // }
- }
- catch (Exception ex) {
- LogHelper.Info($"鍙戠敓浜嗗紓甯�);
- return "鍒濆鍖栨暟鎹簱閿欒" + ex.Message;
- }
+ // }
+ // catch (Exception ex) {
+ // LogHelper.Info($"鍙戠敓浜嗗紓甯�);
+ // return "鍒濆鍖栨暟鎹簱閿欒" + ex.Message;
+ // }
- return "鎴愬姛";
- }
+ // return "鎴愬姛";
+ //}
/// <summary>
/// DEBUG锛氭彃鍏ヨ揣浣嶃�瀹瑰櫒銆佽揣鍝佷俊鎭�@@ -247,6 +251,11 @@
}
}
+ /// <summary>
+ /// DEBUG锛氭牴鎹换鍔″彿璁剧疆鐗╂枡閲嶉噺
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
[HttpPost]
[Route("SetTaskWeight")]
public string SetTaskWeight(SetTaskWeightInfo model) {
@@ -258,16 +267,34 @@
return "鎵句笉鍒板搴旂殑鐗╂枡淇℃伅";
}
+ var task = db.Queryable<TN_Task>()
+ .Where(t => t.S_CODE == model.TaskNo).First();
+
+ if (cgDetail == null) {
+ return "鎵句笉鍒板搴旂殑浠诲姟鍙�;
+ }
+
cgDetail.F_QTY = model.Weight;
+ task.F_WEIGHT = model.Weight;
try {
- if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY)
+ using (var tran = db.Ado.UseTran()) {
+ if (db.Updateable<TN_CG_Detail>(cgDetail).UpdateColumns(it => it.F_QTY)
.ExecuteCommand() <= 0) {
- return "淇敼澶辫触";
- }
- return "淇敼鎴愬姛";
+ tran.RollbackTran();
+ return "淇敼澶辫触";
+ }
+ if (db.Updateable<TN_Task>(task).UpdateColumns(it => it.F_WEIGHT).ExecuteCommand() <= 0) {
+ tran.RollbackTran();
+ return "淇敼澶辫触";
+ }
+ tran.CommitTran();
+ }
+ LogHelper.Info($"妯℃嫙AGV浼犻�鐗╂枡閲嶉噺锛氫慨鏀逛换鍔″彿{task.S_CODE}閲嶉噺涓簕model.Weight}", "HosttoagvTask");
+ return "淇敼鎴愬姛";
}
+
catch (Exception ex) {
return ex.Message;
--
Gitblit v1.9.1