From 6d56bf4daf08c4c7c6d193d98ed0b547dc473451 Mon Sep 17 00:00:00 2001
From: renmingwang <renmingwang@hnkhzn.com>
Date: 星期三, 25 三月 2026 16:59:14 +0800
Subject: [PATCH] 添加历史任务删除，大屏布局修改
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs | 60 ++++++++++++++++++++++++++++++------------------------------
1 files changed, 30 insertions(+), 30 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs"
index b2607b7..9de290f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_HomeService/HomeService.cs"
@@ -26,29 +26,29 @@
/// <returns></returns>
public WebResponseContent GetDt_TaskHty()
{
- var response = new WebResponseContent();
+ WebResponseContent response = new WebResponseContent();
try
{
// 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
- var now = DateTime.Now;
+ DateTime now = DateTime.Now;
// 鑾峰彇浠婃棩鏃ユ湡鑼冨洿
- var todayStart = now.Date;
- var todayEnd = now.Date.AddDays(1);
+ DateTime todayStart = now.Date;
+ DateTime todayEnd = now.Date.AddDays(1);
// 鑾峰彇鏈懆鏃ユ湡鑼冨洿
// 璁＄畻鏈懆涓�鐨勬棩鏈燂細濡傛灉浠婂ぉ鏄懆鏃�(0)锛屽噺鍘�6澶╋紱鍚﹀垯鍑忓幓褰撳墠鏄熸湡鍑犲噺1澶�
- var daysToSubtract = (int)now.DayOfWeek == 0 ? 6 : (int)now.DayOfWeek - 1;
- var weekStart = now.Date.AddDays(-daysToSubtract);
- var weekEnd = weekStart.AddDays(7);
+ int daysToSubtract = (int)now.DayOfWeek == 0 ? 6 : (int)now.DayOfWeek - 1;
+ DateTime weekStart = now.Date.AddDays(-daysToSubtract);
+ DateTime weekEnd = weekStart.AddDays(7);
// 鑾峰彇鏈湀鏃ユ湡鑼冨洿
- var monthStart = new DateTime(now.Year, now.Month, 1);
- var monthEnd = monthStart.AddMonths(1);
+ DateTime monthStart = new DateTime(now.Year, now.Month, 1);
+ DateTime monthEnd = monthStart.AddMonths(1);
// 鑾峰彇鎵�鏈夊簱瀛樻暟鎹紝鐢ㄤ簬鍚庣画缁熻
- var allStockData = Repository.Db.Queryable<Dt_StockInfo>().ToList();
- var allTask_HtyData = Repository.Db.Queryable<Dt_Task_Hty>().ToList();
+ List<Dt_StockInfo> allStockData = Repository.Db.Queryable<Dt_StockInfo>().ToList();
+ List<Dt_Task_Hty> allTask_HtyData = BaseDal.QueryData();
// 璋冭瘯淇℃伅锛氭墦鍗版棩鏈熻寖鍥村拰搴撳瓨鏁版嵁鎬绘暟
var debugInfo = new
{
@@ -62,40 +62,40 @@
};
- var toDt_task_hty_in = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskInStatusEnum.InFinish);//鑾峰彇鍑哄叆搴撳瓨鍘嗗彶浠诲姟璁板綍
- var toDt_task_hty_on = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
+ int toDt_task_hty_in = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskInStatusEnum.InFinish);//鑾峰彇鍑哄叆搴撳瓨鍘嗗彶浠诲姟璁板綍
+ int toDt_task_hty_on = allTask_HtyData.Count(it => it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
// 浠婃棩鍏ュ簱鏁伴噺锛氫粖澶╁垱寤轰笖搴撳瓨鐘舵�佷负鍏ュ簱瀹屾垚鐨勮褰曟暟閲�
- var todayInbound = allTask_HtyData.Count(it =>
+ int todayInbound = allTask_HtyData.Count(it =>
it.CreateDate >= todayStart && it.CreateDate < todayEnd &&
it.TaskStatus == (int)TaskInStatusEnum.InFinish);
// 浠婃棩鍑哄簱鏁伴噺锛氫粖澶╁垱寤轰笖搴撳瓨鐘舵�佷负鍑哄簱瀹屾垚鐨勮褰曟暟閲�
- var todayOutbound = allTask_HtyData.Count(it =>
+ int todayOutbound = allTask_HtyData.Count(it =>
it.CreateDate >= todayStart && it.CreateDate < todayEnd &&
it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
// 鏈懆鍏ュ簱鏁伴噺锛氭湰鍛ㄥ垱寤轰笖搴撳瓨鐘舵�佷负鍏ュ簱瀹屾垚鐨勮褰曟暟閲�
- var weekInbound = allTask_HtyData.Count(it =>
+ int weekInbound = allTask_HtyData.Count(it =>
it.CreateDate >= weekStart && it.CreateDate < weekEnd &&
it.TaskStatus == (int)TaskInStatusEnum.InFinish);
// 鏈懆鍑哄簱鏁伴噺锛氭湰鍛ㄥ垱寤轰笖浠诲姟鐘舵�佷负鍑哄簱瀹屾垚鐨勮褰曟暟閲�
- var weekOutbound = allTask_HtyData.Count(it =>
+ int weekOutbound = allTask_HtyData.Count(it =>
it.CreateDate >= weekStart && it.CreateDate < weekEnd &&
it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
// 鏈湀鍏ュ簱鏁伴噺锛氭湰鏈堝垱寤轰笖搴撳瓨鐘舵�佷负鍏ュ簱瀹屾垚鐨勮褰曟暟閲�
- var monthInbound = allTask_HtyData.Count(it =>
+ int monthInbound = allTask_HtyData.Count(it =>
it.CreateDate >= monthStart && it.CreateDate < monthEnd &&
it.TaskStatus == (int)TaskInStatusEnum.InFinish);
// 鏈湀鍑哄簱鏁伴噺锛氭湰鏈堝垱寤轰笖浠诲姟鐘舵�佷负鍑哄簱瀹屾垚鐨勮褰曟暟閲�
- var monthOutbound = allTask_HtyData.Count(it =>
+ int monthOutbound = allTask_HtyData.Count(it =>
it.CreateDate >= monthStart && it.CreateDate < monthEnd &&
it.TaskStatus == (int)TaskOutStatusEnum.OutFinish);
// 寰呭鐞嗚鍗曟暟閲忥細鐢变簬鍙湁Dt_StockInfo琛紝鏆傛椂杩斿洖0
- var pendingOrders = 0;
+ int pendingOrders = 0;
// 搴撳瓨鐘舵�佸垎甯冿細缁熻涓嶅悓搴撳瓨鐘舵�佺殑鏁伴噺
var stockStatusDistribution = allTask_HtyData
@@ -114,22 +114,22 @@
// 璐т綅鍒╃敤鐜囷細浠庢暟鎹簱鑾峰彇璐т綅淇℃伅
// 鑾峰彇鎵�鏈夎揣浣�
- var allLocations = Repository.Db.Queryable<Dt_LocationInfo>().ToList();
- var totalLocations = allLocations.Count;
+ List<Dt_LocationInfo> allLocations = Repository.Db.Queryable<Dt_LocationInfo>().ToList();
+ int totalLocations = allLocations.Count;
// 缁熻涓嶅悓鐘舵�佺殑璐т綅鏁�
- var freeLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Free);
- var inStockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStock);
- var inStockLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStockLock);
- var lockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Lock);
- var freeLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.FreeLock);
- var palletLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.PalletLock);
+ int freeLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Free);
+ int inStockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStock);
+ int inStockLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.InStockLock);
+ int lockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.Lock);
+ int freeLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.FreeLock);
+ int palletLockLocations = allLocations.Count(it => it.LocationStatus == (int)LocationStatusEnum.PalletLock);
// 璁＄畻宸蹭娇鐢ㄥ拰鏈娇鐢ㄧ殑璐т綅鏁�
// 宸蹭娇鐢細鏈夎揣銆佹湁璐ч攣瀹�
- var usedLocations = inStockLocations + inStockLockLocations;
+ int usedLocations = inStockLocations + inStockLockLocations;
// 鏈娇鐢細绌洪棽銆佺┖闂查攣瀹�
- var unusedLocations = freeLocations + freeLockLocations;
+ int unusedLocations = freeLocations + freeLockLocations;
// 搴撳瓨鍙樺寲瓒嬪娍锛氭ā鎷熸渶杩�7澶╃殑鏁版嵁
// 瀹為檯搴旀牴鎹暟鎹簱涓殑鍘嗗彶璁板綍鐢熸垚
--
Gitblit v1.9.3