From b3d20305722ae41ca0093ea034b12373dfdd2b3b Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期二, 10 六月 2025 16:21:23 +0800
Subject: [PATCH] 变更需求开发
---
HH.WCS.QingXiNongfu/process/TaskProcess.cs | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/process/TaskProcess.cs b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
index 8d25bc1..2a50fd8 100644
--- a/HH.WCS.QingXiNongfu/process/TaskProcess.cs
+++ b/HH.WCS.QingXiNongfu/process/TaskProcess.cs
@@ -1,26 +1,14 @@
-锘縰sing HH.WCS.QingXigongchang.api;
-using HH.WCS.QingXigongchang.core;
-using HH.WCS.QingXigongchang.device;
+锘縰sing HH.WCS.QingXigongchang.device;
using HH.WCS.QingXigongchang.dispatch;
using HH.WCS.QingXigongchang.util;
using HH.WCS.QingXigongchang.wms;
using Newtonsoft.Json;
-using NLog.Fluent;
using SqlSugar;
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Runtime.InteropServices;
-using System.Security.Cryptography;
-using System.Security.Policy;
using System.Threading;
-using System.Threading.Tasks;
-using System.Web.Http.Results;
using static HH.WCS.QingXigongchang.api.ApiModel;
-using static HH.WCS.QingXigongchang.device.OITcpHelper;
using Monitor = HH.WCS.QingXigongchang.core.Monitor;
namespace HH.WCS.QingXigongchang.process
@@ -321,6 +309,7 @@
return result;
}
+
/// <summary>
/// 浠诲姟鐘舵�鏇存柊澶勭悊
/// </summary>
@@ -397,11 +386,26 @@
//}
}
+ //缁堢偣璐т綅涓�YWLT1TSJCD 鎴栬� YWLT2TSJCD 鐨�瑕佸彇璐у畬鎴愯В閿佽捣鐐癸紝瑙ｇ粦璧风偣锛岀粦瀹氱粓鐐癸紝鍗歌揣瀹屾垚锛岃В閿佺粓鐐� 2025骞�鏈�0鏃� Plg
+ if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
+ {
+ //瑙ｇ粦璧风偣
+ CacheBitUpdate(mst, load: true);
+ //缁戝畾缁堢偣
+ CacheBitUpdate(mst, load: false);
+ }
LocationHelper.UnLockLoc(mst.S_START_LOC.Trim());
}
//new List<string> { "鎴愬搧婊℃-鍏ュ簱", "" }
if (state == 6 || state == 5)
{
+ ///鍙渶瑕侀噴鏀捐揣浣嶅氨琛屼簡
+ if (mst.S_END_LOC?.Trim() == "YWLT1TSJCD" || mst.S_END_LOC?.Trim() == "YWLT2TSJCD")
+ {
+ LocationHelper.UnLockLoc(mst.S_END_LOC.Trim());
+ return r;
+ }
+
LogHelper.Info($"浠诲姟绫诲瀷锛歿mst.S_TYPE}- 鍔ㄤ綔锛歿state}. 鏄惁5绠�锛焮mst.S_TYPE.Contains("鎴愬搧婊℃") || mst.S_TYPE.Contains("澶囪揣")} ");
if (mst.S_TYPE.Contains("澶囪揣"))
{
@@ -426,7 +430,10 @@
&& mst.S_TYPE.Trim() != "鐡剁洊绌虹瓙杞繍-J2"
&& mst.S_TYPE.Trim() != "闈掓邯绾哥鎼繍鐗╂枡"
&& !mst.S_TYPE.Trim().Contains("鑷敱鐐瑰鐐�))
+ {
CacheBitUpdate(mst, load: false, mst.S_NOTE);
+ }
+
if (mst.S_TYPE.Trim().Contains("鎴愬搧-绌烘墭涓婄嚎"))
{
--
Gitblit v1.9.1