From c69b6892e9e004db9cf5d0edc69bbd2fcc1d83db Mon Sep 17 00:00:00 2001
From: yangpeixing <yangpeixing@hnkhzn.com>
Date: 星期一, 15 十二月 2025 16:41:44 +0800
Subject: [PATCH] 1
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/Stock/StockInfoService.cs | 102 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 92 insertions(+), 10 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 86b075c..d2f43f1 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"
@@ -23,6 +23,7 @@
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;
@@ -33,8 +34,10 @@
public class StockInfoService : ServiceBase<DtStockInfo, IStockInfoRepository>, IStockInfoService
{
+ private readonly LogFactory LogFactory = new LogFactory();
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;
@@ -52,7 +55,8 @@
ILocationInfoRepository locationRepository,
IDt_TaskRepository taskRepository,
IDt_OrderOutDetailsRepository outDetailsRepository,
- IDt_Task_HtyRepository task_HtyRepository) : base(BaseDal)
+ IDt_Task_HtyRepository task_HtyRepository,
+ IDt_InboundOrderService inboundOrderService) : base(BaseDal)
{
_locationStatusChangeRecordRepository = locationStatusChangeRecordRepository;
_inboundOrderRepository = inboundOrderRepository;
@@ -63,6 +67,7 @@
_taskRepository = taskRepository;
_outDetailsRepository = outDetailsRepository;
_task_HtyRepository = task_HtyRepository;
+ _inboundOrderService = inboundOrderService;
}
#region 鏂规硶閲嶅啓
/// <summary>
@@ -120,11 +125,11 @@
}
else if (item.Name.Contains("materielCode"))
{
- materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode == item.Value);
+ materielCode = x => x.StockInfoDetails.Any(d => d.MaterielCode.Contains(item.Value));
}
else if (item.Name.Contains("materielName"))
{
- materielName = x => x.StockInfoDetails.Any(d => d.MaterielName == item.Value);
+ materielName = x => x.StockInfoDetails.Any(d => d.MaterielName.Contains(item.Value));
}
}
//.IncludesAllFirstLayer()
@@ -197,7 +202,7 @@
}
locationsNew.Add(item);
}
- else if (item.AreaId == 2)
+ else if (item.AreaId == 2 || item.AreaId == 7)
{
var locationLateral = _locationRepository.QueryData(x => x.Row == item.Row && x.Column > item.Column && x.Remark == item.Remark);
@@ -457,17 +462,33 @@
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)
@@ -483,7 +504,7 @@
var inboundData = last7Days.Select(date => new
{
Date = date.ToString("MM-dd"),
- Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity)
+ Value = stocks.Where(x => x.CreateDate.Date == date).Sum(x => x.Quantity),
}).ToList();
var outboundData = last7Days.Select(date => new
@@ -504,19 +525,23 @@
metrics = new List<object>{
new {
name = "浠婃棩杩涘簱閲�",
- value = currentDayInStocks
+ value = currentDayInStocks,
+ compare =currentDayInStocks-currentDayInStocksLast,
},
new {
name = "浠婃棩鍑哄簱閲�",
- value = currentDayOutStocks
+ value = currentDayOutStocks,
+ compare =currentDayOutStocks-currentDayOutStocksLast,
},
new {
name = "鏈湀杩涘簱閲�",
- value = currentMonthInStocks
+ value = currentMonthInStocks,
+ compare =currentMonthInStocks-currentMonthInStocksLastMonth,
},
new {
name = "鏈湀鍑哄簱閲�",
- value = currentMonthOutStocks
+ value = currentMonthOutStocks,
+ compare = currentMonthOutStocks - currentMonthOutStocksLastMonth,
},
new {
name = "搴撳瓨鎬婚噺",
@@ -558,6 +583,63 @@
return content.Error("绯荤粺閿欒锛岃鑱旂郴绠＄悊鍛�");
}
}
+ #endregion
+
+ #region 鎵撳嵃搴撳瓨鍗曚釜鐗╂枡浜岀淮鐮�
+ public async Task<WebResponseContent> PrintOrder(object[] key)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ List<Dt_InboundOrder> inboundOrders = new List<Dt_InboundOrder>();
+ foreach (var item in key)
+ {
+ var order = _inboundOrderRepository.QueryFirst(x => x.OrderNo == item.ToString());
+ if (order != null)
+ {
+ inboundOrders.Add(order);
+ }
+ }
+ return _inboundOrderService.PrintInbound(inboundOrders); ;
+ }
+ catch (Exception ex)
+ {
+ return content.Error("鏈煡閿欒锛岃鑱旂郴绠＄悊鍛�");
+ }
+ }
+
+ /// <summary>
+ /// 鐗规畩鍑哄簱
+ /// </summary>
+ /// <param name="details"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+
+ public WebResponseContent UpdateDataStockDetail(List<DtStockInfoDetail> details)
+ {
+ try
+ {
+ List<DtStockInfoDetail> dtStockInfoDetails = new List<DtStockInfoDetail>();
+
+ foreach (var item in details)
+ {
+ DtStockInfoDetail dtStockInfoDetail = new DtStockInfoDetail();
+ dtStockInfoDetail = _stockInfoDetailRepository.QueryFirst(it => it.Id == item.Id);
+ dtStockInfoDetails.Add(dtStockInfoDetail);
+ }
+ LogFactory.GetLog("鐗规畩浠诲姟").InfoFormat(true, "鐗规畩浠诲姟鍓�", JsonConvert.SerializeObject(dtStockInfoDetails));
+ if (_stockInfoDetailRepository.UpdateData(details))
+ {
+ //璁板綍鏃ュ織
+ LogFactory.GetLog("鐗规畩浠诲姟").InfoFormat(true, "鐗规畩浠诲姟鍚�", JsonConvert.SerializeObject(details));
+ }
+ }
+ catch(Exception ex)
+ {
+ return WebResponseContent.Instance.Error("鍑哄簱澶辫触");
+ }
+ return WebResponseContent.Instance.OK("鍑哄簱鎴愬姛");
+ }
#endregion
}
\ No newline at end of file
--
Gitblit v1.9.3