From 67844d0b962e62d65e5c118d3251aeeeda50810f Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期日, 16 二月 2025 11:24:09 +0800
Subject: [PATCH] 1
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 47 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 37 insertions(+), 10 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
index d2bece9..6250387 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs
@@ -1,7 +1,9 @@
锘縰sing Masuit.Tools;
+using SqlSugar;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
+//using WIDESEAWCS_Model.Models;
namespace WIDESEA_StorageTaskServices;
@@ -41,6 +43,8 @@
// 鍒ゆ柇闇�涓嶉渶瑕佸幓鍖呰锛屼笉闇�瑕佸氨鍘诲父娓╀笁
var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache" && x.productLine == input.ProductionLine);
+ var STATION = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
+
//var station = stationManagers.Select(x => x.stationChildCode).ToList();
//// 鑾峰彇WCSip鍦板潃鐩稿叧閰嶇疆
@@ -55,13 +59,13 @@
//var num = content.Data.ObjToInt();
//濡傛灉褰撳墠搴撳唴瀛樺湪姣斿綋鍓嶆椂闂寸殑瀵瑰簲浜х嚎鐨勬枡 鍒欏叆搴撹嚦甯告俯3
- DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(x => x.AreaCode == "CWSC3" && x.IsFull == true && x.ProductionLine == input.ProductionLine && x.OutboundTime < DateTime.Now);
+ DtStockInfo stockInfo = _stockInfoRepository.QueryFirst(x => x.AreaCode == "CWSC3" && x.IsFull == true && x.ProductionLine == STATION.productLine && x.OutboundTime < DateTime.Now);
if (stockInfo != null)
{
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// 鍏ュ簱閫佽嚦甯告俯3
- var resultContent = await CreateNewTask(input, strings);
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
if (resultContent.Status)
{
await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -70,19 +74,24 @@
}
// TODO 鍒ゆ柇鍦ㄩ�旀暟閲�
- var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
- if (count <= 10)
+
+ var needBarcode = await SqlSugarHelper.DbWCS.Queryable<dt_needBarcode>().FirstAsync(x => x.productLine == STATION.productLine);
+ var needCount = needBarcode.inLineNum;
+ //var count = BaseDal.QueryData(x => x.TargetAddress == stationManagers[0].Roadway).Count;
+ if (needCount < 2)
{
// 閫佽嚦鍖呰
List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- return await CreateNewTask(input, strings, 3);
+ var x = await SqlSugarHelper.DbWCS.Updateable<dt_needBarcode>().SetColumns(x => x.inLineNum == x.inLineNum + 1).ExecuteCommandHasChangeAsync();
+ ConsoleHelper.WriteSuccessLine($"鍦ㄩ�旀暟閲忔坊鍔爗(x ? "鎴愬姛" : "澶辫触")}鏁伴噺+1");
+ return await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings, 3);
}
else
{
var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
var strings = config.ConfigValue.Split(',').ToList();
// 鍏ュ簱閫佽嚦甯告俯3
- var resultContent = await CreateNewTask(input, strings);
+ var resultContent = await CreateNewTask(input, input.ProductionLine, boxing.ProcessCode, strings);
if (resultContent.Status)
{
await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -115,7 +124,11 @@
if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
- if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
+ if (!resultProcessApply.Success)
+ {
+ return await HandleErrorCells(input, area);
+ //return content.Error("宸ヨ壓鐢宠澶辫触");
+ }
var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault().Number.ToInt32();
foreach (var item in resultProcessApply.ProcessInfo)
@@ -132,9 +145,22 @@
{
throw new Exception("鏈壘鍒板叆搴撶珯鍙伴厤缃�");
}
+ //List<string> strings;
+ //if (areaIn == "GWSC1")
+ //{
+ // strings = new List<string>
+ // {
+ // (boxing.ProductionLine != null && boxing.ProductionLine == "ZJ-7") ? "GWSC1" : "GWSC2"
+ // };
+ //}
+ //else
+ //{
+ // strings = stationManagers.Roadway.Split(',').ToList();
+ //}
+
List<string> strings = stationManagers.Roadway.Split(',').ToList();
- var resultContent = await CreateNewTask(input, strings);
+ var resultContent = await CreateNewTask(input, result.ProductionLine, boxing.ProcessCode, strings);
if (resultContent.Status)
{
var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
@@ -196,7 +222,7 @@
// NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
//}
List<string> NGStation = stationManagers.stationNGChildCode.Split(',').ToList();
- content = await CreateNewTask(input, NGStation, 2);
+ content = await CreateNewTask(input, input.ProductionLine, "", NGStation, 2);
return content.Error("瀛樺湪寮傚父鐢佃姱");
}
@@ -226,7 +252,8 @@
TargetAddress = task.Roadway,
TaskState = task.TaskState.Value,
Id = 0,
- TaskType = task.TaskType
+ TaskType = task.TaskType,
+ ProductionLine = task.ProductionLine,
};
return new WebResponseContent().OK(data: taskDTO);
}
--
Gitblit v1.9.3