From a296223898d61a9838bbd35ed75c87575e308a36 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期五, 07 十一月 2025 17:19:38 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 597 +++++++++++++++++++---------------------------------------
1 files changed, 198 insertions(+), 399 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
index d10d516..2a555ff 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs"
@@ -16,6 +16,7 @@
using WIDESEA_Core.Enums;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
+using WIDESEA_DTO.Order;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
using WIDESEA_IOrderRepository;
@@ -28,36 +29,33 @@
public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
- private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
- private readonly IDt_OtherOutboundOrderRepository _OtheroutorderRepository;
- private readonly IDt_OtherOutboundOrderDetailRepository _OtheroutorderdetailRepository;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
private readonly IDt_TaskService _taskService;
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
- public StockInfoService(IStockInfoRepository BaseDal,
+ public StockInfoService(IStockInfoRepository BaseDal,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_InboundOrderRepository inboundOrderRepository,
IUnitOfWorkManage unitOfWorkManage,
- IDt_OtherOutboundOrderRepository OtheroutorderRepository,
- IDt_OtherOutboundOrderDetailRepository OtheroutorderdetailRepository,
IStockInfoDetailRepository stockInfoDetailRepository,
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
- IDt_TaskRepository taskRepository) : base(BaseDal)
+ IDt_TaskRepository taskRepository,
+ IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
_unitOfWorkManage = unitOfWorkManage;
- _OtheroutorderRepository = OtheroutorderRepository;
- _OtheroutorderdetailRepository = OtheroutorderdetailRepository;
_stockInfoDetailRepository = stockInfoDetailRepository;
_taskService = taskService;
_locationRepository = locationRepository;
_taskRepository = taskRepository;
+ _outDetailsRepository = outDetailsRepository;
}
/// <summary>
@@ -110,7 +108,7 @@
}
else if (item.Name.Contains("areaId"))
{
- areaId = x => x.LocationInfo.AreaId== Convert.ToInt32(item.Value);
+ areaId = x => x.LocationInfo.AreaId == Convert.ToInt32(item.Value);
}
else if (item.Name.Contains("materielCode"))
{
@@ -132,6 +130,57 @@
return new PageGridData<DtStockInfo>(totalCount, data);
}
+ public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
+ {
+ List<DtLocationInfo> locationsNew = new List<DtLocationInfo>();
+ foreach (var item in locations)
+ {
+ if (item.AreaId == 1)
+ {
+ if (item.Depth == 2)
+ {
+ var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == item.Column && x.Layer == item.Layer);
+
+ if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ }
+ locationsNew.Add(item);
+ }
+ else if (item.AreaId == 2)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
+
+ foreach (var Lateral in locationLateral)
+ {
+ if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+
+ else if (item.AreaId == 5 || item.AreaId == 6)
+ {
+ var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
+
+ foreach (var lateral in locationLateral)
+ {
+ if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
+ {
+ locationsNew.Remove(item);
+ continue;
+ }
+ locationsNew.Add(item);
+ }
+ }
+ }
+ return locationsNew;
+ }
#region 搴撳瓨瑙嗗浘
public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
@@ -170,423 +219,173 @@
return result;
}
- public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
+ public WebResponseContent GetStockView(GetStockSelectViewDto viewDto)
{
- List<DtLocationInfo> locationsNew = new List<DtLocationInfo>();
- foreach (var item in locations)
+ WebResponseContent content = new WebResponseContent();
+ try
{
- if (item.AreaId == 1)
+ Expression<Func<DtStockInfoDetail, bool>> expressionOrder = x => true;
+ if (!string.IsNullOrEmpty(viewDto.materielCode))
{
- if (item.Depth == 2)
- {
- var locationLateral = _locationRepository.QueryFirst(x => x.Row == 1 && x.Column == item.Column && x.Layer == item.Layer);
-
- if (locationLateral.LocationStatus == (int)LocationEnum.Lock && locationLateral.EnalbeStatus == 1)
- {
- locationsNew.Remove(item);
- continue;
- }
- locationsNew.Add(item);
- }
+ expressionOrder = x => x.MaterielCode.Contains(viewDto.materielCode);
}
- else if (item.AreaId == 2)
- {
- var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
+ int count = 0;
+ count = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(), x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).Count();
- foreach (var Lateral in locationLateral)
+
+ int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
+ if (viewDto.pageNo <= maxPage)
+ {
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
{
- if (Lateral.LocationStatus == (int)LocationEnum.Lock && Lateral.EnalbeStatus == 1)
- {
- locationsNew.Remove(item);
- continue;
- }
- locationsNew.Add(item);
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
}
+
+ var result = stockNew.Skip((maxPage - 1) * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id = s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
}
-
- else if (item.AreaId == 5 || item.AreaId == 6)
+ else
{
- var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column < item.Column && x.Remark == item.Remark);
+ var stocks = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock
+ && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
+ .WhereIF(!viewDto.materielCode.IsNullOrEmpty(),
+ x => x.StockInfoDetails.Any(d => d.MaterielCode == viewDto.materielCode && d.Quantity > 0))
+ .Select(x => new DtStockInfo
+ {
+ Id = x.Id,
+ PalletCode = x.PalletCode,
+ LocationCode = x.LocationCode,
+ StockInfoDetails = x.StockInfoDetails
+ .OrderByDescending(d => d.CreateDate)
+ .Take(1)
+ .ToList(),
+ LocationInfo = x.LocationInfo
+ })
+ .OrderBy(x => x.CreateDate)
+ .ToList();
- foreach (var lateral in locationLateral)
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stocks != null || stocks.Count() > 0)
{
- if (lateral.LocationStatus == (int)LocationEnum.Lock && lateral.EnalbeStatus == 1)
- {
- locationsNew.Remove(item);
- continue;
- }
- locationsNew.Add(item);
+ var locations = stocks.Select(s => s.LocationInfo).ToList();
+ locationInfos = GetStockLocations(locations).Distinct().ToList();
+ stockNew = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
}
+
+ var result = stockNew.Skip(0 * 10).Take(10).Select(s => new StockSelectViewDTO
+ {
+ Id = s.Id,
+
+ MaterielCode = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielCode ?? string.Empty,
+
+ MaterielName = s.StockInfoDetails
+ .FirstOrDefault()?.MaterielName ?? string.Empty,
+
+ Quantity = s.StockInfoDetails
+ .FirstOrDefault()?.Quantity ?? 0, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = s.PalletCode ?? string.Empty,
+
+ LocationCode = s.LocationInfo?.LocationCode ?? string.Empty
+ }).ToList();
+
+ content = WebResponseContent.Instance.OK(data: result);
}
}
- return locationsNew;
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error($"鏌ヨ鍑哄簱鍗曟嵁閿欒,閿欒淇℃伅:{ex.Message}");
+ }
+ return content;
}
#endregion
- #region 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
-
- public async Task<WebResponseContent> GenerateOutboundTask(GenerateOutTaskDto requestOut)
+ #region 鍏朵粬鍑哄簱瑙嗗浘
+ public List<StockSelectViewDTO> GetOtherOutBoundView(int id)
{
- WebResponseContent content = new WebResponseContent();
- try
+ DtStockInfo stock = BaseDal.Db.Queryable<DtStockInfo>()
+ .Includes(x => x.StockInfoDetails)
+ .Includes(x => x.LocationInfo)
+ .Where(x => x.Id == id)
+ .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable).First();
+
+ List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
+ List<DtStockInfo> stockNew = new List<DtStockInfo>();
+ if (stock != null)
{
- foreach (var orderId in requestOut.orderIds)
+ if (_taskService.LocationIsOutBound(stock.LocationInfo))
{
- List<RequestTaskDto> taskDtos = new List<RequestTaskDto>();
- Dt_OtherOutboundOrderDetail outboundOrderdetail = _OtheroutorderdetailRepository.QueryFirst(x => x.Id == orderId);
- Dt_OtherOutboundOrder outboundOrder = _OtheroutorderRepository.QueryFirst(x => x.Id == outboundOrderdetail.OrderId);
-
- (bool, string) checkResult = CheckSelectStockDeital(outboundOrderdetail, requestOut.stockViews, requestOut);
- if (!checkResult.Item1) throw new Exception(checkResult.Item2);
-
- else
- {
- var result = AssignStockOutbound(outboundOrderdetail, requestOut.stockViews);
-
- if (result.Item1.Count <= 0)
- {
- return content.Error("鏈壘鍒板簱瀛樺垎閰嶏紝璇风‘璁ゆ槸鍚﹀瓨鍦ㄥ簱瀛樻垨鍗曟嵁鏁伴噺宸插嚭瀹�");
- }
-
- result.Item1.Distinct().ForEach(item =>
- {
- RequestTaskDto task = new RequestTaskDto
- {
- TaskType = outboundOrder.OrderType,
- OrderNo = outboundOrder.OrderNo,
- MaterielCode = outboundOrderdetail.MaterielCode,
- Position = item.LocationCode,
- PalletCode = item.PalletCode,
- AreaId = Convert.ToInt32(requestOut.AreaId),
- };
- taskDtos.Add(task);
- item.StockInfoDetails.Where(x => x.MaterielCode == outboundOrderdetail.MaterielCode).FirstOrDefault().Status = (int)StockStateEmun.鍑哄簱閿佸畾;
- item.StockStatus = (int)StockStateEmun.鍑哄簱閿佸畾;
- });
- List<Dt_Task> taskNews = new List<Dt_Task>();
- List<WMSTaskDTO> taskDTOs = new List<WMSTaskDTO>();
- foreach (var item in taskDtos)
- {
- taskNews.Add(await _taskService.RequestOutboundTaskAsync(item));
-
- }
- List<DtLocationStatusChangeRecord> locationStatusChangeRecords = new List<DtLocationStatusChangeRecord>();
- List<DtLocationInfo> locations = new List<DtLocationInfo>();
- foreach (var item in taskNews)
- {
- taskDTOs.Add(CreateTaskDTO(item));
- var result1 = _taskService.UpdateLocationStatus(item.SourceAddress, LocationEnum.InStockDisable, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- var result2 = _taskService.UpdateLocationStatus(item.TargetAddress, LocationEnum.Lock, item.TaskNum.Value, (int)StatusChangeTypeEnum.AutomaticOutbound);
- locationStatusChangeRecords.AddRange(result1.Item1);
- locationStatusChangeRecords.AddRange(result2.Item1);
- locations.AddRange(result1.Item2);
- locations.AddRange(result2.Item2);
- }
-
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- _taskRepository.AddData(taskNews);
- BaseDal.UpdateDataNav(result.Item1);
- await _locationStatusChangeRecordRepository.AddDataAsync(locationStatusChangeRecords);
- await _locationRepository.UpdateDataAsync(locations);
- _OtheroutorderdetailRepository.UpdateData(result.Item2);
- });
- content = await _taskService.SendWCSTask(taskDTOs);
- }
+ return null;
}
- return content;
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
-
- }
- private WMSTaskDTO CreateTaskDTO(Dt_Task task)
- {
- return new WMSTaskDTO
- {
- TaskNum = task.TaskNum.Value,
- Grade = task.Grade.Value,
- PalletCode = task.PalletCode,
- RoadWay = task.Roadway,
- SourceAddress = task.SourceAddress,
- TargetAddress = task.TargetAddress,
- TaskState = task.TaskState,
- Id = 0,
- TaskType = task.TaskType,
- AGVTaskNum = task.AGVTaskNum,
- Remark = task.Remark
- };
- }
- public (List<DtStockInfo>, Dt_OtherOutboundOrderDetail) AssignStockOutbound(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews)
- {
- decimal originalNeedQuantity = outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity;
-
- decimal needQuantity = originalNeedQuantity;
-
- List<DtStockInfo> outStocks = new List<DtStockInfo>();
- if (stockSelectViews != null && stockSelectViews.Count > 0)
- {
- outStocks = BaseDal.Db.Queryable<DtStockInfo>().Where(x => stockSelectViews.Select(x => x.PalletCode).ToList().Contains(x.PalletCode)).Includes(x => x.StockInfoDetails).ToList();
- }
- else
- {
- outStocks = GetStockInfos(outboundOrderdetail.MaterielCode);
}
- List<DtStockInfo> outStockNews=new List<DtStockInfo>();
-
- foreach (var item in outStocks)
+ var result = stock.StockInfoDetails.Select(s => new StockSelectViewDTO
{
- var stockDetail = item.StockInfoDetails
- .Where(d => d.MaterielCode == outboundOrderdetail.MaterielCode && d.Quantity > 0);
- if (needQuantity <= 0)
- {
- continue;
- }
- foreach (var detail in stockDetail)
- {
- if (detail != null)
- {
- if (needQuantity >= detail.Quantity)
- {
- if (detail.Quantity <= detail.OutboundQuantity)
- {
- continue;
- }
- needQuantity -= detail.Quantity;
- detail.OutboundQuantity = detail.Quantity;
- }
- else
- {
- if (detail.Quantity <= detail.OutboundQuantity)
- {
- continue;
- }
- detail.OutboundQuantity = needQuantity;
- needQuantity = 0;
- }
- outStockNews.Add(item);
- }
- }
+ MaterielCode = s.MaterielCode ?? string.Empty,
- }
- outboundOrderdetail.OverOutQuantity = outboundOrderdetail.OrderQuantity - needQuantity;
+ MaterielName = s.MaterielName ?? string.Empty,
- if (outboundOrderdetail.OverOutQuantity != 0)
- {
- outboundOrderdetail.OrderDetailStatus = (int)OrderStateEmun.寮�濮�;
- }
- return (outStockNews, outboundOrderdetail);
+ Quantity = s.Quantity, // 澶勭悊绌哄�兼儏鍐�
+
+ PalletCode = stock.PalletCode ?? string.Empty,
+
+ LocationCode = stock.LocationCode ?? string.Empty
+ }).ToList();
+
+ return result;
}
- private (bool, string) CheckSelectStockDeital(Dt_OtherOutboundOrderDetail outboundOrderdetail, List<StockSelectViewDTO> stockSelectViews, GenerateOutTaskDto requestOut)
- {
- if (outboundOrderdetail == null)
- {
- return (false, "鏈壘鍒板嚭搴撳崟淇℃伅");
- }
- if (outboundOrderdetail.OrderDetailStatus == (int)OrderStateEmun.宸插畬鎴�)
- {
- return (false, "璇ユ槑缁嗕笉鍙搷浣�");
- }
- if (stockSelectViews != null && stockSelectViews.Sum(x => x.UseableQuantity) > outboundOrderdetail.OrderQuantity - outboundOrderdetail.OverOutQuantity)
- {
- return (false, "閫夋嫨鏁伴噺瓒呭嚭鍗曟嵁鏁伴噺");
- }
- if (outboundOrderdetail.OrderQuantity <= outboundOrderdetail.OverOutQuantity)
- {
- return (false, "鍗曟嵁鏁伴噺宸插嚭搴撳畬鎴�");
- }
- return (true, "鎴愬姛");
- }
-
- public List<DtStockInfo> GetStockInfos(string materielCode)
- {
- var stocks = BaseDal.Db.Queryable<DtStockInfo>()
- .Includes(x => x.StockInfoDetails)
- .Includes(x => x.LocationInfo)
- .Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable)
- .Where(x => x.StockInfoDetails.Any(d => d.MaterielCode == materielCode && d.Quantity > 0)).ToList().OrderBy(x => x.CreateDate).ToList();
-
- if (stocks == null || stocks.Count() <= 0)
- {
- return stocks;
- }
-
- var locations = stocks.Select(s => s.LocationInfo).ToList();
- List<DtLocationInfo> locationInfos = GetStockLocations(locations).Distinct().ToList();
- stocks = stocks.Where(s => s.LocationInfo != null && locationInfos.Contains(s.LocationInfo)).ToList();
- return stocks;
- }
- #endregion 鏍规嵁鍗曟嵁鏄庣粏鐢熸垚鍑哄簱浠诲姟
-
- #region 缁勭洏
- public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (groupPlate == null || groupPlate.OrderNos.IsNullOrEmpty() || groupPlate.palletCode.IsNullOrEmpty())
- {
- return content.Error("鍙傛暟閿欒");
- }
- var info = await BaseDal.QueryFirstAsync(x => x.PalletCode == groupPlate.palletCode);
- if (!info.IsNullOrEmpty())
- {
- content.Error("璇ユ墭鐩樺凡瀛樺湪缁勭洏");
- }
- else
- {
- List<DtStockInfoDetail> details = new List<DtStockInfoDetail>();
- foreach (var item in groupPlate.OrderNos)
- {
- var InboundOrder = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item);
-
- if (InboundOrder != null)
- {
- var x = details.Where(x => x.MaterielCode == InboundOrder.MaterialNo && x.Warehouse == InboundOrder.WarehouseName && x.DrawingNumber == InboundOrder.ProductDrawingNumber && x.DemandClassification == InboundOrder.DemandClassification).FirstOrDefault();
- if (x != null)
- {
- details.Remove(x);
- x.MaterielCode = InboundOrder.MaterialNo;
- x.MaterielName = InboundOrder.MaterialName;
- x.DemandClassification = InboundOrder.DemandClassification;
- x.Warehouse = InboundOrder.WarehouseName;
- x.OrderNo = InboundOrder.UpperOrderNo;
- x.Unit = InboundOrder.Unit;
- x.Specs = InboundOrder.Specs;
- x.Weight = InboundOrder.Weight;
- x.Quantity = x.Quantity + InboundOrder.Quantity;
- x.DrawingNumber = InboundOrder.ProductDrawingNumber;
- x.Date = InboundOrder.Datetime;
- details.Add(x);
- }
- else
- {
- DtStockInfoDetail detail = new DtStockInfoDetail()
- {
- MaterielCode = InboundOrder.MaterialNo,
- MaterielName = InboundOrder.MaterialName,
- DemandClassification = InboundOrder.DemandClassification,
- Warehouse = InboundOrder.WarehouseName,
- OrderNo = InboundOrder.UpperOrderNo,
- Unit = InboundOrder.Unit,
- Specs = InboundOrder.Specs,
- Weight = InboundOrder.Weight,
- Quantity = InboundOrder.Quantity,
- DrawingNumber = InboundOrder.ProductDrawingNumber,
- Date = InboundOrder.Datetime,
- };
- details.Add(detail);
- }
- }
- else
- {
- return content.Error("鏈壘鍒板叆搴撳崟鎹俊鎭�");
- }
- }
- DtStockInfo boxing = new DtStockInfo()
- {
- PalletCode = groupPlate.palletCode,
- StockStatus = (int)StockStateEmun.缁勭洏鏆傚瓨,
- StockInfoDetails = details
- };
- await BaseDal.AddDataNavAsync(boxing);
- content.OK("缁勭洏鎴愬姛");
- }
- return content;
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
- #endregion
-
- #region 瑙ｇ洏
- public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
- {
- WebResponseContent content = new WebResponseContent();
- try
- {
- if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
- {
- return content.Error("鍙傛暟閿欒");
- }
- var stock = await BaseDal.QueryFirstNavAsync(x => x.PalletCode == groupPlate.palletCode && x.StockStatus == (int)StockStateEmun.缁勭洏鏆傚瓨);
- if (!stock.IsNullOrEmpty())
- {
- stock.StockStatus = (int)StockStateEmun.缁勭洏鎾ら攢;
- DtStockInfo_Hty stockhty = stock.Adapt<DtStockInfo_Hty>();
- stockhty.ModifyDate = DateTime.Now;
- await _unitOfWorkManage.UseTranAsync(async () =>
- {
- await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
- .Include(x => x.StockInfoDetails)
- .ExecuteCommandAsync();
- await AddStockHtyAsync(stockhty);
- });
- content.OK("瑙ｇ洏鎴愬姛");
- }
- else
- {
- content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
- }
- return content;
- }
- catch (Exception ex)
- {
- return content.Error(ex.Message);
- }
- }
- private async Task AddStockHtyAsync(DtStockInfo_Hty stockhty)
- {
- var isStockAdd = await SqlSugarHelper.DbWMS.InsertNav(stockhty).IncludesAllFirstLayer().ExecuteCommandAsync();
- if (!isStockAdd)
- {
- throw new Exception("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
- }
- }
-
- /// <summary>
- /// 鎵归噺鍒犻櫎
- /// </summary>
- /// <param name="keys"></param>
- /// <returns></returns>
- public override WebResponseContent DeleteData(object[] keys)
- {
- try
- {
- List<DtStockInfo_Hty> stockInfos = new List<DtStockInfo_Hty>();
- List<DtLocationInfo> locationInfos = new List<DtLocationInfo>();
-
- foreach (var item in keys)
- {
- var stock = BaseDal.QueryFirstNavAsync(x => x.Id == item.ObjToInt()).Result;
- var stockHty = stock.Adapt<DtStockInfo_Hty>();
- stockInfos.Add(stockHty);
-
- var location = SqlSugarHelper.DbWMS.Queryable<DtLocationInfo>().FirstAsync(x => x.LocationCode == stock.LocationCode).Result;
- var lastStatus = location.LocationStatus;
- location.LocationStatus = (int)LocationEnum.Free;
- locationInfos.Add(location);
- _locationStatusChangeRecordRepository.AddLocationStatusChangeRecord(location, lastStatus, (int)StatusChangeTypeEnum.ManualOperation, 0);
- }
- //var hty = BaseDal.Db.InsertNav(stockInfos)
- // .Include(x => x.StockInfoDetails)
- // .ExecuteCommand();
- var isStockAdd = SqlSugarHelper.DbWMS.InsertNav(stockInfos).IncludesAllFirstLayer().ExecuteCommandAsync();
-
- var locationd = SqlSugarHelper.DbWMS.Updateable(locationInfos).ExecuteCommandHasChange();
- return base.DeleteData(keys);
- }
- catch (Exception ex)
- {
- return WebResponseContent.Instance.Error(ex.Message);
- }
- }
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3