From 87ce8f1a70dfbf819e6804a26ab8e845a134856c Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期四, 05 六月 2025 10:16:58 +0800
Subject: [PATCH] 批量删除任务
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 767 +++++++++++++++++++++++-----------------------------------
1 files changed, 311 insertions(+), 456 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 d185ef3..5f638a5 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
@@ -1,7 +1,9 @@
-锘縰sing Autofac.Core;
-using Mapster;
+锘縰sing Mapster;
using Masuit.Tools;
+using SqlSugar;
using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using WIDESEA_Cache;
using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
@@ -9,7 +11,6 @@
using WIDESEA_IStoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_QuartzJob.Models;
-
namespace WIDESEA_StorageTaskServices;
@@ -31,6 +32,8 @@
private readonly IAgingInOrOutInputService _agingInOrOutInputService; //闈欑疆\闄堝寲
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly IDt_ChangeoversRepository _dt_ChangeoversRepository;
+ private readonly ISimpleCacheService _simpleCacheService;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -48,7 +51,9 @@
IAgingInOrOutInputService agingInOrOutInputService,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ ISimpleCacheService simpleCacheService,
+ IDt_ChangeoversRepository dt_ChangeoversRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -65,6 +70,8 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _simpleCacheService = simpleCacheService;
+ _dt_ChangeoversRepository = dt_ChangeoversRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -78,86 +85,6 @@
{
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- #region 鑰佺増鏈�
- //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
- // .FirstAsync(x => x.EquipmentName == task.Roadway);
- //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);
- //if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB") //闈炲垎瀹瑰簱鍖轰笌褰撳墠宸ュ簭鏄疧CVB鍧囦笂鎶OM鍑哄叆绔�
- //{
- // var agingOutputDto = MapToAgingOutputDto(stock);
- // content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
- // //ValidateResponse(content);
- // var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- // if (!result.Success || !agingOutputDto.SerialNos[0].SerialNoResult)
- // {
- // if (result.MessageCode == "E10001")
- // {
- // var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
- // if (area == null)
- // {
- // throw new Exception("鏈壘鍒板搴旂殑搴撳尯淇℃伅");
- // }
- // var trayCells = new TrayCellsStatusDto()
- // {
- // Software = area.Spare3,
- // TrayBarcode = task.PalletCode,
- // EquipmentCode = area.Spare2,
- // SceneType = area.Spare4
- // };
- // content = await _cellStateService.GetTrayCellStatusAsync(trayCells);
- // if (!content.Status) return content;
-
- // var ResultTray = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- // if (ResultTray.SerialNos.Count > 0)
- // {
- // var parameterInfo = JsonConvert.DeserializeObject<List<ParameterInfo>>(stock.ParameterInfos).FirstOrDefault(y => y.Description.Contains("鏃堕棿"));
- // if (parameterInfo == null) throw new Exception("");
-
- // var outHours = (DateTime.Now - (stock.LinedProcessFeedbackTime == null ? stock.CreateDate : stock.LinedProcessFeedbackTime.ToDateTime())).TotalHours;
-
- // var isNG = outHours > parameterInfo.LowerSpecificationsLimit.ToDouble() && outHours < parameterInfo.UpperSpecificationsLimit.ToDouble();
-
- // var defectCode = string.Empty;
- // if (!isNG) defectCode = "TQCK";
- // var outputDto = new AgingOutputDto
- // {
- // OpFlag = 1,
- // Software = area.Spare3,
- // EquipmentCode = area.Spare2,
- // TrayBarcode = stock.PalletCode,
- // SerialNos = ResultTray.SerialNos.Select(x => new SerialNoOutDto
- // {
- // SlotNo = x.PositionNo,
- // SerialNo = x.SerialNo,
- // SerialNoResult = true, //isNG,
- // ParameterInfo = new List<ParameterInfoOutput> {
- // new ParameterInfoOutput() {
- // Value = outHours.ToString(),
- // ParameterCode =parameterInfo.ParameterCode,
- // ParameterDesc = parameterInfo.Description,
- // ParameterResult = "OK", //isNG.ToString(),
- // TargetValue = parameterInfo.TargetValue,
- // LowerLomit = parameterInfo.LowerSpecificationsLimit,
- // UpperLimit = parameterInfo.UpperSpecificationsLimit,
- // DefectCode = defectCode,
- // UOMCode = parameterInfo.UOMCode,
- // }
- // }
- // }).ToList()
- // };
-
- // content = await _agingInOrOutInputService.GetOCVOutputAsync(outputDto);
- // result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- // if (!result.Success)
- // task.Remark = "NG";
- // }
- // }
- // else
- // task.Remark = "NG";
- // }
- //}
- #endregion 鑰佺増鏈�
-
if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
if (!task.Roadway.Contains("FR") && stock.ProcessCode != "OCVB")
@@ -189,12 +116,12 @@
ConsoleHelper.WriteErrorLine("MOM閫氭姤鐐硅姱NG");
return content.Error("MOM閫氭姤鐐硅姱NG");
}
-
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
var taskHty = task.Adapt<Dt_Task_Hty>();
taskHty.FinishTime = DateTime.Now;
- taskHty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
stockInfo_Hty.ModifyDate = DateTime.Now;
@@ -212,6 +139,14 @@
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+ //try
+ //{
+ // _simpleCacheService.HashDel<DtStockInfo>(WIDESEA_Cache.CacheConst.Cache_DtStockInfo, new string[] { stock.PalletCode });
+ //}
+ //catch (Exception ex)
+ //{
+ // LogFactory.GetLog("鍒犻櫎缂撳瓨澶辫触").Error(true, $"{stock.PalletCode}_鍒犻櫎缂撳瓨澶辫触锛屽紓甯镐俊鎭細{ex.Message}");
+ //}
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
}
@@ -222,7 +157,7 @@
}
}
- private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto info = null)
+ private AgingOutputDto MapToAgingOutputDto(DtStockInfo stock, ResponseEqptRunDto? info = null)
{
// TODO Value鍊兼牴鎹甅OM涓嬪彂鐨勯潤缃椂闂村埌褰撳墠鏃堕棿鐨勫垎閽熸暟
var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == stock.AreaCode);
@@ -316,7 +251,7 @@
var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
if (!isStockUpdated)
{
- throw new Exception("搴撳瓨淇℃伅鏇存柊澶辫触");
+ throw new Exception("搴撲綅淇℃伅鏇存柊澶辫触");
}
}
@@ -349,6 +284,36 @@
}
#endregion 鍑哄簱浠诲姟瀹屾垚
+
+ #region 鐏浠诲姟瀹屾垚
+ public async Task<WebResponseContent> CompleteOutFireAlarmTaskAsync(Dt_Task task, DtStockInfo stock)
+ {
+ WebResponseContent content = new WebResponseContent();
+ (var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
+ taskHty.FinishTime = DateTime.Now;
+ taskHty.OperateType = App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.Creater = App.User.UserName != null ? App.User.UserName : "System";
+
+ DtStockInfo_Hty stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
+
+ // 浜嬪姟澶勭悊
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
+ {
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ await UpdateLocationAsync(loc); //璐ㄦ浠诲姟闇�瑕佹寔缁攣瀹氬簱浣�
+ }
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
+ return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
+ }
+ #endregion
#region 绉诲簱浠诲姟瀹屾垚
@@ -396,7 +361,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- if (task.TaskType == (int)TaskInboundTypeEnum.InNG || task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ if (task.TaskType == (int)TaskInboundTypeEnum.InNG)
{
task.TaskState = (int)TaskInStatusEnum.SC_InFinish;
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
@@ -446,6 +411,10 @@
if (isResult)
{
_locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(locationInf, lastStatus, (int)StatusChangeTypeEnum.AutomaticStorage, task.TaskNum);
+
+ stock.StockInfoDetails = new List<DtStockInfoDetail>() { { stock.StockInfoDetails[0] } };
+ stock.LocationInfo = locationInf;
+
content.OK("鍏ュ簱浠诲姟瀹屾垚鎴愬姛");
}
else
@@ -459,6 +428,9 @@
Console.WriteLine(err.Message.ToString());
LogFactory.GetLog("浠诲姟瀹屾垚").Error(true, err);
content.Error(err.Message);
+ task.ErrorMessage= err.Message;
+ task.TaskState=(int)TaskInStatusEnum.SC_InExecuting;
+ await BaseDal.Update(task);
}
return content;
}
@@ -594,9 +566,9 @@
{
isFull = respone.SpecialParameterDuration.IsNullOrEmpty();
}
- if (respone.ProductionLine == null || respone.ParameterInfos == null)
+ if (respone.ProductionLine == null || respone.ParameterInfos == null || respone.ParameterInfos.IsNullOrEmpty())
{
- throw new Exception("MOM鏁版嵁杩斿洖閿欒");
+ throw new Exception($"MOM鏁版嵁杩斿洖閿欒,浜х嚎{respone.ProductionLine},ParameterInfos{respone.ParameterInfos}");
}
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
stock.SpecialParameterDuration = respone.SpecialParameterDuration;
@@ -664,8 +636,15 @@
case (int)TaskOutboundTypeEnum.OutTray:
case (int)TaskOutboundTypeEnum.Outbound:
case (int)TaskOutboundTypeEnum.OutNG:
+ case (int)TaskOutboundTypeEnum.OutQuality:
+
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
+
+ case (int)TaskOutboundTypeEnum.OutFireAlarm:
+
+ LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鐏浠诲姟", "");
+ return await CompleteOutFireAlarmTaskAsync(task, stock);
case (int)TaskRelocationTypeEnum.Relocation:
return await CompleteTransferTaskAsync(task, stock);
@@ -678,244 +657,6 @@
#endregion 浠诲姟瀹屾垚
#region 璇锋眰浠诲姟鍏ュ簱
-
- #region
-
- /// <summary>
- /// 璇锋眰浠诲姟宸烽亾
- /// </summary>
- /// <param name="input">璇锋眰妯″瀷</param>
- /// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
- public async Task<WebResponseContent> RequestTaskAsync2(RequestTaskDto input)
- {
- // 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
- WebResponseContent content = new WebResponseContent();
-
- try
- {
- // 璋冪敤BaseDal.QueryFirstAsync鏂规硶锛屾煡璇换鍔�
- var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode);
- if (task != null)
- {
- //if (task.TaskState == (int)TaskInStatusEnum.InNew)
- {
- // 鍒涘缓WMS浠诲姟
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.Roadway,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = task.TaskType,
- };
- return content.OK(data: taskDTO);
- }
- }
-
- var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == input.PalletCode && x.IsFull);
- if (stock != null)
- {
- // TODO璐ㄦ鍥炲簱
- }
-
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.Spare1.Contains(input.Position));
- if (area == null)
- return content.Error("鏀圭偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
-
- // 鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- {
- Software = area.Spare3,
- TrayBarcode = input.PalletCode,
- EquipmentCode = area.Spare2,
- SceneType = area.Spare4,
- };
-
- // 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- content = await GetTrayCellStatusAsync(trayCells);
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) return content;
-
- // 娣诲姞缁勭洏淇℃伅
- // 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (!result.Success)
- return content.Error(result.MOMMessage);
-
- // 鑾峰彇寮傚父鐢佃姱
- List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
- if (serialNosError.Count > 0)
- {
- // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
- var efg = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
- //List<string> NGStation = input.Position == "1088" ? new List<string>() { "1020" } : new List<string>() { "JZSC01" };
- if (efg.Count <= 0)
- {
- throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆");
- }
- List<string> NGStation = efg.Select(x => x.stationNGLocation).ToList();
- if (NGStation.Count <= 0)
- {
- NGStation = efg.Select(x => x.stationNGChildCode).ToList();
- }
- content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, NGStation, 2);
- return content.Error("瀛樺湪寮傚父鐢佃姱");
- }
-
- if (result.SerialNos.Count <= 0)
- {
- // Todo 绌烘墭鐩樺叆搴撻�昏緫
- content = await RequestTrayInTaskAsync(input);
- return content;
- }
-
- var boxing = CreateBoxingInfo(result, input.PalletCode);
- //Console.WriteLine(boxing.ToJsonString());
- if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- if (result.ProcessCode == "OCVB")
- {
- //TODO 鍒ゆ柇闇�涓嶉渶瑕佸幓鍖呰锛屼笉闇�瑕佸氨鍘诲父娓╀笁
- var stationManagers = _stationManagerRepository.QueryData(x => x.stationPLC == "1018" && x.stationArea == "Cache");
- var station = stationManagers.Select(x => x.stationChildCode).ToList();
-
- // 鑾峰彇WCSip鍦板潃
- var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wcsBasez = configz.Where(x => x.ConfigKey == SysConfigConst.WCSIPAddress).FirstOrDefault()?.ConfigValue;
- var address = configz.Where(x => x.ConfigKey == SysConfigConst.GetStation).FirstOrDefault()?.ConfigValue;
- if (wcsBasez == null || address == null)
- {
- throw new InvalidOperationException("WCS IP 鏈厤缃�");
- }
- var wcsIpAddrss = wcsBasez + address;
-
- var abc = HttpHelper.PostAsync(wcsIpAddrss, station.ToJsonString()).Result;
- content = JsonConvert.DeserializeObject<WebResponseContent>(abc);
- if (content.Data.ObjToInt() > 0)
- {
- // TODO 閫佽嚦鍖呰
- List<string> strings = stationManagers.Where(x => x.stationType == 0).Select(x => x.Roadway).ToList();
- content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings, 3);
- return content;
- }
- else
- {
- var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
- var strings = config.ConfigValue.Split(',').ToList();
- // TODO 鍏ュ簱
- content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
- if (content.Status)
- await _boxingInfoRepository.AddDataNavAsync(boxing);
- }
- }
- else
- {
- // TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
- //var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
- //if (productions.Count <= 0)
- // return content.Error("鏂欐灞炴�т笉瀛樺湪");
-
- // 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
-
- //var boxing = CreateBoxingInfo(result, input.PalletCode);
- ////Console.WriteLine(boxing.ToJsonString());
- //if (boxing == null) return content.Error("缁勭洏澶辫触");
-
- // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
- ProcessApplyDto process = await GetProcessApplyAsync(result);
-
- // 濡傛灉process涓簄ull锛屽垯杩斿洖content
- if (process == null) return content;
-
- // 骞惰祴鍊间笂浣嶈蒋浠跺悕绉板拰璁惧缂栫爜
- process.Software = area.Spare3;
- process.EquipmentCode = area.Spare2;
-
- // 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
-
- // 璋冪敤_processApplyService.GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹虹敵璇�
- content = await _processApplyService.GetProcessApplyAsync(process);
-
- // 濡傛灉鐘舵�佷负false锛屽垯杩斿洖null
- if (!content.Status) return content.Error("宸ヨ壓鐢宠澶辫触");
-
- var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString());
- if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触");
-
- var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32();
- foreach (var item in resultProcessApply.ProcessInfo)
- {
- if (item.Number.ToInt32() == number + 1)
- {
- boxing.NextProcessCode = item.ProcessCode;
- }
- }
- Console.WriteLine();
- Console.WriteLine($"褰撳墠宸ュ簭锛歿boxing.ProcessCode}");
- Console.WriteLine($"涓嬩竴宸ュ簭锛歿boxing.NextProcessCode}");
-
- Console.WriteLine(area.AreaCode + "-----------------------");
- Console.WriteLine(input.Position + "-----------------------");
-
- var areaIn = string.Empty;
- switch (boxing.NextProcessCode)
- {
- case "CH01":
- areaIn = "CH001";
- break;
-
- case "JZ01":
- areaIn = "JZ001";
- break;
-
- case "GW01":
- areaIn = "GWSC1";
- break;
-
- case "CW01":
- areaIn = "CWSC1";
- break;
-
- case "CW02":
- areaIn = "CWSC2";
- break;
-
- default:
- break;
- }
-
- var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea.Contains(areaIn)).FirstOrDefault();
- if (stationManagers == null)
- {
- throw new Exception("鏈壘鍒板叆搴撶珯鍙伴厤缃�");
- }
- List<string> strings = stationManagers.Roadway.Split(',').ToList();
- Console.WriteLine(strings.ToJsonString() + "b-----------------------");
- //// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, result.ProductionLine, result.ProcessCode, strings);
- if (content.Status)
- {
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- }
- //}
- }
- }
- catch (Exception err)
- {
- // 濡傛灉鍙戠敓寮傚父锛屽垯璋冪敤content.Error鏂规硶锛岃褰曢敊璇俊鎭紝骞惰緭鍑洪敊璇俊鎭�
- content.Error(err.Message);
- Console.WriteLine(err.Message);
- }
-
- // 杩斿洖content
- return content;
- }
-
- #endregion 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
{
@@ -1001,7 +742,6 @@
return content.Error(result.MOMMessage);
}
-
if (result.SerialNos.Count <= 0)
{
var config = _configService.GetByConfigKey(CateGoryConst.CONFIG_SYS_InStacker, SysConfigConst.InboundIsEmpty);
@@ -1018,12 +758,13 @@
else
{
// 澶勭悊寮傚父鐢佃姱鎯呭喌
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
- if (serialNosError.Count > 0)
- {
- return await HandleErrorCells(input, area, serialNosError);
- }
-
+ #region 鐢佃姱鍒嗙粨鏋滃紓甯镐笉闇�瑕佹垜浠鐞�
+ //var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1 && x.SerialNoStatus != 4).ToList();
+ //if (serialNosError.Count > 0)
+ //{
+ // return await HandleErrorCells(input, area, serialNosError);
+ //}
+ #endregion
var boxing = CreateBoxingInfo(result, input.PalletCode);
if (boxing == null) return content.Error("缁勭洏澶辫触");
@@ -1079,18 +820,6 @@
{
// 鍒涘缓WMS浠诲姟
WMSTaskDTO taskDTO = CreateTaskDTO(task);
- //WMSTaskDTO taskDTO = new WMSTaskDTO()
- //{
- // TaskNum = task.TaskNum.Value,
- // Grade = 1,
- // PalletCode = task.PalletCode,
- // RoadWay = task.Roadway,
- // SourceAddress = task.SourceAddress,
- // TargetAddress = task.Roadway,
- // TaskState = task.TaskState.Value,
- // Id = 0,
- // TaskType = task.TaskType,
- //};
return content.OK(data: task);
}
@@ -1118,7 +847,6 @@
return content.Error("褰撳墠鎵樼洏鏃犱骇绾�,鑱旂郴MOM娣诲姞浜х嚎");
}
-
var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
if (stationManagers == null)
{
@@ -1126,7 +854,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);
}
@@ -1146,21 +906,44 @@
// 鑾峰彇缁勭洏淇℃伅
private DtBoxingInfo CreateBoxingInfo(ResultTrayCellsStatus result, string palletCode)
{
- return new DtBoxingInfo
+ var boxing=_boxingInfoRepository.QueryFirst(x=>x.PalletCode== palletCode);
+ if (boxing == null)
{
- PalletCode = palletCode,
- IsFull = true,
- ProcessCode = result.ProcessCode,
- ProductionLine = result.ProductionLine,
- BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
+ return new DtBoxingInfo
{
- SerialNumber = serialNoObj.SerialNo,
- OrderNo = serialNoObj.PositionNo.ToString(),
- Status = serialNoObj.SerialNoStatus,
- MaterielCode = result.BindCode,
- Remark = result.TrayBarcodePropertys.ToJsonString(),
- }).ToList()
- };
+ PalletCode = palletCode,
+ IsFull = true,
+ ProcessCode = result.ProcessCode,
+ ProductionLine = result.ProductionLine,
+ BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
+ {
+ SerialNumber = serialNoObj.SerialNo,
+ OrderNo = serialNoObj.PositionNo.ToString(),
+ Status = serialNoObj.SerialNoStatus,
+ MaterielCode = result.BindCode,
+ Remark = result.TrayBarcodePropertys.ToJsonString(),
+ }).ToList()
+ };
+ }
+ else
+ {
+ _boxingInfoRepository.DeleteData(boxing);
+ return new DtBoxingInfo
+ {
+ PalletCode = palletCode,
+ IsFull = true,
+ ProcessCode = result.ProcessCode,
+ ProductionLine = result.ProductionLine,
+ BoxingInfoDetails = result.SerialNos.Select(serialNoObj => new DtBoxingInfoDetail
+ {
+ SerialNumber = serialNoObj.SerialNo,
+ OrderNo = serialNoObj.PositionNo.ToString(),
+ Status = serialNoObj.SerialNoStatus,
+ MaterielCode = result.BindCode,
+ Remark = result.TrayBarcodePropertys.ToJsonString(),
+ }).ToList()
+ };
+ }
}
// 鑾峰彇宸ヨ壓鐢宠
@@ -1177,7 +960,7 @@
};
}
- #endregion 澶栭儴鎺ュ彛鏂规硶
+ #endregion 璇锋眰浠诲姟鍏ュ簱
#region 璇锋眰鍑哄簱锛堝疄鐩�&绌虹洏锛�
@@ -1205,7 +988,6 @@
}
//ConsoleHelper.WriteColorLine(JsonConvert.SerializeObject(stockInfo), ConsoleColor.DarkMagenta);
-
// 鏂板閲嶅浠诲姟鏍￠獙
var hasTask = BaseDal.QueryFirst(x => x.PalletCode == stockInfo.PalletCode);
@@ -1240,7 +1022,7 @@
{
// 璁板綍寮傚父淇℃伅骞舵姏鍑�
LogFactory.GetLog("璇锋眰鎵樼洏浠诲姟").Error(true, ex);
- ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message);
+ ConsoleHelper.WriteErrorLine("璇锋眰绌�/瀹炴墭鐩樹换鍔�" + ex.Message + "\r\n" + ex.StackTrace);
return content.Error(ex.Message);
}
}
@@ -1250,22 +1032,47 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayAsync(string areaCode, List<string> devices, string productionLine)
{
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ try
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ if (area == null)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{areaCode}鐨勬暟鎹�");
+ return null;
+ }
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList();
- //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
- return result;
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == area.AreaCode)
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ var result = new DtStockInfo();
+
+ result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo)
+ .Includes(x => x.StockInfoDetails)
+ .Where(x => x.AreaCode == areaCode && x.OutboundTime < DateTime.Now && x.IsFull)
+ .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+ .WhereIF(!devices.IsNullOrEmpty(), x => devices.Contains(x.LocationInfo.RoadwayNo))
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ .OrderBy(x => x.OutboundTime)
+ .FirstAsync();
+
+ if (result.IsNullOrEmpty())
+ ConsoleHelper.WriteErrorLine($"{area.AreaName}-{productionLine}鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
+ return null;
+ }
}
/// <summary>
@@ -1273,33 +1080,56 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForRealTrayCWAsync(List<string> areaCodes, string productionLine)
{
- var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
- if (areaId.Count == 0)
+ try
{
- ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+ var areaId = (await _areaInfoRepository.QueryDataAsync(x => areaCodes.Contains(x.AreaCode))).Select(x => x.AreaID).ToList();
+ if (areaId.Count == 0)
+ {
+ ConsoleHelper.WriteErrorLine($"鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅鏃�,鏈壘鍒板尯鍩熶唬鐮佷负{JsonConvert.SerializeObject(areaCodes)}鐨勬暟鎹�");
+ return null;
+ }
+
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ //List<string> materielCodes = null;
+ //if (outBoundMateriel.Count != 0)
+ //{
+ // materielCodes = outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0]).Select(x => x.MaterielCode).ToList();
+ //}
+
+ //var outBoundMateriel = AppSettings.app<OutBoundMateriel>("OutBoundMateriel");
+ var outBoundMateriel = _dt_ChangeoversRepository.QueryData(x => x.Status == "1").ToList();
+ List<string>? materielCodes = outBoundMateriel.Count != 0
+ ? outBoundMateriel.Where(x => x.ProductionLine == productionLine && x.ProcessCode == areaCodes[0])
+ .Select(x => x.MaterielCode)
+ .ToList()
+ : null;
+
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => x.DeviceCode.Contains("CWSC"))
+ .ToList().Select(x => x.DeviceCode).ToList();
+
+ var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
+ .Includes(x => x.LocationInfo)
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .Includes(x => x.StockInfoDetails)
+ .WhereIF(!materielCodes.IsNullOrEmpty(), x => x.StockInfoDetails.Any(y => materielCodes.Contains(y.MaterielCode)))
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
+
+ if (result.IsNullOrEmpty())
+ ConsoleHelper.WriteErrorLine($"{JsonConvert.SerializeObject(areaCodes)}-{productionLine}鏌ヨ甯告俯瀹炵洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
+
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForRealTrayCWAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
return null;
}
-
- var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
- .Where(x => x.DeviceStatus == "1")
- .Where(x => x.DeviceCode.Contains("CWSC"))
- .ToList();
- var deviceCode = devices.Select(x => x.DeviceCode).ToList();
-
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => areaCodes.Contains(x.AreaCode) && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
- .WhereIF(!productionLine.IsNullOrEmpty(), x => x.ProductionLine == productionLine)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && areaId.Contains(x.LocationInfo.AreaId) && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .FirstAsync(); // 鑾峰彇绗竴涓厓绱�
-
- //var firstOrDefault = result.FirstOrDefault(x => roadways.Contains(x.LocationInfo.RoadwayNo)); // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
- return result;
}
/// <summary>
@@ -1307,36 +1137,42 @@
/// </summary>
private async Task<DtStockInfo> QueryStockInfoForEmptyTrayAsync(string areaCode, string position)
{
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
+ try
+ {
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == areaCode);
- ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
- var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
+ ConsoleHelper.WriteColorLine(position + "..." + areaCode, ConsoleColor.Magenta);
+ var station = await _stationManagerRepository.QueryFirstAsync(x => x.stationChildCode == position && x.stationType == 17);
- ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
- var stackers = station.Roadway.Split(',').ToList();
+ ConsoleHelper.WriteColorLine(station.Roadway, ConsoleColor.Magenta);
+ var stackers = station.Roadway.Split(',').ToList();
+ var deviceCode = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
+ .Where(x => x.DeviceStatus == "1")
+ .Where(x => stackers.Contains(x.DeviceCode))
+ .ToList().Select(x => x.DeviceCode).ToList();
- var devices = SqlSugarHelper.DbWCS.Queryable<Dt_DeviceInfo>()
- .Where(x => x.DeviceStatus == "1")
- .Where(x => stackers.Contains(x.DeviceCode))
- .ToList();
+ var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Where(x => x.ProductionLine == station.productLine)
+ .Where(x => x.AreaCode == areaCode && x.IsFull == false)
+ .Includes(x => x.StockInfoDetails)
+ .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
+ .Includes(x => x.LocationInfo)
+ .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
+ .OrderBy(x => x.CreateDate) // 鎺掑簭
+ .FirstAsync(); // 杞崲涓哄垪琛�
- var deviceCode = devices.Select(x => x.DeviceCode).ToList();
+ if (result.IsNullOrEmpty())
+ ConsoleHelper.WriteErrorLine($"{area}-{station.productLine}鏌ヨ绌虹洏搴撳瓨淇℃伅澶辫触:鏈壘鍒扮鍚堟潯浠剁殑鏁版嵁");
- var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => x.ProductionLine == station.productLine)
- .Where(x => x.AreaCode == areaCode && x.IsFull == false)
- .Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
- .WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
- .OrderBy(x => x.CreateDate) // 鎺掑簭
- .FirstAsync(); // 杞崲涓哄垪琛�
-
- //var firstOrDefault = result[0]; // 鏌ユ壘绗竴涓尮閰嶇殑鍏冪礌
- //return firstOrDefault;
- return result;
+ return result;
+ }
+ catch (Exception ex)
+ {
+ ConsoleHelper.WriteErrorLine("QueryStockInfoForEmptyTrayAsync鏌ヨ瀹炵洏搴撳瓨淇℃伅澶辫触:" + ex.Message + "\r\n" + ex.StackTrace);
+ return null;
+ }
}
/// <summary>
@@ -1472,7 +1308,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
{
@@ -1662,7 +1506,7 @@
// content.Error(ex.Message);
//}
//return content;
- #endregion
+ #endregion 闈欑疆寮傚父鍙ｅ叆搴�
WebResponseContent content = new WebResponseContent();
try
{
@@ -1732,7 +1576,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.Inbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -1770,7 +1614,7 @@
TaskState = (int)TaskInStatusEnum.Line_InFinish,
TaskType = (int)TaskInboundTypeEnum.InTray,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = result.ProductionLine,
ProcessCode = result.ProcessCode,
};
@@ -1803,7 +1647,6 @@
}
return content;
}
-
private WMSTaskDTO CreateWMSTaskDTO(object source)
{
@@ -1845,11 +1688,9 @@
}
}
- #endregion 闈欑疆寮傚父鍙ｅ叆搴�
-
#endregion 澶栭儴鎺ュ彛鏂规硶
-
+ #endregion 澶栭儴鎺ュ彛鏂规硶
#region 鍐呴儴璋冪敤鏂规硶
@@ -1899,21 +1740,23 @@
// 鍒涘缓鍘嗗彶浠诲姟瀹炰緥妯″瀷
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key[0]));
- if (task == null)
+ foreach (object item in key)
{
- return content.Error("鏈壘鍒颁换鍔′俊鎭�!");
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == Convert.ToInt32(key));
+ if (task == null)
+ {
+ return content.Error("鏈壘鍒颁换鍔′俊鎭�!");
+ }
+ var taskHtyNG = CreateHistoricalTask(task, true);
+
+ // 鎵ц鏁版嵁搴撲簨鍔�
+
+ // 娣诲姞鍘嗗彶浠诲姟
+ var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0;
+
+ // 鍒犻櫎浠诲姟鏁版嵁
+ var isTaskDelete = BaseDal.Delete(task.TaskId);
}
- var taskHtyNG = CreateHistoricalTask(task, true);
-
- // 鎵ц鏁版嵁搴撲簨鍔�
-
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = _task_HtyRepository.AddData(taskHtyNG) > 0;
-
- // 鍒犻櫎浠诲姟鏁版嵁
- var isTaskDelete = BaseDal.Delete(task.TaskId);
-
return content.OK("鍒犻櫎鎴愬姛!");
}
catch (Exception ex)
@@ -2041,7 +1884,7 @@
var taskHty = _mapper.Map<Dt_Task_Hty>(task);
taskHty.FinishTime = DateTime.Now;
taskHty.TaskId = 0;
- taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : (int)OperateTypeEnum.鑷姩瀹屾垚;
+ taskHty.OperateType = isHand ? (int)OperateTypeEnum.浜哄伐鍒犻櫎 : App.User.UserName != null ? (int)OperateTypeEnum.浜哄伐瀹屾垚 : (int)OperateTypeEnum.鑷姩瀹屾垚;
taskHty.SourceId = task.TaskId;
if (isHand)
{
@@ -2103,20 +1946,34 @@
}
}
+ #region 鏇存柊搴撳瓨淇℃伅锛堟殏鏃朵笉闇�瑕侊級
if (stock.IsFull)
{
+ // 鏌ヨ绗﹀悎鏉′欢鐨勫簱瀛樹俊鎭�
var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+
+ // 鏌ヨ浠诲姟淇℃伅
+ var tasks = BaseDal.QueryData(x => x.PalletCode != stock.PalletCode && x.ProductionLine == stock.ProductionLine).Select(x => x.PalletCode).ToList();
+
if (stocks != null && stocks.Count > 0)
{
- foreach (var item in stocks)
+ // 杩囨护鍑洪渶瑕佹洿鏂扮殑搴撳瓨淇℃伅
+ var stocksToUpdate = stocks.Where(item => !tasks.Contains(item.PalletCode)).ToList();
+ foreach (var item in stocksToUpdate)
{
+ // 鏇存柊搴撳瓨淇℃伅鐨勭壒瀹氬弬鏁�
item.SpecialParameterDuration = stock.SpecialParameterDuration;
item.ParameterInfos = stock.ParameterInfos;
item.OutboundTime = Convert.ToDateTime(item.LinedProcessFeedbackTime == null ? item.CreateDate : item.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(stock.SpecialParameterDuration));
}
- var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocks);
+ if (stocksToUpdate.Count > 0)
+ {
+ // 寮傛鏇存柊搴撳瓨淇℃伅
+ var isUpdates = await _stockInfoRepository.UpdateDataAsync(stocksToUpdate);
+ }
}
}
+ #endregion
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -2150,7 +2007,6 @@
}
#region 浠诲姟璇锋眰鏂规硶
-
private static readonly SemaphoreSlim _semaphoreUpdate = new SemaphoreSlim(1, 1);
// 鏇存柊浠诲姟璐т綅
@@ -2238,7 +2094,6 @@
}
catch (Exception)
{
-
throw;
}
finally { _semaphoreUpdate.Release(); }
@@ -2309,7 +2164,7 @@
TaskState = flag == 3 ? (int)TaskOutStatusEnum.OutNew : (int)TaskInStatusEnum.InNew,
TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : flag == 2 ? (int)TaskInboundTypeEnum.InNG : (int)TaskOutboundTypeEnum.Outbound,
TaskNum = await BaseDal.GetTaskNo(),
- Creater = "Systeam",
+ Creater = "System",
ProductionLine = productionLine,
ProcessCode = processCode
};
@@ -2352,8 +2207,8 @@
return content;
}
-
private static readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+
/// <summary>
/// 鏌ユ壘璐т綅
/// </summary>
--
Gitblit v1.9.3