From 975ea3c28b1661b3b6eabee5277cc98d853736d3 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <1247017146@qq.com>
Date: 星期二, 03 六月 2025 11:12:40 +0800
Subject: [PATCH] 合并
---
CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 53 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
index 497571a..b8b4805 100644
--- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
+++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs
@@ -1086,11 +1086,11 @@
.ToList().Select(x => x.DeviceCode).ToList();
var result = await _stockInfoRepository.Db.Queryable<DtStockInfo>()
- .Where(x => x.ProductionLine == station.productLine)
+ .WhereIF(!station.Roadway.Contains("JZSC"), x => x.ProductionLine == station.productLine)
.Where(x => x.AreaCode == areaCode && x.IsFull == false)
- .Includes(x=>x.StockInfoDetails)
+ .Includes(x => x.StockInfoDetails)
.Where(x => x.StockInfoDetails.Any(y => y.MaterielCode == "绌烘墭鐩�"))
- .Includes(x=>x.LocationInfo)
+ .Includes(x => x.LocationInfo)
.WhereIF(!deviceCode.IsNullOrEmpty(), x => deviceCode.Contains(x.LocationInfo.RoadwayNo))
.Where(x => x.LocationInfo.LocationStatus == (int)LocationEnum.InStock && x.LocationInfo.AreaId == area.AreaID && x.LocationInfo.EnalbeStatus == (int)EnableEnum.Enable) // 杩囨护鏉′欢
.OrderBy(x => x.CreateDate) // 鎺掑簭
@@ -1115,7 +1115,7 @@
{
return new Dt_Task
{
- Grade = tag == 104 ? (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 1 : 2) : (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") ? 2 : 1),
+ Grade = tag == 104 ? (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC")|| stockInfo.LocationInfo.RoadwayNo.Contains("JZSC") ? 1 : 2) : (stockInfo.LocationInfo.RoadwayNo.Contains("CWSC") || stockInfo.LocationInfo.RoadwayNo.Contains("JZSC") ? 2 : 1),
Roadway = stockInfo.LocationInfo.RoadwayNo,
TargetAddress = position,
Dispatchertime = DateTime.Now,
@@ -1678,7 +1678,6 @@
/// 鑾峰彇浠诲姟淇℃伅
/// </summary>
/// <returns></returns>
- ///
public WebResponseContent GetTaskInfo()
{
WebResponseContent content = new WebResponseContent();
@@ -1740,10 +1739,12 @@
/// 鑾峰彇璐т綅鐘舵��
/// </summary>
/// <returns></returns>
- public WebResponseContent GetStockQuantity() {
+ public WebResponseContent GetStockQuantity()
+ {
WebResponseContent content = new WebResponseContent();
- try {
- var location= _locationRepository.Db.Queryable<DtLocationInfo>().ToList();
+ try
+ {
+ var location = _locationRepository.Db.Queryable<DtLocationInfo>().ToList();
return content.OK(data: location);
@@ -1756,11 +1757,29 @@
public WebResponseContent Getproductionvolume()
{
WebResponseContent content = new WebResponseContent();
- try {
+ try
+ {
var now = DateTime.Now;
var startOfDay = new DateTime(now.Year, now.Month, now.Day);
var endOfDay1 = startOfDay.AddDays(-7);
- var taskHty= _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it=>it.CreateDate> endOfDay1).ToList();
+ var taskHty = _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it => it.CreateDate > endOfDay1).ToList();
+ return content.OK(data: taskHty);
+ }
+ catch (Exception ex)
+ {
+ return content.Error(ex.Message);
+ }
+
+ }
+
+ public WebResponseContent Getoutput()
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var now = DateTime.Now;
+ var firstDayOfYear = new DateTime(now.Year, 1, 1);
+ var taskHty = _task_HtyRepository.Db.Queryable<Dt_Task_Hty>().Where(it => it.CreateDate > firstDayOfYear&&it.TaskType==100).ToList();
return content.OK(data: taskHty);
}
catch (Exception ex)
@@ -1771,15 +1790,15 @@
}
#endregion
- #endregion 澶栭儴鎺ュ彛鏂规硶
+ #endregion 澶栭儴鎺ュ彛鏂规硶
- #region 鍐呴儴璋冪敤鏂规硶
+ #region 鍐呴儴璋冪敤鏂规硶
- /// <summary>
- /// 鍒涘缓涓�涓柊鐨勪换鍔�
- /// </summary>
- /// <param name="model">浠诲姟妯″瀷</param>
- /// <returns>鍒涘缓鐨勪换鍔�</returns>
+ /// <summary>
+ /// 鍒涘缓涓�涓柊鐨勪换鍔�
+ /// </summary>
+ /// <param name="model">浠诲姟妯″瀷</param>
+ /// <returns>鍒涘缓鐨勪换鍔�</returns>
public async Task<Dt_Task> Create(Dt_Task model)
{
return await BaseDal.Create(model);
--
Gitblit v1.9.3