From ec50f98285c1a6eeb0b009b70445cc3ac64737c7 Mon Sep 17 00:00:00 2001
From: czw <selecti@yeah.net>
Date: 星期二, 22 七月 2025 18:09:27 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index fb28716..c9acc35 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -1,4 +1,5 @@
锘縰sing HH.WCS.QingXigongchang.dispatch;
+using HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
using SqlSugar;
@@ -17,13 +18,24 @@
var date = DateTime.Now.ToString("yyMMdd");
return $"TN{date}{id.ToString().PadLeft(4, '0')}";
}
- internal static bool UpdateStatus(WMSTask task, string status)
+ internal static bool UpdateStatus(WMSTask task, string status, CntrItemRel CntItem = null)
{
var res = false;
var db = new SqlHelper<WMSTask>().GetInstance();
- task.S_B_STATE = status;
- db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
- return res;
+ if (CntItem != null)
+ {
+ task.S_ITEM_NAME = CntItem?.S_ITEM_NAME;
+ task.S_ITEM_CODE = CntItem?.S_ITEM_CODE;
+ task.S_B_STATE = status;
+ db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE, it.S_ITEM_NAME, it.S_ITEM_CODE }).ExecuteCommand();
+ return res;
+ }
+ else
+ {
+ task.S_B_STATE = status;
+ db.Updateable(task).UpdateColumns(it => new { it.S_B_STATE }).ExecuteCommand();
+ return res;
+ }
}
internal static bool UpdateInfo(WMSTask task, string sourceNo, string endBit, string status)
{
@@ -105,7 +117,7 @@
else if (endLoc.S_AREA_CODE == "YWLWJJB")
{
//鏌ヨ浠诲姟琛� 瑕佹眰鏄彧鑳界敓鎴愪袱涓换鍔�璧风偣搴撳尯涓篩WLWJJB hh_plg 2025骞�鏈�鏃�
- List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷" };
+ List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷", "鎺ㄩ�寮傚父" };
var TaskListNum = LocationHelper.GetList<WMSTask>(x => x.S_END_LAREA == "YWLWJJB" && !TaskState.Contains(x.S_B_STATE));
if (TaskListNum.Count() >= 2)
{
@@ -241,6 +253,21 @@
{
var db = new SqlHelper<object>().GetInstance();
+ if (task.S_START_LOC == "YWLT1TSJCD-1" && task.N_START_LAYER == 2)
+ {
+ var _clrel = LocationHelper.GetLocCntrRel(task.S_START_LOC);
+
+ if (_clrel != null)
+ {
+ var sta = db.Queryable<Location>().Where(l => l.S_LOC_CODE == task.S_START_LOC).First();
+ if (sta.N_CURRENT_NUM > 0 && sta.S_LOCK_STATE == "鏃�)
+ {
+ var sign = Settings.GetTimeStamp();
+ var res = TaskProcess.CreateTransport(sign, task.S_START_LOC, task.S_END_LOC, "鍘熺墿鏂欐惉杩�绾哥", new List<string> { _clrel.FirstOrDefault().S_CNTR_CODE }, sta.N_CURRENT_NUM, 1, 1, 60);
+ }
+ }
+ }
+
if (task.S_END_LAREA == "YWLYLTKQ" || task.S_END_LAREA == "YWLTKKTQ")
{
//鏌ヨ鍑哄簱閿乊WLWJJB
--
Gitblit v1.9.1