From b06b33248bcc19f8ea6c574124d5c536b7fa6c49 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 16 七月 2025 19:22:27 +0800
Subject: [PATCH] 添加常温直接出库功能，增加实框入库存在任务发往异常口
---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 244 +++++++++++++++++++++++++++++-------------------
1 files changed, 145 insertions(+), 99 deletions(-)
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index a59aa03..503a2bd 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1,4 +1,5 @@
-锘縰sing Masuit.Tools;
+锘縰sing Mapster;
+using Masuit.Tools;
using SqlSugar;
using WIDESEA_Common.CustomModels;
using WIDESEA_Core.Const;
@@ -581,17 +582,42 @@
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
- public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
+ public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task, DtStockInfo stock)
{
WebResponseContent content = new WebResponseContent();
try
{
- //娣诲姞鍘嗗彶
- var taskHty = CreateHistoricalTask(task);
- // 娣诲姞鍘嗗彶浠诲姟
- var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
- //鍒犻櫎浠诲姟
- BaseDal.DeleteData(task);
+ DtStockInfo_Hty stockInfo_Hty = null;
+ if (stock != null)
+ {
+ stockInfo_Hty = stock.Adapt<DtStockInfo_Hty>();
+ stockInfo_Hty.ModifyDate = DateTime.Now;
+ }
+ 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";
+
+ var location = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
+ int lastStatus = location.LocationStatus;
+ location.LocationStatus = (int)LocationEnum.Free;
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+
+ _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.AutomaticDelivery, task.TaskNum);
+ // 浜嬪姟澶勭悊
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ if (stockInfo_Hty != null)
+ {
+ await DeleteStockInfoAsync(stock.Id);
+ await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ await AddStockInfoHtyAsync(stockInfo_Hty);
+ }
+
+ await UpdateLocationAsync(location);
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
return content.OK();
}
@@ -1082,110 +1108,130 @@
#region 鐏鍑哄簱
- public WebResponseContent EmergencyTask(object obj)
+ public WebResponseContent EmergencyTask(Object obj)
{
WebResponseContent content = new WebResponseContent();
var emergencyTask = new DTSEmergencyTask();
try
{
+ Console.WriteLine($"鐏鍙傛暟:{obj.ToString()}");
emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString());
-
if (emergencyTask == null) throw new Exception("鐏鍙傛暟涓虹┖");
-
- DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == emergencyTask.row && x.Column == emergencyTask.column && x.Layer == emergencyTask.layer && x.AreaId == emergencyTask.zone);
- if (locationInfo == null)
+ string[] strings = emergencyTask.LocationCode.Split("-");
+ string Roadway = strings[0];
+ //switch (Roadways[0])
+ //{
+ // case "J":
+ // Roadway = "JZSC" + Roadways[1];
+ // break;
+ // case "G":
+ // Roadway = "GWSC" + Roadways[1];
+ // break;
+ // case "C":
+ // Roadway = "CWSC" + Roadways[1];
+ // break;
+ // default: throw new Exception("鏈瘑鍒簱浣嶇紪鐮�");
+ //}
+ int Row = Convert.ToInt16(strings[1]);
+ int Column = Convert.ToInt16(strings[2]);
+ int Layer = Convert.ToInt16(strings[3]);
+ if (!strings[0].Contains("SC")) throw new Exception("鏈煡搴撳尯");
+ for (int i = 0; i < 2; i++)
{
- throw new Exception("鏈煡搴撲綅");
- }
-
- //鏌ユ壘娑堥槻绔欏彴
- var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo
- && t.stationType == (int)StationManager.FireStation
- /*&& t. == "Enable"*/);
- if (station == null)
- {
- throw new Exception("娑堥槻绔欏彴鏈厤缃�!");
- }
-
- //鏌ユ壘搴撳瓨淇℃伅
- var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo);
- //鎵樼洏鐮�
- string barcode = string.Empty;
- if (stockInfo != null)
- {
- barcode = stockInfo.PalletCode;
- }
- else
- {
- //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮�
- barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000);
- }
-
- Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == 500 && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway);
-
- if (fireTask != null)
- {
- throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
- }
-
- int taskNum = BaseDal.GetTaskNo().Result;
- Dt_Task task = new Dt_Task
- {
- CreateDate = DateTime.Now,
- Creater = "DTS",
- CurrentAddress = locationInfo.LocationCode,
- Grade = 1,
- Dispatchertime = DateTime.Now,
- PalletCode = barcode,
- Roadway = station.Roadway,
- SourceAddress = locationInfo.LocationCode,
- TaskState = (int)TaskOutStatusEnum.OutNew,
- TaskType = 500,
- TargetAddress = station.stationLocation,
- NextAddress = station.stationChildCode,
- TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
- TaskId = 0,
- };
-
- // 灏濊瘯娣诲姞鏂颁换鍔�
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskNum = task.TaskNum.Value,
- Grade = 1,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState.Value,
- Id = 0,
- TaskType = 500,
- };
-
- var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
- var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue;
- if (ReceiveByWMSTask == null || ipAddress == null)
- {
- throw new Exception("WMS IP 鏈厤缃�");
- }
- var wmsIpAddrss = ipAddress + ReceiveByWMSTask;
-
- var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));
- if (respon != null)
- {
- WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
- if (respone.Status)
+ DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Row && x.Column == Column && x.Layer == (i == 0 ? Layer - 1 : Layer) && x.RoadwayNo == Roadway);
+ if (locationInfo == null)
{
- var taskId = BaseDal.AddData(task);
+ throw new Exception("鏈煡搴撲綅");
+ }
+
+ //鏌ユ壘娑堥槻绔欏彴
+ var station = _stationManagerRepository.QueryFirst(t => t.Roadway == locationInfo.RoadwayNo && t.stationType == (int)StationManager.FireStation);
+ if (station == null)
+ {
+ throw new Exception("娑堥槻绔欏彴鏈厤缃�!");
+ }
+
+ //鏌ユ壘搴撳瓨淇℃伅
+ var stockInfo = _stockInfoRepository.QueryFirst(x => x.LocationCode == locationInfo.LocationCode && x.LocationInfo.RoadwayNo == locationInfo.RoadwayNo);
+ //鎵樼洏鐮�
+ string barcode = string.Empty;
+ if (stockInfo != null)
+ {
+ barcode = stockInfo.PalletCode;
}
else
{
- throw new Exception("WCS澶勭悊澶辫触:" + respone.Message);
+ //鏃犲簱瀛樹俊鎭紝鐢熸垚闅忔満鎵樼洏鐮�
+ barcode = "M" + DateTime.Now.ToString("MMddHHmmss") + "-" + new Random().Next(100, 1000);
}
- }
- else
- {
- throw new Exception("璇锋眰澶勭悊澶辫触");
+
+ Dt_Task fireTask = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.OutFireAlarm && x.SourceAddress == locationInfo.LocationCode && x.Roadway == station.Roadway);
+
+ if (fireTask != null)
+ {
+ throw new Exception("宸叉坊鍔犵伀璀﹀嚭搴撲换鍔�");
+ }
+
+ int taskNum = BaseDal.GetTaskNo().Result;
+ Dt_Task task = new Dt_Task
+ {
+ CreateDate = DateTime.Now,
+ Creater = "DTS",
+ CurrentAddress = locationInfo.LocationCode,
+ Grade = i == 0 ? 5 : 3,
+ Dispatchertime = DateTime.Now,
+ PalletCode = barcode,
+ Roadway = station.Roadway,
+ SourceAddress = locationInfo.LocationCode,
+ TaskState = (int)TaskOutStatusEnum.OutNew,
+ TaskType = (int)TaskOutboundTypeEnum.OutFireAlarm,
+ TargetAddress = station.stationLocation,
+ NextAddress = station.stationLocation,
+ TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
+ TaskId = 0,
+ };
+
+ // 灏濊瘯娣诲姞鏂颁换鍔�
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskNum = task.TaskNum.Value,
+ Grade = 1,
+ PalletCode = task.PalletCode,
+ RoadWay = task.Roadway,
+ SourceAddress = task.SourceAddress,
+ TargetAddress = task.TargetAddress,
+ TaskState = task.TaskState.Value,
+ Id = 0,
+ TaskType = task.TaskType,
+ };
+
+ var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
+ var ReceiveByWMSFireAlarmTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSFireAlarmTask)?.ConfigValue;
+ if (ReceiveByWMSFireAlarmTask == null || ipAddress == null)
+ {
+ throw new Exception("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = ipAddress + ReceiveByWMSFireAlarmTask;
+ List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
+ taskDTOs.Add(taskDTO);
+ var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTOs));
+ if (respon != null)
+ {
+ WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
+ if (respone.Status)
+ {
+ var taskId = BaseDal.AddData(task);
+ }
+ else
+ {
+ throw new Exception("WCS澶勭悊澶辫触:" + respone.Message);
+ }
+ }
+ else
+ {
+ throw new Exception("璇锋眰澶勭悊澶辫触");
+ }
}
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("DTS鐏鍑哄簱").Info(true, obj.ToJsonString());
--
Gitblit v1.9.3