From 01ba2e2affa33320ef8aca6e033248388bb8f60e Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期二, 10 十二月 2024 11:04:41 +0800
Subject: [PATCH] 高温出库修改
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 490 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 404 insertions(+), 86 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 311ccd4..e8a35a4 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,14 +1,22 @@
锘�
+using AngleSharp.Io;
+using log4net.Core;
using Mapster;
using Masuit.Tools;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using SixLabors.Fonts.Tables.AdvancedTypographic;
+using WIDESEA_Core.Const;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEA_IStoragIntegrationServices;
+using WIDESEA_Model.Models;
+using WIDESEA_Services;
using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_BasicInfoRepository;
+using WIDESEAWCS_Model.Models;
-namespace WIDESEA_StorageOutTaskServices;
+namespace WIDESEA_StorageTaskServices;
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
@@ -85,7 +93,7 @@
content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
//ValidateResponse(content);
var result = JsonConvert.DeserializeObject<BasicResult>(content.Data.ToString());
- if (!result.Success)
+ if (!result.Success || !agingOutputDto.SerialNos[0].SerialNoResult)
{
task.Remark = "NG";
}
@@ -94,15 +102,20 @@
// 鏇存柊搴撳瓨鐘舵�佸拰浠诲姟鐘舵��
(var loc, var tas) = UpdateStockAndTaskStatus(stock, task);
+ var taskHty = task.Adapt<Dt_Task_Hty>();
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
{
+ if (task.TaskType != (int)TaskOutboundTypeEnum.OutQuality)
+ {
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ }
await UpdateLocationAsync(loc);
- await DeleteStockInfoAsync(stock.Id);
- await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
- if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW")) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
- await DeleteTaskAsync(task.TaskId);
+ //if (task.Roadway.Contains("FR") || task.Roadway.Contains("GW") || task.TaskType == (int)TaskOutboundTypeEnum.OutTray) //濡傛灉鏄垎瀹规垨楂樻俯鍑哄簱 灏嗕换鍔″垹闄�
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -151,7 +164,7 @@
{
SlotNo = x.OrderNo.ToInt32(),
SerialNo = x.SerialNumber,
- SerialNoResult = true,
+ SerialNoResult = isNG,
ParameterInfo = new List<ParameterInfoOutput> {
new ParameterInfoOutput() {
Value = outHours.ToString(),
@@ -161,7 +174,8 @@
TargetValue = parameterInfo.TargetValue,
LowerLomit = parameterInfo.LowerSpecificationsLimit,
UpperLimit = parameterInfo.UpperSpecificationsLimit,
- DefectCode = defectCode
+ DefectCode = defectCode,
+ UOMCode = parameterInfo.UOMCode,
}
}
}).ToList()
@@ -221,6 +235,15 @@
if (!isTaskUpdated)
{
throw new Exception("浠诲姟淇℃伅鏇存柊澶辫触");
+ }
+ }
+
+ private async Task AddTaskHtyAsync(Dt_Task_Hty taskHty)
+ {
+ var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+ if (!isTaskAdd)
+ {
+ throw new Exception("鍘嗗彶浠诲姟淇℃伅娣诲姞澶辫触");
}
}
@@ -392,9 +415,24 @@
var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
if (loation == null)
throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
- var area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
- if (area == null)
- throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+
+ var area = new Dt_AreaInfo();
+ if (task.Roadway.Contains("FR"))
+ {
+ area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ }
+ else
+ {
+ var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
+ if (station.stationPLC == "1017")
+ area = _areaInfoRepository.QueryFirst(x => x.AreaID == Convert.ToInt32(station.stationNGLocation));
+ else
+ area = _areaInfoRepository.QueryFirst(x => x.AreaID == loation.AreaId);
+ if (area == null)
+ throw new Exception("鏈壘鍒板搴斿尯鍩熶俊鎭�");
+ }
+
+
var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
var stock = new DtStockInfo()
@@ -420,6 +458,7 @@
EquipmentCode = area.Spare2,
Software = area.Spare3
};
+
var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
@@ -465,7 +504,6 @@
{
return await CompleteInToOutTaskAsync(task);
}
-
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
@@ -474,11 +512,13 @@
{
case (int)TaskInboundTypeEnum.Inbound:
case (int)TaskInboundTypeEnum.InTray:
+ case (int)TaskInboundTypeEnum.InNG:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍏ュ簱浠诲姟", "");
return await CompleteInboundTaskAsync(task);
case (int)TaskOutboundTypeEnum.OutTray:
case (int)TaskOutboundTypeEnum.Outbound:
+ case (int)TaskOutboundTypeEnum.OutNG:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task, stock);
@@ -491,12 +531,13 @@
#region 璇锋眰浠诲姟鍏ュ簱
+ #region
/// <summary>
/// 璇锋眰浠诲姟宸烽亾
/// </summary>
/// <param name="input">璇锋眰妯″瀷</param>
/// <returns>鍖呭惈浠诲姟淇℃伅鐨勫搷搴斿唴瀹�</returns>
- public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
+ public async Task<WebResponseContent> RequestTaskAsync2(RequestTaskDto input)
{
// 鍒涘缓涓�涓猈ebResponseContent瀵硅薄
WebResponseContent content = new WebResponseContent();
@@ -542,8 +583,8 @@
{
Software = area.Spare3,
TrayBarcode = input.PalletCode,
- //EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = area.Spare2
+ EquipmentCode = area.Spare2,
+ SceneType = area.Spare4,
};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
@@ -558,7 +599,7 @@
return content.Error(result.MOMMessage);
// 鑾峰彇寮傚父鐢佃姱
- var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ List<SerialNoDto>? serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
if (serialNosError.Count > 0)
{
// TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙�
@@ -583,59 +624,131 @@
content = await RequestTrayInTaskAsync(input);
return content;
}
- //Console.WriteLine("qqqqq");
-
- // 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 par = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32();
-
-
- // 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
- //var processResponse = await GetProcessResponseAsync(process, input.Position);
-
- ////List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
- Console.WriteLine(area.AreaCode+"-----------------------");
- Console.WriteLine(input.Position + "-----------------------");
- var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList();
- if (stationManagers.Count <= 0)
+ if (result.ProcessCode == "OCVB")
{
- throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆");
+ //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, strings, 3);
+ return content;
+ }
+ else
+ {
+ var config = _configService.GetByConfigKey("SYS_InStacker", "CW3InStacker");
+ var strings = config.ConfigValue.Split(',').ToList();
+ // TODO 鍏ュ簱
+ content = await CreateNewTask(input, strings);
+ if (content.Status)
+ await _boxingInfoRepository.AddDataNavAsync(boxing);
+ }
}
- List<string> strings = stationManagers.Select(x => x.Roadway).ToList();
- //// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
- content = await CreateNewTask(input, strings);
- if (content.Status)
+ else
{
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ // 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, strings);
+ if (content.Status)
+ {
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ }
+ //}
}
}
catch (Exception err)
@@ -649,6 +762,95 @@
return content;
}
+ #endregion
+
+ public async Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input)
+ {
+ WebResponseContent content = new WebResponseContent();
+
+ try
+ {
+ // 鏌ヨ浠诲姟
+ var task = await QueryTaskByPalletCode(input.PalletCode);
+ if (task != null)
+ {
+ return CreateAndReturnWMSTaskDTO(task);
+ }
+
+ // 鏌ヨ搴撳瓨淇℃伅锛堣繖閲屽悗缁瀹屽杽璐ㄦ鍥炲簱閫昏緫锛�
+ var stock = await QueryStockInfo(input.PalletCode);
+ if (stock != null)
+ {
+ Dt_Task taskNew = new Dt_Task
+ {
+ Grade = 1,
+ Roadway = stock.LocationInfo.RoadwayNo,
+ TargetAddress = stock.LocationInfo.RoadwayNo,
+ Dispatchertime = DateTime.Now,
+ MaterialNo = "",
+ NextAddress = stock.LocationInfo.RoadwayNo,
+ OrderNo = null,
+ PalletCode = stock.PalletCode,
+ SourceAddress = input.Position,
+ CurrentAddress = input.Position,
+ TaskState = (int)TaskInStatusEnum.InNew,
+ TaskType = (int)TaskInboundTypeEnum.InQuality,
+ TaskNum = BaseDal.GetTaskNo().Result,
+ Creater = "System", // 淇鎷煎啓閿欒
+ CreateDate = DateTime.Now,
+ TaskId = 0,
+ };
+
+ var taskDTO = CreateTaskDTO(task);
+ // TODO璐ㄦ鍥炲簱
+ }
+
+ // 鏍规嵁浣嶇疆鏌ヨ鍖哄煙淇℃伅
+ var area = await QueryAreaInfoByPosition(input.Position.Replace("-1", ""));
+ if (area == null)
+ {
+ return content.Error("璇ョ偣浣嶄笉鍦ㄥ尯鍩熷垪琛ㄤ腑瀛樺湪");
+ }
+
+ // 鍒涘缓骞惰幏鍙栨暣鐩樼數鑺姸鎬�
+ TrayCellsStatusDto trayCells = CreateTrayCellsStatusDto(area, input.PalletCode);
+ content = await GetTrayCellStatusAsync(trayCells);
+ if (!content.Status) return content;
+
+ var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ if (!result.Success)
+ {
+ if (result.SerialNos.Count <= 0)
+ {
+ // 绌烘墭鐩樺叆搴撻�昏緫
+ return await RequestTrayInTaskAsync(input);
+ }
+ else
+ return content.Error(result.MOMMessage);
+ }
+
+ // 澶勭悊寮傚父鐢佃姱鎯呭喌
+ var serialNosError = result.SerialNos.Where(x => x.SerialNoStatus != 1).ToList();
+ if (serialNosError.Count > 0)
+ {
+ return await HandleErrorCells(input, area, serialNosError);
+ }
+
+
+ var boxing = CreateBoxingInfo(result, input.PalletCode);
+ if (boxing == null) return content.Error("缁勭洏澶辫触");
+
+ return await ProcessBasedOnProcessCode(boxing, area, input, result);
+ }
+ catch (Exception err)
+ {
+ // 鏇磋缁嗙殑寮傚父澶勭悊锛屽彲浠ユ牴鎹紓甯哥被鍨嬭褰曚笉鍚岀殑閿欒鏃ュ織绛�
+ content.Error(err.Message);
+ Console.WriteLine(err.Message);
+ }
+
+ return content;
+ }
/// <summary>
/// 鏇存柊浠诲姟璐т綅
/// </summary>
@@ -704,15 +906,16 @@
return content.OK(data: task);
}
- var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position).ToList();
- if (stationManagers.Count <= 0)
+
+ var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 6 && x.stationChildCode == input.Position).FirstOrDefault();
+ if (stationManagers == null)
{
- throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴閰嶇疆");
+ stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position).FirstOrDefault();
+ if (stationManagers == null)
+ throw new Exception("鏈壘鍒扮┖鎵樼洏鍏ュ簱绔欏彴鍜屽叆搴撶珯鍙伴厤缃�");
}
-
-
- // 鑾峰彇鐩爣鍦板潃
- List<string> strings = stationManagers.Select(x => x.Roadway).ToList();
+ List<string> strings = stationManagers.Roadway.Split(',').ToList();
+ Console.WriteLine(strings.ToJsonString() + "b-----------------------");
return await CreateNewTask(input, strings, 1);
}
@@ -887,7 +1090,7 @@
SourceAddress = stockInfo.LocationCode,
CurrentAddress = stockInfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = tag == (int)TaskOutboundTypeEnum.Outbound ? (int)TaskOutboundTypeEnum.Outbound : (int)TaskOutboundTypeEnum.OutTray,
+ TaskType = tag,
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "System", // 淇鎷煎啓閿欒
CreateDate = DateTime.Now,
@@ -989,6 +1192,84 @@
content.Error(ex.Message);
}
return content;
+ }
+
+ #endregion
+
+ #region 鎸囧畾浠诲姟鍑哄簱
+
+ public async Task<WebResponseContent> CreateAndSendOutboundTask(string locationCode, string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ // 鏌ヨ搴撳瓨淇℃伅
+ var stockInfo = await _stockInfoRepository.QueryFirstNavAsync(x => x.LocationCode == locationCode && x.PalletCode == palletCode);
+ if (stockInfo == null)
+ {
+ return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
+ }
+
+ var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (task != null)
+ {
+ return content.Error($"銆恵palletCode}銆戝凡瀛樺湪浠诲姟");
+ }
+
+ int taskType = 0;
+ if (stockInfo.IsFull)
+ taskType = (int)TaskOutboundTypeEnum.OutQuality;
+ else
+ taskType = (int)TaskOutboundTypeEnum.OutTray;
+ // 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
+ task = CreateTask(stockInfo, "1020-1", taskType);
+ //var taskId = await BaseDal.AddDataAsync(task);
+ //if (taskId <= 0)
+ //{
+ // return content.Error("浠诲姟鍒涘缓澶辫触");
+ //}
+
+ // 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
+ var taskDTO = CreateTaskDTO(task);
+
+ // 鑾峰彇WMS IP鍦板潃鐢ㄤ簬鍙戦�佷换鍔¤姹�
+ var wmsIpAddress = GetWCSIpReceiveTask();
+ if (wmsIpAddress == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+
+ var tasks = new List<WMSTaskDTO>() { taskDTO };
+ // 鍙戦�佷换鍔¤姹傚埌WMS
+ var result = await HttpHelper.PostAsync(wmsIpAddress, tasks.ToJsonString());
+ content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ // 娣诲姞浠诲姟鍒版暟鎹簱
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ stockInfo.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(stockInfo.LocationInfo);
+ }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"鍙戠敓寮傚父: {ex.Message}");
+ content.Error(ex.Message);
+ }
+
+ return content;
+ }
+ private string GetWCSIpReceiveTask()
+ {
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue;
+ if (wmsBase == null || ipAddress == null)
+ {
+ return null;
+ }
+ return wmsBase + ipAddress;
}
#endregion
@@ -1216,6 +1497,18 @@
}
+ var stocks = _stockInfoRepository.QueryData(x => x.AreaCode == stock.AreaCode && x.ProductionLine == stock.ProductionLine && x.SpecialParameterDuration != stock.SpecialParameterDuration);
+ if (stocks != null && stocks.Count > 0)
+ {
+ foreach (var item in stocks)
+ {
+ 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);
+ }
+
// 娣诲姞鍘嗗彶浠诲姟
var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
@@ -1270,6 +1563,16 @@
task.CurrentAddress = input.Position;
task.TargetAddress = "002-021-000";
task.NextAddress = "002-021-000";
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ bool isResult = await BaseDal.UpdateDataAsync(task);
+ return content.OK(data: task);
+ }
+ else if (task.TaskType == (int)TaskInboundTypeEnum.InQuality)
+ {
+ var stockInfo = _stockInfoRepository.QueryFirst(x => x.PalletCode == input.PalletCode);
+ task.CurrentAddress = input.Position;
+ task.TargetAddress = stockInfo.LocationInfo.LocationCode;
+ task.NextAddress = stockInfo.LocationInfo.LocationCode;
task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
bool isResult = await BaseDal.UpdateDataAsync(task);
return content.OK(data: task);
@@ -1348,8 +1651,8 @@
/// 鍒涘缓鏂颁换鍔�
/// </summary>
/// <param name="input">璇锋眰妯″瀷</param>
- /// <param name="areaId">鍖哄煙ID</param>
- /// <param name="content">鍝嶅簲鍐呭</param>
+ /// <param name="process">宸烽亾</param>
+ /// <param name="flag">鏍囪瘑锛�0-鍏ュ簱锛�1-绌烘墭鐩樺叆搴擄紝2-NG鍏ュ簱锛�3-鍑哄簱锛�</param>
/// <returns></returns>
private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input, List<string> process = null, int flag = 0)
{
@@ -1358,8 +1661,8 @@
// 鑾峰彇鐩爣鍦板潃
//string ToAddress = await GetRoadWayAsync(process);
string ToAddress = string.Empty;
- if (flag != 2)
- ToAddress = await GetRoadWayAsync(input, process);
+ if (flag < 2)
+ ToAddress = await GetRoadWayAsync(process);
else
ToAddress = process[0];
@@ -1376,8 +1679,8 @@
OrderNo = null,
PalletCode = input.PalletCode,
SourceAddress = input.Position,
- TaskState = (int)TaskInStatusEnum.InNew,
- TaskType = flag == 0 ? (int)TaskInboundTypeEnum.Inbound : flag == 1 ? (int)TaskInboundTypeEnum.InTray : (int)TaskInboundTypeEnum.InNG,
+ 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"
};
@@ -1389,6 +1692,11 @@
{
task.TaskId = taskId;
isResult = await _taskExecuteDetailRepository.AddDetailAsync(task, false, TaskDescription.GetTaskUpdateDescription(input.PalletCode, input.Position, ToAddress, TaskInStatusEnum.InNew.GetIntegralRuleTypeEnumDesc()));
+
+ //var location = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
+ //location.LocationStatus = (int)LocationEnum.Lock;
+ //var isLocation = _locationRepository.UpdateData(location);
+
if (isResult)
{
// 鍒涘缓WMS浠诲姟
@@ -1453,27 +1761,30 @@
}
/// <summary>
- /// 鑾峰彇宸烽亾鎴栫珯鍙�
+ /// 鏍规嵁宸烽亾鑾峰彇宸烽亾鎴栫珯鍙�
/// </summary>
- /// <param name="areaId">璐т綅鍖哄煙ID</param>
- /// <param name="position">绔欏彴</param>
- /// <param name="Direction">鏂瑰悜</param>
- /// <param name="area">鍏崇郴鍖哄煙</param>
/// <returns></returns>
- public async Task<string> GetRoadWayAsync(RequestTaskDto input, List<string> process)
+ public async Task<string> GetRoadWayAsync(List<string> process)
{
var minGroup = _locationRepository.QueryData(x => process.Contains(x.RoadwayNo) && x.LocationStatus == (int)LocationEnum.Free)
.GroupBy(x => x.RoadwayNo)
.OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
- .First(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
+ .ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
- string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
+ Dictionary<string, int> result = new Dictionary<string, int>();
+ foreach (var item in minGroup)
+ {
+ var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
+ result.Add(item.Key, item.Count() - number);
+ }
+
+ string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
return minRoadwayNo;
}
/// <summary>
- /// 鑾峰彇宸烽亾鎴栫珯鍙�
+ /// 鏍规嵁鍖哄煙鑾峰彇宸烽亾鎴栫珯鍙�
/// </summary>
/// <returns></returns>
public async Task<string> GetRoadWayAsync(int areaCode)
@@ -1481,9 +1792,16 @@
var minGroup = _locationRepository.QueryData(x => x.AreaId == areaCode && x.LocationStatus == (int)LocationEnum.Free)
.GroupBy(x => x.RoadwayNo)
.OrderBy(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
- .First(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
+ .ToList(); // 鍙栧嚭鏁伴噺鏈�灏戠殑缁�
- string minRoadwayNo = minGroup.Key; // 鏁伴噺鏈�灏戠殑缁勭殑Key
+ Dictionary<string, int> result = new Dictionary<string, int>();
+ foreach (var item in minGroup)
+ {
+ var number = BaseDal.QueryData(x => x.TargetAddress == item.Key).Count();
+ result.Add(item.Key, item.Count() - number);
+ }
+
+ string minRoadwayNo = result.OrderByDescending(x => x.Value).FirstOrDefault().Key; // 鏁伴噺鏈�澶氱殑缁勭殑Key
return minRoadwayNo;
}
--
Gitblit v1.9.3