From 02f63552cc964132b9348cf27c3f73f65db750f2 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期一, 14 四月 2025 11:33:18 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 64 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 15 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index eda759d..3b62b3b 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -137,17 +137,11 @@
});
try
{
- //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
- //{
_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
- //}
}
catch (Exception ex)
{
LogFactory.GetLog("鍒犻櫎缂撳瓨澶辫触").Error(true, $"{stock.PalletCode}_鍒犻櫎缂撳瓨澶辫触锛屽紓甯镐俊鎭細{ex.Message}");
- //using (_simpleCacheService.AcquireLock(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, 2000))
- //{
- //}
}
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -825,7 +819,39 @@
if (stationManagers == null)
throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴鍜屽叆搴撶珯鍙伴厤缃�");
}
- List<string> strings = stationManagers.Roadway.Split(',').ToList();
+ List<string> strings;
+ if (input.Position == "1016-3")
+ {
+ var configOne = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.CHInboundEmptyProductLineOne);
+ var configTwo = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.CHInboundEmptyProductLineTwo);
+
+ List<string> productLineconfigOne = configOne.ConfigValue.Split(',').ToList();
+ List<string> productLineconfigTwo = configTwo.ConfigValue.Split(',').ToList();
+
+ if (productLineconfigOne.Count == 0 && productLineconfigTwo.Count() == 0)
+ {
+ ConsoleHelper.WriteErrorLine($"鏈壘鍒伴厤缃枃浠朵骇绾块厤缃�");
+ return content.Error("鏈壘鍒伴厤缃枃浠朵骇绾块厤缃�");
+ }
+ if (productLineconfigOne.Contains(result.ProductionLine))
+ {
+ strings = configOne.Remark.Split(',').ToList();
+ }
+ else if (productLineconfigTwo.Contains(result.ProductionLine))
+ {
+ strings = configTwo.Remark.Split(',').ToList();
+ }
+ else
+ {
+ ConsoleHelper.WriteErrorLine($"鏈壘鍒皗result.ProductionLine}瀵瑰簲閰嶇疆宸烽亾");
+ return content.Error($"鏈壘鍒皗result.ProductionLine}瀵瑰簲閰嶇疆宸烽亾");
+ }
+ }
+ else
+ {
+ strings = stationManagers.Roadway.Split(',').ToList();
+ }
+
return await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 1);
}
@@ -968,11 +994,10 @@
List<DtStockInfo> stockInfoList = stockInfos.Values.ToList();
var result = new DtStockInfo();
- //if (stockInfoList.IsNullOrEmpty())
- //{
- // stockInfoList = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- // .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock).IncludesAllFirstLayer().ToListAsync();
- //}
+ if (areaCode == "CH001")
+ {
+ LogFactory.GetLog("CH001").Info(true, JsonConvert.SerializeObject(stockInfoList[0], Formatting.Indented));
+ }
result = stockInfoList.Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
.WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
@@ -982,16 +1007,17 @@
.OrderBy(x => x.OutboundTime)
.FirstOrDefault();
+
if (result != null)
_simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { result.PalletCode });
else
- ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
+ ConsoleHelper.WriteErrorLine($"{areaCode}-{productionLine}鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
return result;
}
catch (Exception ex)
{
- ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
+ ConsoleHelper.WriteErrorLine("鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
return null;
}
}
@@ -1237,7 +1263,15 @@
if (stockInfo.AreaCode.Contains("CH"))
{
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
- task = CreateTask(stockInfo, "1020-1", taskType);
+ if(stockInfo.LocationInfo.RoadwayNo=="CHSC1"|| stockInfo.LocationInfo.RoadwayNo == "CHSC2"|| stockInfo.LocationInfo.RoadwayNo == "CHSC3")
+ {
+ task = CreateTask(stockInfo, "1020-1", taskType);
+ }
+ else
+ {
+ task = CreateTask(stockInfo, "1049-1", taskType);
+ }
+
}
else
{
--
Gitblit v1.9.3