From d4b0b578752a1478f6c11b352fbb8d2bad1f9e1d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 22 十月 2025 17:18:49 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 337 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 220 insertions(+), 117 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 53e5909..ede4e60 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -3,13 +3,17 @@
using Mapster;
using Masuit.Tools;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion.Internal;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using OfficeOpenXml.Table.PivotTable;
using SixLabors.Fonts.Tables.AdvancedTypographic;
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
using System.Reflection.Metadata;
+using System.Security.Policy;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using WIDESEA_Cache;
@@ -19,7 +23,9 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO.ERP;
using WIDESEA_DTO.Location;
+using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
+using WIDESEA_IOrderRepository;
using WIDESEA_IServices;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Basic;
@@ -45,6 +51,8 @@
private readonly IDt_AreaInfoRepository _areaInfoRepository; //鍖哄煙
private readonly IDt_StationManagerRepository _stationManagerRepository;
private readonly ISys_ConfigService _configService;
+ private readonly IDt_OutboundOrderRepository _outorderRepository;
+ private readonly IDt_OutboundOrderDetailRepository _outorderdetailRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -58,7 +66,9 @@
IDt_AreaInfoRepository areaInfoRepository,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService) : base(BaseDal)
+ ISys_ConfigService configService,
+ IDt_OutboundOrderRepository outorderRepository,
+ IDt_OutboundOrderDetailRepository outorderdetailRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
_stockInfoRepository = stockInfoRepository;
@@ -72,6 +82,8 @@
_stockInfoDetailRepository = stockInfoDetailRepository;
_stationManagerRepository = stationManagerRepository;
_configService = configService;
+ _outorderRepository = outorderRepository;
+ _outorderdetailRepository = outorderdetailRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -83,16 +95,33 @@
WebResponseContent content = new WebResponseContent();
try
{
+ var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
+ var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
+
task.TaskState = (int)TaskOutStatusEnum.OutFinish;
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;
+ stock.ModifyDate = DateTime.Now;
+ stock.LocationCode = task.TargetAddress;
await _unitOfWorkManage.UseTranAsync(async () =>
{
+ //await DeleteStockInfoAsync(stock.Id);
+ //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails);
+ //await AddStockInfoHtyAsync(stockInfo_Hty);
+ _stockInfoRepository.UpdateData(stock);
+
+ UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+ UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
+
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
});
+ content.OK("鍑哄簱瀹屾垚");
}
catch (Exception ex)
{
@@ -117,17 +146,27 @@
WebResponseContent content = new WebResponseContent();
try
{
- // 鏇存柊璐т綅鍜屽簱瀛樹俊鎭�
- (DtStockInfo updateStock, DtLocationInfo locationInForm, DtLocationInfo locationInfoTo) = UpdateStockLocation(stock, task);
- var taskHty = CreateHistoricalTask(task);
- LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "绉诲簱浠诲姟瀹屾垚", $"璐т綅鍦板潃锛歿task.TargetAddress},淇敼鍚庡簱瀛樻暟鎹細{JsonConvert.SerializeObject(updateStock)}锛屽師鍏堣揣浣嶆暟鎹細{locationInForm}");
+ var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
+ var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- // 鎵ц鏁版嵁搴撲簨鍔�
- bool isResult = false;
- if (isResult)
- content.OK("绉诲簱浠诲姟瀹屾垚鎴愬姛");
- else
- content.Error("绉诲簱浠诲姟瀹屾垚澶辫触");
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ 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";
+
+ stock.ModifyDate = DateTime.Now;
+ stock.LocationCode = task.TargetAddress;
+
+ await _unitOfWorkManage.UseTranAsync(async () =>
+ {
+ //UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticRelocation);
+ _stockInfoRepository.UpdateData(stock);
+ await DeleteTaskAsync(task.TaskId);
+ await AddTaskHtyAsync(taskHty);
+ });
+ content.OK("绉诲簱瀹屾垚");
}
catch (Exception err)
{
@@ -150,18 +189,16 @@
WebResponseContent content = new WebResponseContent();
try
{
- var boxing = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
var locationStart = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.SourceAddress);
var locationEnd = await _locationRepository.QueryFirstAsync(x => x.LocationCode == task.TargetAddress);
- if (boxing == null)
+ if (stock == null)
{
return content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
}
-
- DtStockInfo stock = CreatePalletStock(task, boxing);
- DtBoxingInfo_Hty boxingInfo_Hty = boxing.Adapt<DtBoxingInfo_Hty>();
- boxingInfo_Hty.ModifyDate = DateTime.Now;
+ stock.LocationCode = task.TargetAddress;
+ stock.StockStatus = (int)StockStateEmun.宸插叆搴�;
task.TaskState = (int)TaskInStatusEnum.InFinish;
var taskHty = task.Adapt<Dt_Task_Hty>();
@@ -171,13 +208,11 @@
await _unitOfWorkManage.UseTranAsync(async () =>
{
- await _stockInfoRepository.AddDataNavAsync(stock);
+ await _stockInfoRepository.UpdateDataAsync(stock);
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
- await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxing.Id)
- .Include(x => x.BoxingInfoDetails)
- .ExecuteCommandAsync();
- await AddBoxingHtyAsync(boxingInfo_Hty);
+ UpdateLocationStatus(locationStart, LocationEnum.Free, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ UpdateLocationStatus(locationEnd, LocationEnum.InStock, task.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
});
content.OK("鍏ュ簱瀹屾垚");
}
@@ -274,8 +309,7 @@
// 楠岃瘉搴撳瓨鏄惁瀛樺湪
- //var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
- DtStockInfo stock = null;
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
{
@@ -297,6 +331,40 @@
#endregion 浠诲姟瀹屾垚
+ #region 鍙栨秷浠诲姟
+ public WebResponseContent TaskCancel(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null)
+ {
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔′俊鎭�");
+ }
+ _unitOfWorkManage.BeginTran();
+ MethodInfo? methodInfo = GetType().GetMethod(((TaskTypeEnum)task.TaskType) + "TaskCancel");
+ if (methodInfo != null)
+ {
+ WebResponseContent? responseContent = (WebResponseContent?)methodInfo.Invoke(this, new object[] { task });
+ if (responseContent != null)
+ {
+ if (responseContent != null)
+ {
+
+ }
+ }
+ }
+ return content = WebResponseContent.Instance.Error("鏈壘鍒颁换鍔＄被鍨嬪搴斾笟鍔″鐞嗛�昏緫");
+ }
+ catch (Exception ex)
+ {
+ _unitOfWorkManage.RollbackTran();
+ return content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
+ #endregion
+
#region 璇锋眰浠诲姟鍏ュ簱
public async Task<WebResponseContent> RequestInboundTaskAsync(RequestTaskDto taskDto)
@@ -304,20 +372,20 @@
WebResponseContent content = new WebResponseContent();
try
{
- var boxingInfo = await _boxingInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode);
- if (boxingInfo == null)
+ var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == taskDto.PalletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
+ if (stock == null)
{
return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡缁勭洏鎴愬姛");
}
- foreach (var item in boxingInfo.BoxingInfoDetails)
- {
- var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
- if (ERPStock == null)
- {
- return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
- }
- }
+ //foreach (var item in boxingInfo.BoxingInfoDetails)
+ //{
+ // var ERPStock = SqlSugarHelper.DBERP.Queryable<WMS_鐢ㄥ弸搴撳瓨涓�瑙堣〃_ST>().Where(x => x.浠撳簱鍚嶇О == item.Warehouse && x.鏂欏彿 == item.MaterielCode && x.鍝佸悕 == item.MaterielName).ToList().FirstOrDefault();
+ // if (ERPStock == null)
+ // {
+ // return content.Error($"缁勭洏鏁版嵁鏈湪ERP搴撳瓨鏁版嵁涓紝璇蜂汉宸ョ‘璁ゆ暟鎹槸鍚︽纭�");
+ // }
+ //}
var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
if (StartAddress == null)
@@ -333,7 +401,7 @@
switch (taskDto.AreaId)
{
case 1:
- return await InboundStakerArea(taskDto, StartAddress, await GetEmptyLocation("SC1"));
+ return await InboundStakerArea(taskDto, StartAddress);
case 2:
case 3:
case 4:
@@ -349,16 +417,16 @@
var location = _locationRepository.QueryFirst(x => x.LocationCode == taskDto.TargetAddress);
if (location != null && location.LocationStatus == (int)LocationEnum.Free && location.EnalbeStatus == 1)
{
- switch (taskDto.AreaId)
+ switch (location.AreaId)
{
case 1:
- return await InboundStakerArea(taskDto, location, StartAddress);
+ return await InboundStakerArea(taskDto, StartAddress);
case 2:
case 3:
case 4:
case 5:
case 6:
- return await InboundAGVCacheArea(taskDto, location, StartAddress);
+ return await InboundAGVCacheArea(taskDto, StartAddress, location);
default:
return content.Error("璐т綅鍖哄煙鏈壘鍒�");
}
@@ -379,22 +447,18 @@
}
}
- public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress, DtLocationInfo location)
+ public async Task<WebResponseContent> InboundStakerArea(RequestTaskDto taskDto,DtLocationInfo StartAddress)
{
WebResponseContent content = new WebResponseContent();
try
{
var station = _stationManagerRepository.QueryFirst(x => x.stationType == 1 && x.Roadway == "SC1");
- if (location == null)
- {
- return content.Error("缁堢偣鍖哄煙鏈壘鍒扮┖闂插簱浣�");
- }
Dt_Task taskNew = new Dt_Task
{
Grade = 1,
Roadway = "SC1",
- TargetAddress = location.LocationCode,
+ TargetAddress = "SC1",
Dispatchertime = DateTime.Now,
MaterialNo = "",
NextAddress = station.stationChildCode,
@@ -415,10 +479,8 @@
BaseDal.AddData(taskNew);
UpdateLocationStatus(StartAddress, LocationEnum.InStockDisable, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
- UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
+ //UpdateLocationStatus(location, LocationEnum.Lock, taskNew.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticInbound);
-
-
//return content.OK();
return content = await SendWCSTask(taskDTO);
}
@@ -560,6 +622,29 @@
#endregion
#region 璇锋眰鍑哄簱
+ public async Task<WebResponseContent> OtherOutBoundTaskAsync(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == palletCode);
+ if (stcok == null)
+ {
+ return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
+ }
+ var location = await _locationRepository.QueryFirstAsync(x => x.LocationCode == stcok.LocationCode);
+ if (location.AreaId == 2)
+ {
+ return content.Error("璇ユ墭鐩樺簱瀛樺凡鍦ㄥ嚭搴撶紦瀛樺尯");
+ }
+ return await RequestOutboundTaskAsync(new RequestTaskDto { PalletCode = palletCode, AreaId = 2, Position = stcok.LocationCode ,TaskType = (int)TaskOutboundTypeEnum.OutOther });
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
/// <summary>
/// 璇锋眰鍑哄簱浠诲姟
@@ -571,11 +656,11 @@
WebResponseContent content = new WebResponseContent();
try
{
- //DtStockInfo stcok= await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
- //if (stcok == null)
- //{
- // return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
- //}
+ DtStockInfo stcok = await _stockInfoRepository.QueryFirstAsync(x => x.PalletCode == taskDto.PalletCode);
+ if (stcok == null)
+ {
+ return content.Error("鎵樼洏淇℃伅涓嶅瓨鍦紝璇风‘璁ゆ墭鐩樺凡鍏ュ簱鎴愬姛");
+ }
var StartAddress = await _locationRepository.QueryFirstAsync(x => x.LocationCode == taskDto.Position);
if (StartAddress == null)
@@ -763,16 +848,17 @@
Floor = stationManager.stationFloor,
};
var taskDTO = CreateTaskDTO(taskNew);
-
+ task.TaskState = (int)TaskAcrossFloorStatusEnum.FirstCarryFinish;
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";
await _unitOfWorkManage.UseTranAsync(async () =>
{
- BaseDal.AddData(taskNew);
+
await DeleteTaskAsync(task.TaskId);
await AddTaskHtyAsync(taskHty);
+ BaseDal.AddData(taskNew);
});
return content.OK(data: taskDTO);
}
@@ -1059,11 +1145,32 @@
}
#endregion
+ #region 鑾峰彇浠诲姟淇℃伅
+ public WebResponseContent GetTaskInfo()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Expression<Func<Dt_Task, bool>> expression = x => true;
+ if (!App.User.IsSuperAdmin)
+ {
+ expression = x => x.Creater == App.User.UserName;
+ }
+ var task = BaseDal.Db.Queryable<Dt_Task>().OrderByDescending(x => x.CreateDate).Take(100).Select(x => new Dt_Task { TaskNum = x.TaskNum, PalletCode = x.PalletCode, TaskType = x.TaskType, SourceAddress = x.SourceAddress, TargetAddress = x.TargetAddress }).ToList();
+ content = WebResponseContent.Instance.OK(data: task);
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+ #endregion
#endregion 澶栭儴鎺ュ彛鏂规硶
#region 璋冪敤WCS鎺ュ彛
- private string GetAGVIPAddress(string baseIp, string name)
+ private string GetWCSIPAddress(string baseIp, string name)
{
var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
@@ -1077,7 +1184,7 @@
public async Task<WebResponseContent> SendWCSTask(List<WMSTaskDTO> taskDTO)
{
WebResponseContent content = new WebResponseContent();
- var AgvSendTaskAddrss = GetAGVIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
+ var AgvSendTaskAddrss = GetWCSIPAddress(SysConfigConst.WCSIPAddress, SysConfigConst.ReceiveTask);
// 鍙戦�佽姹傚苟绛夊緟鍝嶅簲
var result = await HttpHelper.PostAsync(AgvSendTaskAddrss, taskDTO.ToJsonString());
@@ -1087,13 +1194,69 @@
}
#endregion
+ #region ERP鎺ュ彛璋冪敤
+ public string GetERPIPAddress(string baseIp, string name)
+ {
+ var configz = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wcsBasez = configz.Where(x => x.ConfigKey == baseIp).FirstOrDefault()?.ConfigValue;
+ var address = configz.Where(x => x.ConfigKey == name).FirstOrDefault()?.ConfigValue;
+ if (wcsBasez == null || address == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ return wcsBasez + address;
+ }
+
+ public async Task<WebResponseContent> SendERPTaskCompletion(string palletCode)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ DtStockInfo stock = await _stockInfoRepository.QueryFirstNavAsync(x=>x.PalletCode== palletCode);
+ Allocate allocate = new Allocate
+ {
+ context = new Context
+ {
+ CultureName = "zh-CN",
+ EntCode = "001",
+ OrgCode = "102",
+ UserCode = "MH0551"
+ },
+ documentTypeCode = "TransIn002",
+ businessDate = DateTime.Now.ToString("yyyy-MM-dd"),
+ isApproved = true,
+
+ transferInList = stock.StockInfoDetails.Select(item => new transferInList
+ {
+ ItemCode = item.MaterielCode,
+ TransInWHCode = item.Warehouse,
+ TransInQty = item.Quantity,
+ TransOutWHCode = "001",
+ }).ToList()
+ };
+ return content.OK(data: allocate);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+ }
+
+
+ #endregion
+
#region 鍐呴儴璋冪敤鏂规硶
public void UpdateLocationStatus(DtLocationInfo location, LocationEnum locationStatus, int taskNum, int StatusChangeType)
{
List<DtLocationInfo> locations = GetGroupLocations(location);
- List<DtLocationInfo> Beforelocation = locations;
+ List<DtLocationInfo> Beforelocation = locations.Select(x => new DtLocationInfo
+ {
+ Id = x.Id,
+ LocationCode = x.LocationCode,
+ LocationStatus = x.LocationStatus
+ }).ToList();
foreach (var item in locations)
{
@@ -1237,15 +1400,6 @@
};
}
- private bool IsAcrossFloor(DtLocationInfo Sourcelocation,DtLocationInfo Targetlocation)
- {
- return Sourcelocation.Floor == Targetlocation.Floor;
- }
-
- private bool IsSamefloor(DtLocationInfo Sourcelocation, DtLocationInfo Targetlocation)
- {
- return Sourcelocation.Floor == Targetlocation.Floor;
- }
private async Task DeleteStockInfoAsync(int stockId)
{
var isStockUpdated = await _stockInfoRepository.DeleteDataByIdAsync(stockId);
@@ -1282,14 +1436,6 @@
}
}
- private async Task UpdateLocationAsync(DtLocationInfo info)
- {
- var isStockUpdated = await _locationRepository.UpdateDataAsync(info);
- if (!isStockUpdated)
- {
- throw new Exception("搴撲綅淇℃伅鏇存柊澶辫触");
- }
- }
private async Task DeleteStockInfoDetailsAsync(IEnumerable<DtStockInfoDetail> details)
{
@@ -1387,26 +1533,6 @@
return taskHty;
}
- /// <summary>
- /// 鏇存柊搴撳瓨浣嶇疆
- /// </summary>
- /// <param name="stock">搴撳瓨瀵硅薄</param>
- /// <param name="toLocation">鐩爣浣嶇疆</param>
- // 鏇存柊搴撳瓨鍜屼綅缃俊鎭�
- private (DtStockInfo, DtLocationInfo, DtLocationInfo) UpdateStockLocation(DtStockInfo stock, Dt_Task task)
- {
- //淇敼鏉ユ簮搴撲綅鍜� 鐩爣搴撲綅鐘舵��
- var fromLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- fromLocation.LocationStatus = LocationEnum.Free.ObjToInt();
- var toLocation = _locationRepository.QueryFirst(x => x.LocationCode == task.SourceAddress && x.RoadwayNo == task.Roadway);
- toLocation.LocationStatus = LocationEnum.InStock.ObjToInt();
-
- // 灏嗗簱瀛樹綅缃缃负鐩爣浣嶇疆
- stock.LocationCode = task.TargetAddress;
-
- // 杩斿洖鏇存柊鍚庣殑搴撳瓨鍜屼綅缃俊鎭�
- return (stock, fromLocation, toLocation);
- }
#region 浠诲姟璇锋眰鏂规硶
@@ -1720,29 +1846,6 @@
}
}
- private DtStockInfo CreatePalletStock(Dt_Task task, DtBoxingInfo boxing)
- {
- var loation = _locationRepository.QueryFirst(x => x.RoadwayNo == task.Roadway && x.LocationCode == task.TargetAddress);
- if (loation == null)
- throw new Exception("鏈壘鍒板搴斾綅缃俊鎭�");
-
-
- var boxDetail = boxing.BoxingInfoDetails.Adapt<List<DtStockInfoDetail>>();
- boxDetail.ForEach(x => { x.Status = (int)StockStateEmun.宸插叆搴�; });
- var stock = new DtStockInfo()
- {
- PalletCode = task.PalletCode,
- LocationCode = task.TargetAddress,
- CreateDate = DateTime.Now,
- Creater = "system",
- IsFull = boxing.IsFull,
- StockInfoDetails = boxDetail,
- };
-
- stock.StockStatus = 1;
-
- return stock;
- }
#endregion 浠诲姟璇锋眰鏂规硶
--
Gitblit v1.9.3