From 7afc439ba32e234ebc455c98fa084ae6eef8a621 Mon Sep 17 00:00:00 2001
From: lss <2538410689@qq.com>
Date: 星期四, 03 七月 2025 17:24:04 +0800
Subject: [PATCH] 优化
---
HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs | 190 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 174 insertions(+), 16 deletions(-)
diff --git a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
index 1fbc2fc..d013a31 100644
--- a/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
+++ b/HH.WCS.Mobox3/HH.WCS.Mobox3.JiaTong/wms/LocationHelper.cs
@@ -3,9 +3,11 @@
using NLog.Fluent;
using SqlSugar;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using static HH.WCS.JiaTong.dispatch.NDC;
@@ -200,6 +202,7 @@
"K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
"U", "V", "W", "X", "Y", "Z"
};
+
/// <summary>
/// 鏍规嵁鐗╂枡鎵炬墭鐩� /// </summary>
@@ -209,7 +212,10 @@
/// <returns></returns>
internal static List<Location> GetLocByItemCode(string areaCode, string ItemCode, string lev)
{
+
List<Location> locs;
+
+
var db = new SqlHelper<object>().GetInstance();
var queryable = db.Queryable<Location>()
.LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
@@ -241,7 +247,7 @@
{
locs = queryable.Where((a, b, c) => c.LEV == lev && c.S_BS_TYPE == "浣欐枡").ToList();
}
- LogHelper.Info($"GetLocByItemCode=>鏌ユ壘浣欐枡,{JsonConvert.SerializeObject(locs)}");
+ // LogHelper.Info($"GetLocByItemCode=>鏌ユ壘浣欐枡,{JsonConvert.SerializeObject(locs)}");
//娌℃湁浣欐枡鍒欏鎵惧叏閮ㄧ墿鏂� if (locs.Count == 0)
@@ -262,7 +268,7 @@
}
LogHelper.Info($"GetLocByItemCode=>鏃犱綑鏂�鏌ユ壘鍏ㄩ儴{JsonConvert.SerializeObject(queryable.ToList())}");
-
+
if (string.IsNullOrEmpty(lev))
{
locs = queryable.ToList();
@@ -281,24 +287,65 @@
/// 鏍规嵁搴撳尯鑾峰彇绌烘墭
/// </summary>
/// <param name="areaCode">搴撳尯缂栫爜</param>
- /// <param name="lev">鐗╂枡绛夌骇</param>
- /// <param name="ItemCode">鐗╂枡缂栫爜</param>
/// <returns></returns>
- internal static Location GetLocByAreacode(string areaCode)
+ internal static Location GetLocByAreacode(string areaCode, string type)
{
Location loc = new Location();
var db = new SqlHelper<object>().GetInstance();
+ string CntrCodeWith = "";
+ if (type.Trim().Contains("MA"))
+ {
+ CntrCodeWith = "MA";
+ }
+ else if (type.Trim().Contains("NA"))
+ {
+ CntrCodeWith = "NA";
+ }
+ if (CntrCodeWith == "")
+ {
+ LogHelper.Info($"鎵樼洏绫诲瀷{type}涓嶅湪瑙勫畾鑼冨洿");
+ }
var query = db.Queryable<Location>()
- .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
- .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
- .Where((a, b, c) => a.S_AREA_CODE == areaCode && a.N_CURRENT_NUM == 1
- && a.N_LOCK_STATE == 0
- && b.S_CNTR_CODE != null
- );
+ .LeftJoin<LocCntrRel>((a, b) => a.S_CODE == b.S_LOC_CODE)
+ .LeftJoin<CntrItemDetail>((a, b, c) => b.S_CNTR_CODE == c.S_CNTR_CODE)
+ .Where((a, b, c) => a.S_AREA_CODE == areaCode && a.N_CURRENT_NUM == 1
+ && a.N_LOCK_STATE == 0
+ && b.S_CNTR_CODE != null && b.S_CNTR_CODE.Contains(CntrCodeWith) && c.S_ITEM_CODE == null
+ );
loc = query.First();
+
+
return loc;
}
+ /// <summary>
+ /// 鍒嗛厤鐢垫璐т綅
+ /// </summary>
+ /// <returns></returns>
+ internal static Location GetElevatorLoc()
+ {
+ var db = new SqlHelper<object>().GetInstance();
+ Location location = new Location();
+ //鏌ユ壘鍏ㄩ儴鐢垫锛屽垎閰嶄换鍔℃渶灏戠殑鐢垫
+ var devices = Settings.deviceInfos.Where(a => a.deviceType == 2 && a.enable == 1).ToList();
+ string[] state = new string[] { "鎵ц涓�, "寮�鍙栬揣", "鍙栬揣瀹屾垚" };
+ Dictionary<int, string> dics = new Dictionary<int, string>();
+ foreach (var deviceInfo in devices)
+ {
+ int mst = db.Queryable<WCSTask>().Where(a => a.S_TYPE.Contains("鐢垫") && state.Contains(a.S_B_STATE) && a.S_END_LOC == deviceInfo.TN_Location).Count();
+ dics.Add(mst, deviceInfo.TN_Location);
+ }
+ if (dics.Count > 0)
+ {
+ var dic = dics.OrderBy(a => a.Key).First();
+ location = db.Queryable<Location>().Where(a => a.S_CODE == dic.Value).First();
+ if (location == null)
+ {
+ LogHelper.Info($"鏍规嵁璐т綅缂栫爜:{dic.Value},鏈壘鍒板搴旇揣浣�);
+ }
+ }
+ return location;
+ }
/// <summary>
/// 鏍规嵁鐗╂枡缂栫爜锛屼粨搴撶紪鐮佽幏鍙栨墭鐩樻暟閲� /// </summary>
@@ -478,15 +525,15 @@
}
/// <summary>
- /// 鏍规嵁璐т綅闆嗗悎鑾峰彇 娌℃湁瀹瑰櫒 娌℃湁閿佺殑璐т綅
+ /// 鏍规嵁璐т綅鑾峰彇璐т綅淇℃伅
/// </summary>
/// <param name="loc"></param>
/// <returns></returns>
- internal static List<Location> GetLocListEmptyFree(List<string> loc)
+ internal static Location GetLocByLoc(string loc)
{
//1.0 鏌ヨ揣浣嶅鍣ㄨ〃
var db = new SqlHelper<object>().GetInstance();
- var list = db.Queryable<Location>().Where(a => loc.Contains(a.S_CODE) && a.N_CURRENT_NUM == 0 && a.S_LOCK_STATE.Trim() == "鏃�).ToList();
+ var list = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
return list;
}
@@ -517,7 +564,11 @@
}
else
{
- LogHelper.Info($"閿佸畾璐т綅{loc}鎴愬姛");
+ LogHelper.Info($"閿佸畾璐т綅{loc}澶辫触,閲嶆柊閿�);
+ Task.Run(() =>
+ {
+ LockLoc(loc, lockState);
+ });
}
return res;
}
@@ -568,13 +619,121 @@
var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
try
{
+ LogHelper.Info($"BindingLoc锛氬紑濮嬭В缁戝鍣細{JsonConvert.SerializeObject(cntrs)}");
db.BeginTran();
var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
+ //if (!string.IsNullOrEmpty(location.S_NOTE) && lcrList.Count > 0)
+ //{
+ // if (location.S_NOTE == "鍙犵洏" || location.S_NOTE.Trim() == "鐗囪兌鍫嗗彔浣�)
+ // {
+ // LogHelper.Info("鍙犵洏璐т綅鍒犻櫎鎵樼洏");
+ // cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
+
+ // }
+ //}
+ if (lcrList.Count > 0)
+ {
+ cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
+ }
var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
location.N_CURRENT_NUM = lcrList.Count - count;
location.S_LOCK_STATE = "鏃�;
location.N_LOCK_STATE = 0;
db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
+ LogHelper.Info($"BindingLoc锛氳В缁戝鍣細{JsonConvert.SerializeObject(cntrs)}鎴愬姛");
+ db.CommitTran();
+ res = true;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"BindingLoc Error:{ex}");
+ db.RollbackTran();
+ }
+ return res;
+ }
+
+ /// <summary>
+ /// 搴撲綅娓呯┖
+ /// </summary>
+ /// <param name="loc"></param>
+ /// <param name="cntrs"></param>
+ /// <returns></returns>
+ public static bool Clear(string loc, List<string> cntrs)
+ {
+ var res = false;
+ var db = new SqlHelper<object>().GetInstance();
+
+ try
+ {
+ var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
+ if (location == null)
+ {
+ LogHelper.Info($"Clear锛氳揣浣嶏細{loc}璐т綅琛ㄦ煡璇㈤敊璇紝璇峰亣鏌ヨ揣浣嶈〃");
+ return res;
+ }
+ LogHelper.Info($"Clear锛氬紑濮嬭В缁戝鍣細{JsonConvert.SerializeObject(cntrs)}");
+ db.BeginTran();
+ var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
+ if (lcrList.Count > 0)
+ {
+ cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
+ }
+ var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
+ LogHelper.Info($"Clear锛氬紑濮嬪垹闄ゅ鍣細{JsonConvert.SerializeObject(cntrs)}");
+ db.Deleteable<Container>().Where(it => cntrs.Contains(it.S_CODE)).ExecuteCommand();
+
+ location.N_CURRENT_NUM = lcrList.Count - count;
+ location.S_LOCK_STATE = "鏃�;
+ location.N_LOCK_STATE = 0;
+ db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
+ LogHelper.Info($"Clear锛氬紑濮嬪垹闄ゅ鍣ㄧ墿鏂欙細{JsonConvert.SerializeObject(cntrs)}");
+ var CntrItem = db.Queryable<CntrItemDetail>().Where(a => cntrs.Contains(a.S_CNTR_CODE.Trim())).First();
+ if (CntrItem != null)
+ {
+ db.Deleteable<CntrItemDetail>().Where(it => cntrs.Contains(it.S_CNTR_CODE)).ExecuteCommand();
+ }
+ else
+ {
+ LogHelper.Info($"Clear=銆嬫墭鐩�{JsonConvert.SerializeObject(cntrs)}鏃犵墿鏂欐暟鎹�);
+
+ }
+ LogHelper.Info($"BindingLoc锛氳В缁戝鍣細{JsonConvert.SerializeObject(cntrs)}鎴愬姛");
+ db.CommitTran();
+ res = true;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Info($"BindingLoc Error:{ex}");
+ db.RollbackTran();
+ }
+ return res;
+ }
+ /// <summary>
+ /// 瑙ｉ攣璐т綅锛屽垹闄よ揣浣嶆墭鐩�+ /// </summary>
+ /// <param name="loc"></param>
+ /// <returns></returns>
+ public static bool UnlockLocDeleteCntrs(string loc)
+ {
+ var res = false;
+ var db = new SqlHelper<object>().GetInstance();
+ List<string> cntrs = null;int count = 0;
+ var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
+ try
+ {
+ var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
+ if (lcrList.Count > 0)
+ {
+ cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();
+ count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE.Trim()) && it.S_LOC_CODE.Trim() == loc).ExecuteCommand();
+ LogHelper.Info($"Clear锛氬紑濮嬪垹闄ゅ鍣細{JsonConvert.SerializeObject(cntrs)}");
+ db.Deleteable<Container>().Where(it => cntrs.Contains(it.S_CODE)).ExecuteCommand();
+ }
+ db.BeginTran();
+ location.N_CURRENT_NUM = lcrList.Count - count;
+ location.S_LOCK_STATE = "鏃�;
+ location.N_LOCK_STATE = 0;
+ db.Updateable(location).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();
db.CommitTran();
res = true;
}
@@ -584,7 +743,6 @@
}
return res;
}
-
/// <summary>
/// 瑙ｉ攣璐т綅
/// </summary>
--
Gitblit v1.9.1