From b07472f884708a6bfdf63d999004bbf0bb5f00a8 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 17 十一月 2025 17:12:57 +0800
Subject: [PATCH] 新增分单功能、二维码打印及物料供应商管理页面
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 345 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 199 insertions(+), 146 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 5a9e697..6f50975 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"
@@ -4,41 +4,48 @@
using Masuit.Tools;
using NewLife.Reflection;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using System.Collections;
using System.Collections.Generic;
using System.Drawing.Printing;
using System.Linq.Expressions;
using System.Threading.Tasks;
+using System.Xml.Linq;
using WIDESEA_Cache;
using WIDESEA_Common;
using WIDESEA_Core;
using WIDESEA_Core.Enums;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.Order;
using WIDESEA_DTO.Stock;
using WIDESEA_DTO.WMS;
using WIDESEA_IOrderRepository;
+using WIDESEA_IOrderServices;
using WIDESEA_Model.Models;
using WIDESEA_Model.Models.Order;
using WIDESEA_OrderRepository;
using WIDESEA_StorageTaskRepository;
+using JsonSerializer = System.Text.Json.JsonSerializer;
namespace WIDESEA_StorageBasicService;
public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
- private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
+ private readonly ILocationStatusChangeRecordRepository _locationStatusChangeRecordRepository;
private readonly IDt_InboundOrderRepository _inboundOrderRepository;
+ private readonly IDt_InboundOrderService _inboundOrderService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IStockInfoDetailRepository _stockInfoDetailRepository;
private readonly IDt_TaskService _taskService;
private readonly ILocationInfoRepository _locationRepository;
private readonly IDt_TaskRepository _taskRepository;
+ private readonly IDt_Task_HtyRepository _task_HtyRepository;
private readonly IDt_OrderOutDetailsRepository _outDetailsRepository;
- public StockInfoService(IStockInfoRepository BaseDal,
+ public StockInfoService(IStockInfoRepository BaseDal,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_InboundOrderRepository inboundOrderRepository,
IUnitOfWorkManage unitOfWorkManage,
@@ -46,7 +53,9 @@
IDt_TaskService taskService,
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
- IDt_OrderOutDetailsRepository outDetailsRepository) : base(BaseDal)
+ IDt_OrderOutDetailsRepository outDetailsRepository,
+ IDt_Task_HtyRepository task_HtyRepository,
+ IDt_InboundOrderService inboundOrderService) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
@@ -56,8 +65,10 @@
_locationRepository = locationRepository;
_taskRepository = taskRepository;
_outDetailsRepository = outDetailsRepository;
+ _task_HtyRepository = task_HtyRepository;
+ _inboundOrderService = inboundOrderService;
}
-
+ #region 鏂规硶閲嶅啓
/// <summary>
/// 鍒嗛〉
/// </summary>
@@ -96,6 +107,7 @@
Expression<Func<DtStockInfo, bool>> floor = null;
Expression<Func<DtStockInfo, bool>> areaId = null;
Expression<Func<DtStockInfo, bool>> materielCode = null;
+ Expression<Func<DtStockInfo, bool>> materielName = null;
foreach (var item in searchParametersList)
{
if (item.Name.Contains("locationStatus"))
@@ -108,11 +120,15 @@
}
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"))
{
materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
+ }
+ else if (item.Name.Contains("materielName"))
+ {
+ materielName = x => x.StockInfoDetails.Any(d => d.MaterielName == item.Value);
}
}
//.IncludesAllFirstLayer()
@@ -124,10 +140,46 @@
.WhereIF(floor != null, floor)
.WhereIF(areaId != null, areaId)
.WhereIF(materielCode != null, materielCode)
+ .WhereIF(materielName != null, materielName)
.OrderBy(orderByModels)
.ToPageList(options.Page, options.Rows, ref totalCount);
new PageGridData<DtStockInfo>(totalCount, data);
return new PageGridData<DtStockInfo>(totalCount, data);
+ }
+
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ var remark = saveModel.MainData["remark"].ToString();
+ var palletCode = saveModel.MainData["palletCode"].ToString();
+ List<DtStockInfoDetail> details = DeserializeList<DtStockInfoDetail>(saveModel.DetailData);
+ if (remark == "璋冩嫧鍑哄簱")
+ {
+ return _taskService.HandAllocateOutBoundTaskAsync(details).Result;
+ }
+ else if (remark == "鍏朵粬鍑哄簱")
+ {
+ return _taskService.OtherOutBoundTaskAsync(details).Result;
+ }
+ else
+ {
+ return WebResponseContent.Instance.Error("绯荤粺寮傚父");
+ }
+ }
+ public List<T> DeserializeList<T>(List<Dictionary<string, object>> rawData)
+ {
+ if (rawData == null) return new List<T>();
+ var processedData = rawData.Select(dict =>
+ {
+ var newDict = new Dictionary<string, object>();
+ foreach (var kvp in dict)
+ {
+ var newKey = char.ToUpper(kvp.Key[0]) + kvp.Key.Substring(1);
+ newDict[newKey] = kvp.Value;
+ }
+ return newDict;
+ }).ToList();
+ var json = JsonSerializer.Serialize(processedData);
+ return JsonSerializer.Deserialize<List<T>>(json);
}
public List<DtLocationInfo> GetStockLocations(List<DtLocationInfo>? locations)
@@ -181,6 +233,8 @@
}
return locationsNew;
}
+
+ #endregion
#region 搴撳瓨瑙嗗浘
public List<StockSelectViewDTO> GetStockSelectViews(GetStockSelectViewDto viewDto)
@@ -248,7 +302,7 @@
.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,
@@ -270,9 +324,9 @@
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
+ var result = stockNew.Skip((maxPage - 1) * 10).Take(10).Select(s => new StockSelectViewDTO
{
- Id =s.Id,
+ Id = s.Id,
MaterielCode = s.StockInfoDetails
.FirstOrDefault()?.MaterielCode ?? string.Empty,
@@ -389,170 +443,169 @@
#endregion
- #region 缁勭洏
- public async Task<WebResponseContent> AddGroupPlateAsync(GroupPlate groupPlate)
+ #region 搴撳瓨鏁版嵁灞曠ず
+
+ public async Task<WebResponseContent> GetStockData()
{
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);
+ var stocks = await _stockInfoDetailRepository.QueryDataAsync(x => true);
+ var orderdetail = SqlSugarHelper.DbWMS.Queryable<Dt_OrderOutDetails_Hty>().Where(x => true).ToList();
+ var task = _taskRepository.QueryData(x => true).ToList();
- 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("鏈壘鍒板叆搴撳崟鎹俊鎭�");
- }
+ // 鑾峰彇UTC褰撳墠鏃堕棿
+ DateTime utcNow = DateTime.UtcNow;
+
+ // 璁＄畻褰撴湀鏃堕棿鑼冨洿
+ DateTime firstDayOfMonth = new DateTime(utcNow.Year, utcNow.Month, 1);
+ DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻涓婃湀鏃堕棿鑼冨洿
+ DateTime firstDayOfLastMonth = new DateTime(utcNow.Year, utcNow.Month, 1).AddMonths(-1);
+ DateTime lastDayOfLastMonth = firstDayOfLastMonth.AddMonths(1).AddSeconds(-1);
+
+ // 璁＄畻褰撳ぉ鏃堕棿鑼冨洿
+ DateTime todayStart = utcNow.Date;
+ DateTime todayEnd = todayStart.AddDays(1).AddTicks(-1);
+
+ // 璁＄畻鏄ㄦ棩鏃堕棿鑼冨洿
+ DateTime startOfPreviousDay = utcNow.AddDays(-1).Date; // 鍓嶄竴澶╃殑 00:00:00
+ DateTime endOfPreviousDay = startOfPreviousDay.AddDays(1).AddSeconds(-1);
+
+ // 鏌ヨ褰撴湀鏁版嵁
+ var currentMonthInStocks = stocks.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocks = orderdetail.Where(x => x.CreateDate >= firstDayOfMonth && x.CreateDate <= lastDayOfMonth).Sum(x => x.OutboundQuantity);
+
+ //鏌ヨ涓婃湀鏁版嵁
+ var currentMonthInStocksLastMonth = stocks.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.Quantity);
+ var currentMonthOutStocksLastMonth = orderdetail.Where(x => x.CreateDate >= firstDayOfLastMonth && x.CreateDate <= lastDayOfLastMonth).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ浠婃棩鏁版嵁
+ var currentDayInStocks = stocks.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.Quantity);
+ var currentDayOutStocks = orderdetail.Where(x => x.CreateDate >= todayStart && x.CreateDate <= todayEnd).Sum(x => x.OutboundQuantity);
+
+ // 鏌ヨ鏄ㄥぉ鏃ユ暟鎹�
+ var currentDayInStocksLast = stocks.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.Quantity);
+ var currentDayOutStocksLast = orderdetail.Where(x => x.CreateDate >= startOfPreviousDay && x.CreateDate <= endOfPreviousDay).Sum(x => x.OutboundQuantity);
+
+ // 鐢熸垚鏈�杩�7澶╃殑鍑哄叆搴撴暟鎹�
+ var last7Days = Enumerable.Range(0, 7)
+ .Select(i => utcNow.Date.AddDays(-i))
+ .OrderBy(x => x)
+ .ToList();
+
+ var monthDays = Enumerable.Range(1, DateTime.DaysInMonth(utcNow.Year, utcNow.Month))
+ .Select(day => new DateTime(utcNow.Year, utcNow.Month, day))
+ .Where(date => date <= utcNow.Date) // 鍙寘鍚埌浠婂ぉ涓烘鐨勬棩鏈�
+ .ToList();
+
+ var inboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ }).ToList();
+
+ var outboundData = last7Days.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ Value = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ var MonthSumData = monthDays.Select(date => new
+ {
+ Date = date.ToString("MM-dd"),
+ InValue = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
+ OutValue = orderdetail.Where(x => x.CreateDate.Date == date).Sum(x => x.OutboundQuantity)
+ }).ToList();
+
+ object obj = new
+ {
+ metrics = new List<object>{
+ new {
+ name = "浠婃棩杩涘簱閲�",
+ value = currentDayInStocks,
+ compare =currentDayInStocks-currentDayInStocksLast,
+ },
+ new {
+ name = "浠婃棩鍑哄簱閲�",
+ value = currentDayOutStocks,
+ compare =currentDayOutStocks-currentDayOutStocksLast,
+ },
+ new {
+ name = "鏈湀杩涘簱閲�",
+ value = currentMonthInStocks,
+ compare =currentMonthInStocks-currentMonthInStocksLastMonth,
+ },
+ new {
+ name = "鏈湀鍑哄簱閲�",
+ value = currentMonthOutStocks,
+ compare = currentMonthOutStocks - currentMonthOutStocksLastMonth,
+ },
+ new {
+ name = "搴撳瓨鎬婚噺",
+ value = stocks.Sum(x => x.Quantity)
}
- DtStockInfo boxing = new DtStockInfo()
+ },
+ outbound = new
{
- PalletCode = groupPlate.palletCode,
- StockStatus = (int)StockStateEmun.缁勭洏鏆傚瓨,
- StockInfoDetails = details
- };
- await BaseDal.AddDataNavAsync(boxing);
- content.OK("缁勭洏鎴愬姛");
- }
- return content;
+ dates = outboundData.Select(x => x.Date).ToArray(),
+ values = outboundData.Select(x => x.Value).ToArray()
+ },
+ inbound = new
+ {
+ dates = inboundData.Select(x => x.Date).ToArray(),
+ values = inboundData.Select(x => x.Value).ToArray()
+ },
+ monthData = new
+ {
+ dates = MonthSumData.Select(x => x.Date).ToArray(),
+ inValue = MonthSumData.Select(x => x.InValue).ToArray(),
+ outValue = MonthSumData.Select(x => x.OutValue).ToArray(),
+ },
+ newTask = task.Select(x => new
+ {
+ x.PalletCode,
+ x.Roadway,
+ x.SourceAddress,
+ x.TargetAddress,
+ x.ErrorMessage,
+ x.CreateDate,
+ TaskType = EnumHelper.GetDescriptionFromEnums(x.TaskType, typeof(TaskOutboundTypeEnum), typeof(TaskInboundTypeEnum), typeof(TaskAcrossFloorTypeEnum), typeof(TaskRelocationTypeEnum), typeof(TaskAGVCarryTypeEnum)),
+ TaskState = EnumHelper.GetDescriptionFromEnums(x.TaskState, typeof(TaskInStatusEnum), typeof(TaskOutStatusEnum), typeof(TaskAcrossFloorStatusEnum), typeof(TaskRelocationStatusEnum), typeof(TaskAGVCarryStatusEnum))
+ }).ToList()
+ };
+ return content.OK(data: obj);
}
catch (Exception ex)
{
- return content.Error(ex.Message);
+ return content.Error("绯荤粺閿欒锛岃鑱旂郴绠＄悊鍛�");
}
}
#endregion
- #region 瑙ｇ洏
- public async Task<WebResponseContent> DeleteGroupPlateAsync(GroupPlate groupPlate)
+ #region 鎵撳嵃搴撳瓨鍗曚釜鐗╂枡浜岀淮鐮�
+ public async Task<WebResponseContent> PrintOrder(object[] key)
{
WebResponseContent content = new WebResponseContent();
try
{
- if (groupPlate == null || groupPlate.palletCode.IsNullOrEmpty())
+ List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
+ foreach (var item in key)
{
- 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 () =>
+ var order = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.ToString());
+ if (order != null)
{
- await BaseDal.Db.DeleteNav<DtStockInfo>(x => x.Id == stock.Id)
- .Include(x => x.StockInfoDetails)
- .ExecuteCommandAsync();
- await AddStockHtyAsync(stockhty);
- });
- content.OK("瑙ｇ洏鎴愬姛");
+ inboundOrders.Add(order);
+ }
}
- else
- {
- content.Error("鏈壘鍒扮粍鐩樻暟鎹�");
- }
- return content;
+ return _inboundOrderService.PrintInbound(inboundOrders); ;
}
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("搴撳瓨鍘嗗彶淇℃伅娣诲姞澶辫触");
+ return content.Error("鏈煡閿欒锛岃鑱旂郴绠＄悊鍛�");
}
}
- /// <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