From 7d331e13fef4abcec306745dbe9721bafbaf1821 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期一, 30 六月 2025 19:10:14 +0800
Subject: [PATCH] 1
---
HH.WCS.QingXiNongfu/wms/TaskHelper.cs | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
index 76c1125..c314fd7 100644
--- a/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/TaskHelper.cs
@@ -1,14 +1,11 @@
-锘縰sing HH.WCS.QingXigongchang.dispatch;
-using HH.WCS.QingXigongchang.process;
+锘縰sing HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
-using NLog.Fluent;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
-using System.Threading.Tasks;
namespace HH.WCS.QingXigongchang.wms
{
@@ -89,18 +86,19 @@
{
var fromLoc = LocationHelper.GetLoc(from);
var endLoc = LocationHelper.GetLoc(to);
-
+ var chi = new SqlHelper<object>().GetInstance();
+ var newDb = chi.CopyNew();
//NDCHelper.ChangeParam(taskNo, agvsite, 2);
//NDCHelper.ChangeParam(taskNo, 2, 6);
if (fromLoc.S_AREA_CODE == "YWLRGDD")
{
//鏌ヨ浠诲姟琛� 瑕佹眰鏄彧鑳界敓鎴愪袱涓换鍔�璧风偣搴撳尯涓篩WLRGDD hh_plg 2025骞�鏈�鏃�
- List<string> TaskState = new List<string>() { "瀹屾垚", "鍙栨秷" };
- var TaskListNum = LocationHelper.GetList<WMSTask>(x => x.S_START_LAREA == "YWLRGDD" && !TaskState.Contains(x.S_B_STATE));
- if (TaskListNum.Count() >= 2)
+
+ var TaskListNum = newDb.Queryable<Location>().Where(l => l.S_AREA_CODE == "YWLRGDD" && l.S_LOCK_STATE == "鍑哄簱閿�).ToList();
+ if (TaskListNum.Count() >= 3)
{
- LogHelper.Info($"CreateTransport- CreateTask Error" + $"璧风偣搴撳尯涓篩WLRGDD 鍒欐渶澶氬彧鑳界敓鎴愪袱涓换鍔�);
+ LogHelper.Info($"CreateTransport- CreateTask Error" + $"璧风偣搴撳尯涓篩WLRGDD 鍒欐渶澶氬彧鑳界敓鎴愪笁涓换鍔�);
return false;
}
}
@@ -245,7 +243,7 @@
//plg 2025骞�鏈�3鏃�10:42:24
- if (task.S_END_LAREA == "YWLWJJB" && task.S_START_LAREA != "YWLRGDD")
+ 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)
--
Gitblit v1.9.1