From db825ff9bb1352e79c3e018a647b3c88713d6f69 Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期六, 05 七月 2025 14:07:29 +0800
Subject: [PATCH] Merge branch 'master' of http://121.37.118.194:8000/r/WMSPrjInstance/HH-0014_NongFu_QingXi
---
HH.WCS.QingXiNongfu/wms/LocationHelper.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
index dc6c1d0..a50a32f 100644
--- a/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
+++ b/HH.WCS.QingXiNongfu/wms/LocationHelper.cs
@@ -1,17 +1,11 @@
锘縰sing HH.WCS.QingXigongchang.process;
using HH.WCS.QingXigongchang.util;
using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
using SqlSugar;
using System;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
-using System.Security.Cryptography;
-using System.Text;
-using System.Threading.Tasks;
-using static HH.WCS.QingXigongchang.dispatch.NDC;
namespace HH.WCS.QingXigongchang.wms
{
@@ -181,6 +175,13 @@
}
}
}
+ return locs;
+ }
+
+ public static List<Location> GetAreaNormalLocListAll(string areeacode)
+ {
+ var locs = LocationHelper.GetLocList(x => x.S_AREA_CODE == areeacode && x.S_LOCK_STATE.Trim() == "鏃� && x.N_CURRENT_NUM == 0);
+
return locs;
}
internal static List<Location> GetAllLocListByAreaCode(string _areacode, int minRow, int maxRow)
@@ -796,7 +797,7 @@
LogHelper.Info($"{plc.deviceName}-{workOrder.SQL_WorkNo}閾炬帴鐨勪骇绾垮彿{LineTo} BolArea 鏈厤缃�");
goto ______label____end;
}
- bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea, true, false);
+ bitslocs = LocationHelper.GetAreaNormalLocList(ba.UsingBolArea);
//var bits = Settings.GetInStockCacheList().Where(a => a.deviceName == _t)?.Select(x => x.location);
//bitslocs = LocationHelper.GetAllLocList().Where(x => bits.Contains(x.S_LOC_CODE.Trim())).ToList();
@@ -1131,7 +1132,7 @@
#endregion
else if (plc.deviceType == 6 || plc.deviceType == 10 || plc.deviceType == 4)
{
- LogHelper.Info("plc.deviceType == 6.10.4" + workOrder.SQL_UsingNow);
+ LogHelper.Info("plc.deviceType == 6.10.4 鍗充骇?锛� + workOrder.SQL_UsingNow);
//var LineTo = workOrder.SQL_LinkLineNO;
var ba = Settings.GetBolAreaList().Find(x => x.DeviceName == plc.deviceName && x.deviceType == plc.deviceType);
if (ba == null)
@@ -1399,7 +1400,7 @@
}
else
{
- LogHelper.Info($"4610,娌℃湁鍙敤婊℃");
+ LogHelper.Info($"缈绘枟绾plc.deviceName},娌℃湁鍙敤婊℃");
}
}
else
--
Gitblit v1.9.1