From 53db158b8018fba144a937cf1749cce050855c7a Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 10 十二月 2024 14:49:32 +0800
Subject: [PATCH] 同步
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 187 +++++++++++++++++++++++++++++-----------------
1 files changed, 117 insertions(+), 70 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
index 0b561e4..c937a83 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -18,7 +18,7 @@
using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_Model.Models;
-namespace WIDESEA_StorageOutTaskServices;
+namespace WIDESEA_StorageTaskServices;
public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{
@@ -391,24 +391,24 @@
}
//鍒涘缓涓�涓猅rayCellsStatusDto瀵硅薄锛屽苟璧嬪��
- TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
- {
- Software = "WMS",
- TrayBarcode = input.PalletCode,
- //EquipmentCode = "EQ_CWJZ01"
- EquipmentCode = input.EquiCodeMOM
- };
+ //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
+ //{
+ // Software = "WMS",
+ // TrayBarcode = input.PalletCode,
+ // //EquipmentCode = "EQ_CWJZ01"
+ // EquipmentCode = input.EquiCodeMOM
+ //};
// 璋冪敤GetTrayCellStatusAsync鏂规硶锛岃幏鍙栨暣鐩樼數鑺�
- content = await GetTrayCellStatusAsync(trayCells);
+ //content = await GetTrayCellStatusAsync(trayCells);
// 濡傛灉鐘舵�佷负false锛屽垯杩斿洖content
- if (!content.Status) return content;
+ //if (!content.Status) return content;
// 娣诲姞缁勭洏淇℃伅
// 灏哻ontent.Data杞崲涓篟esultTrayCellsStatus瀵硅薄
- var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
- if (result.SerialNos.Count <= 0)
- return content.Error(result.MOMMessage);
+ //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
+ //if (result.SerialNos.Count <= 0)
+ // return content.Error(result.MOMMessage);
//Console.WriteLine(result);
//// TODO 鑾峰彇鏈湴鏂欐灞炴�т笌鏁寸洏鐢佃姱灞炴�ц幏鍙栫殑鍊艰繘琛屽姣旓紝濡傛灉涓�鑷村垯缁х画锛屽惁鍒欒繑鍥為敊璇俊鎭�
@@ -417,8 +417,8 @@
//// return content.Error("鏂欐灞炴�т笉瀛樺湪");
//// 璋冪敤CreateBoxingInfo鏂规硶锛屽垱寤虹粍鐩樹俊鎭�
- var boxing = CreateBoxingInfo(result, input.PalletCode);
- if (boxing == null) return content.Error("缁勭洏澶辫触");
+ //var boxing = CreateBoxingInfo(result, input.PalletCode);
+ //if (boxing == null) return content.Error("缁勭洏澶辫触");
//// 璋冪敤GetProcessApplyAsync鏂规硶锛岃幏鍙栧伐鑹鸿矾绾�
//ProcessApplyDto process = await GetProcessApplyAsync(input, result);
@@ -436,10 +436,10 @@
////var processResponse = await GetProcessResponseAsync(process, input.Position);
// 璋冪敤CreateNewTask鏂规硶锛屽垱寤烘柊浠诲姟
content = await CreateNewTask(input);
- if (content.Status)
- {
- var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
- }
+ //if (content.Status)
+ //{
+ // var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
+ //}
}
catch (Exception err)
{
@@ -637,6 +637,7 @@
////// 璋冪敤GetProcessResponseAsync鏂规硶锛岃幏鍙栧伐鑹哄搷搴�
////var processResponse = await GetProcessResponseAsync(process, input.Position);
+ var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
}
var task = new Dt_Task
@@ -744,7 +745,7 @@
MaterialNo = "",
NextAddress = input.Roadways,
OrderNo = null,
- PalletCode = input.PalletCode,
+ PalletCode = stockinfo.PalletCode,
SourceAddress = stockinfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
TaskType = (int)TaskOutboundTypeEnum.OutTray,
@@ -760,7 +761,6 @@
throw new Exception(ex.Message);
}
}
-
#region 鐩存帴鍑哄簱浠诲姟瀹屾垚
public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
@@ -784,6 +784,46 @@
#endregion
+ #region MyRegion
+ //private async Task<bool> ExecuteTransaction(DtStockInfo stock, Dt_Task_Hty taskHty, DtLocationInfo locationInfo, int taskId)
+ //{
+ // _unitOfWorkManage.BeginTran();
+ // try
+ // {
+ // var isUpdateStock = true;
+
+ // // 娣诲姞鍘嗗彶浠诲姟
+ // var isTaskHtyAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
+
+ // // 淇敼绉诲簱鍓嶈揣浣嶇姸鎬�
+ // var isUpdateLoc = _locationRepository.UpdateData(locationInfo);
+
+ // // 鍒犻櫎浠诲姟鏁版嵁
+ // var isTaskDelete = await Delete(taskId);
+
+ // // 鎻愪氦鎴栧洖婊氫簨鍔�
+ // if (isUpdateStock && isTaskHtyAdd && isTaskDelete && isUpdateLoc)
+ // {
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"浜嬪姟澶勭悊瀹屾垚,鎻愪氦浜嬪姟銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊鎴栨坊鍔犲簱瀛橈細{isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ // _unitOfWorkManage.CommitTran();
+ // return true;
+ // }
+ // else
+ // {
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "浠诲姟瀹屾垚", $"鏁版嵁澶勭悊澶辫触,璇锋鏌ユ暟鎹槸鍚︽纭�,鏁版嵁鍥炴粴銆傛坊鍔犲巻鍙蹭换鍔★細{isTaskHtyAdd},鍒犻櫎浠诲姟鏁版嵁锛歿isTaskDelete},鏇存柊搴撳瓨锛歿isUpdateStock},淇敼绉诲簱鍓嶈揣浣嶇姸鎬侊細{isUpdateLoc}");
+ // _unitOfWorkManage.RollbackTran();
+ // return false;
+ // }
+ // }
+ // catch (Exception err)
+ // {
+ // LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, $"浠诲姟瀹屾垚,绯荤粺寮傚父锛屽紓甯镐俊鎭細{err.Message}", "鏃犲弬鏁�");
+ // _unitOfWorkManage.RollbackTran();
+ // throw; // 鎶涘嚭寮傚父浠ヤ究澶栭儴鎹曡幏
+ // }
+ //}
+ #endregion
+
#region 妫�娴嬮珮娓╁簱鏄惁鏈夊彲鍑哄簱搴撳瓨
public WebResponseContent StockCheckingAsync()
@@ -796,65 +836,72 @@
{
while (true)
{
- Thread.Sleep(10000);
- var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
-
- var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
- .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
- .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
- .OrderBy(x => x.OutboundTime) // 鎺掑簭
- .ToListAsync(); // 鑾峰彇绗竴涓厓绱�
-
- if (stockInfo.Count <= 0) continue;
- foreach (var item in stockInfo)
+ try
{
+ Thread.Sleep(10000);
+ var area = await _areaInfoRepository.QueryFirstAsync(x => x.AreaCode == "GWSC1");
- var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode);
- if (hasTask != null)
+ var stockInfo = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.LocationInfo) // 棰勫姞杞絃ocationInfo
+ .Includes(x => x.StockInfoDetails) // 棰勫姞杞絊tockInfoDetails
+ .Where(x => x.AreaCode == area.AreaCode && x.OutboundTime < DateTime.Now && x.IsFull == true) // 杩囨护鏉′欢
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID) // 杩囨护鏉′欢
+ .OrderBy(x => x.OutboundTime) // 鎺掑簭
+ .ToListAsync(); // 鑾峰彇绗竴涓厓绱�
+
+ if (stockInfo.Count <= 0) continue;
+ foreach (var item in stockInfo)
{
- Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�");
- continue;
+
+ var hasTask = BaseDal.QueryFirst(x => x.PalletCode == item.PalletCode);
+ if (hasTask != null)
+ {
+ Console.WriteLine("宸插瓨鍦ㄥ嚭搴撲换鍔�");
+ continue;
+ }
+
+ string position = string.Empty;
+ if (item.LocationInfo.RoadwayNo == "GWSC1")
+ position = "1059";
+ else
+ position = "1065";
+
+ var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound);
+ task.NextAddress = "002-000-002";
+ // 鍒涘缓浠诲姟DTO
+ WMSTaskDTO taskDTO = CreateTaskDTO(task);
+
+
+ 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)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + ipAddress;
+
+ var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+ var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (content.Status)
+ {
+ await BaseDal.AddDataAsync(task);
+ // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
+ item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
+ await _locationRepository.UpdateDataAsync(item.LocationInfo);
+ }
}
-
- string position = string.Empty;
- if (item.LocationInfo.RoadwayNo == "GWSC1")
- position = "1059";
- else
- position = "1065";
-
- var task = CreateTask(item, position, (int)TaskOutboundTypeEnum.Outbound);
- task.NextAddress = "002-000-002";
- // 鍒涘缓浠诲姟DTO
- WMSTaskDTO taskDTO = CreateTaskDTO(task);
-
-
- 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)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddress = wmsBase + ipAddress;
-
- var result = HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
- var content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- if (content.Status)
- {
- await BaseDal.AddDataAsync(task);
- // 鏇存柊搴撳瓨浣嶇疆鐘舵�佷负涓嶅彲鐢�
- item.LocationInfo.LocationStatus = (int)LocationEnum.InStockDisable;
- await _locationRepository.UpdateDataAsync(item.LocationInfo);
- }
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine(ex.Message);
}
}
});
return webResponseContent.OK();
}
catch (Exception ex)
- {
+ {
Console.WriteLine(ex.Message.ToString());
return webResponseContent.Error(ex.Message);
}
--
Gitblit v1.9.3