From 8bc688f992f70815084e958a728a696871294672 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 01 七月 2025 15:51:50 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 74 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index c314fd7..fb28716 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -1,4 +1,4 @@
-锘縰sing HH.WCS.QingXigongchang.process;
+锘縰sing HH.WCS.QingXigongchang.dispatch;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
using SqlSugar;
@@ -239,43 +239,55 @@
}
internal static void End(WMSTask task)
{
- var db = new SqlHelper<WMSTask>().GetInstance();
+ var db = new SqlHelper<object>().GetInstance();
-
- //plg 2025骞�鏈�3鏃�10:42:24
- if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD" && !string.IsNullOrEmpty(task.S_TWO_END_LOC))
+ if (task.S_END_LAREA == "YWLYLTKQ" || task.S_END_LAREA == "YWLTKKTQ")
{
- var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
- if (model != null)
+ //鏌ヨ鍑哄簱閿乊WLWJJB
+ var ls = LocationHelper.GetList<Location>(x => x.S_AREA_CODE == "YWLWJJB" && x.S_LOCK_STATE == "鍑哄簱閿�);
+ if (ls.Any())
{
- //鍏堣В閿佺粓鐐�鍦ㄩ攣瀹�- db.Ado.BeginTran();
- try
+ var tas = db.Queryable<WMSTask>().Where(a => a.S_START_LOC == ls.First().S_LOC_CODE).ToList().FirstOrDefault();
+ if (tas.S_B_STATE == "宸叉帹閫�)
{
- model.S_LOCK_STATE = "鏃�;
- var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
- LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:閿佺粨鏋� + res);
- db.Ado.CommitTran();
+ NDC.ChangeParamPri(tas.S_TASK_NO, 70);
}
- catch (Exception ex)
- {
- db.Ado.RollbackTran();
- LogHelper.Info("CreateTask 澶辫触 " + ex.Message);
- }
-
- LogHelper.Info(task.S_TWO_END_LOC + "浜屾浠诲姟 寮�銆�");
- var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
- //if (b)
- //{
- // if (task != null)
- // {
- // task.S_B_STATE = "瀹屾垚";
- // task.T_END_TIME = DateTime.Now;
- // db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
- // }
- //}
}
}
+ ////plg 2025骞�鏈�3鏃�10:42:24
+ //if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD" && !string.IsNullOrEmpty(task.S_TWO_END_LOC))
+ //{
+ // var model = db.Queryable<Location>().Where(a => a.S_LOC_CODE == task.S_TWO_END_LOC).First();
+ // if (model != null)
+ // {
+ // //鍏堣В閿佺粓鐐�鍦ㄩ攣瀹�+ // db.Ado.BeginTran();
+ // try
+ // {
+ // model.S_LOCK_STATE = "鏃�;
+ // var res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE }).ExecuteCommand() > 0;
+ // LogHelper.Info(task.S_TWO_END_LOC + "LockLoc:閿佺粨鏋� + res);
+ // db.Ado.CommitTran();
+ // }
+ // catch (Exception ex)
+ // {
+ // db.Ado.RollbackTran();
+ // LogHelper.Info("CreateTask 澶辫触 " + ex.Message);
+ // }
+
+ // LogHelper.Info(task.S_TWO_END_LOC + "浜屾浠诲姟 寮�銆�");
+ // var b = TaskProcess.CreateTransport(task.S_SRC_NO, task.S_END_LOC, task.S_TWO_END_LOC, "鍘熺墿鏂欐惉杩�绾哥", task.S_CNTRS.Split(',').ToList(), task.N_START_LAYER, 1, task.N_CNTR_COUNT, task.N_PRIORITY);
+ // //if (b)
+ // //{
+ // // if (task != null)
+ // // {
+ // // task.S_B_STATE = "瀹屾垚";
+ // // task.T_END_TIME = DateTime.Now;
+ // // db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.T_END_TIME }).ExecuteCommand();
+ // // }
+ // //}
+ // }
+ //}
if (task != null)
{
task.S_B_STATE = "瀹屾垚";
--
Gitblit v1.9.1