From ddab693f389b648157c8b48c7fcbdefc92561dd2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 05 七月 2024 19:55:22 +0800
Subject: [PATCH] 老PCS替换代码优化，工业大屏优化，PDA功能优化
---
代码管理/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs | 76 +++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 38 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
index 6f72987..ff8c896 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WebApi/Controllers/LargescreenController.cs"
@@ -6,6 +6,8 @@
using System.Linq;
using System.Security.Cryptography;
using System.Xml.Linq;
+using WIDESEA_Comm;
+using WIDESEA_Common;
using WIDESEA_Core.EFDbContext;
using WIDESEA_Entity.DomainModels;
using WIDESEA_WMS.IRepositories;
@@ -96,21 +98,21 @@
var endDate = startDate.AddMonths(1).AddDays(-1);
var today = DateTime.Today;
- var data2 = db.Find(x => x.agv_createtime >= startDate && x.agv_createtime <= endDate);
+ var data2 = db.Find(x => x.agv_finishedtime >= startDate && x.agv_finishedtime <= endDate);
- var data3 = db.Find(x => x.agv_createtime >= today && x.agv_createtime < today.AddDays(1)).ToList();
+ var data3 = db.Find(x => x.agv_finishedtime >= today && x.agv_finishedtime < today.AddDays(1)).ToList();
// 缁熻杩欐湀鐨勫叆搴撴暟閲�
- var monthlyInventory = data2.Where(x => x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var monthlyInventory = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
// 缁熻杩欐湀鐨勫嚭搴撴暟閲�
- var monthlyOutbound = data2.Where(x => x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var monthlyOutbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
// 缁熻浠婃棩鍏ュ簱鏁伴噺
- var dayInventory = data3.Where(x => x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var dayInventory = data3.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
// 缁熻浠婃棩鍑哄簱鏁伴噺
- var dayOutbound = data3.Where(x => x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var dayOutbound = data3.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
var data = new
{
@@ -141,31 +143,31 @@
//浠婃棩寰呮娴嬪叆搴�
- var dayTaskType_Inbound = data2.Where(x => x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var dayTaskType_Inbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
//寰呮娴嬪嚭搴�
- var dayTaskType_Outbound = data2.Where(x => x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var dayTaskType_Outbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString()).Sum(x => x.agv_qty);
//澶栧崗搴撳叆搴�
- var dayTaskType_OutsourceInbound = data2.Where(x => x.agv_tasktype == "TaskType_OutsourceInbound").Sum(x => x.agv_qty);
+ var dayTaskType_OutsourceInbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceInbound.ToString()).Sum(x => x.agv_qty);
//澶栧崗搴撳嚭搴�
- var dayTaskType_OutsourceOutbound = data2.Where(x => x.agv_tasktype == "TaskType_OutsourceOutbound").Sum(x => x.agv_qty);
+ var dayTaskType_OutsourceOutbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceOutbound.ToString()).Sum(x => x.agv_qty);
//寰呮绉诲簱澶栧崗
- var dayTaskType_OutsourceCarry = data2.Where(x => x.agv_tasktype == "TaskType_OutsourceCarry").Sum(x => x.agv_qty);
+ var dayTaskType_OutsourceCarry = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
//绌烘墭鏁伴噺
- var dayTaskType_EmptyPallet = data2.Where(x => x.agv_tasktype == "TaskType_EmptyPallet").Sum(x => x.agv_qty);
+ var dayTaskType_EmptyPallet = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_EmptyPallet.ToString()).Sum(x => x.agv_qty);
//缁熻鏈堝叆搴撴�婚噺
var startDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
var endDate = startDate.AddMonths(1).AddDays(-1);
var data4 = db.Find(x => x.agv_createtime >= startDate && x.agv_createtime <= endDate);
// 缁熻杩欐湀鐨勫叆搴撴暟閲�
- var monthlyInventory = data4.Where(x => x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var monthlyInventory = data4.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
// 缁熻杩欐湀鐨勫嚭搴撴暟閲�
- var monthlyOutbound = data4.Where(x => x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var monthlyOutbound = data4.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
// 缁熻浠婃棩鍏ュ簱鏁伴噺
- var dayInventory = data2.Where(x => x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var dayInventory = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
// 缁熻浠婃棩鍑哄簱鏁伴噺
- var dayOutbound = data2.Where(x => x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var dayOutbound = data2.Where(x => x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
var data3 = db2.Find(_ => true).Where(x => x.stationCode.Contains("A") || x.stationCode.Contains("B") || x.stationCode.Contains("C") || x.stationCode.Contains("D01")).ToList();
@@ -183,7 +185,7 @@
tray_type = g.Key.tray_type
}).ToList();
- var Number_wheels = Number_wheels1.Where(x => x.stationType != "LargeTray" && x.stationType != "SmallTray").ToList();
+ var Number_wheels = Number_wheels1.Where(x => x.stationType != TrayTypeEnum.LargeTray.ToString() && x.stationType != TrayTypeEnum.SmallTray.ToString()).ToList();
#endregion
@@ -244,12 +246,10 @@
[HttpPost("Warehouse_area")]
public object Warehouse_area()
{
-
-
VOLContext volContext = new VOLContext();
Idt_stationinfoRepository db = new dt_stationinfoRepository(volContext);
string[] areas = { "2", "3", "4" };
- var data2 = db.Find(a => areas.Contains(a.area)).ToList();
+ var data2 = db.Find(a => areas.Contains(a.area)).OrderBy(x => x.stationCode).ToList();
var dataList = new List<dynamic>();
foreach (string area in areas)
@@ -261,26 +261,26 @@
Area = x.Key.area,
x.Key.line,
x.Key.stationType,
- combined_heatNumber = string.Join(", ", x.Select(y => y.heatNumber).Distinct())
+ combined_heatNumber = string.Join(", ", x.Select(y => y.heatNumber).Distinct()),
})
- .OrderBy(x => x.Area)
- .ThenBy(x => x.line)
+ .OrderBy(x => x.line)
+ //.ThenBy(x => x.line)
.GroupBy(x => x.line) // 浣跨敤 GroupBy 鎸� Line 瀛楁鍒嗙粍
.Select(group =>
{
- // 鎵惧埌姣忎釜鍒嗙粍涓涓�涓� stationType 涓嶄负绌虹殑鍏冪礌
- var firstWithStationType = group.FirstOrDefault(x => !string.IsNullOrEmpty(x.stationType));
- if (firstWithStationType != null)
- {
- return firstWithStationType;
- }
- else
- {
- // 濡傛灉鍒嗙粍涓兘鏄� stationType 涓虹┖锛屽垯杩斿洖绗竴涓厓绱狅紙姝ゆ椂鍗充负 stationType 涓虹┖鐨勶級
- return group.First();
- }
+ // 鎵惧埌姣忎釜鍒嗙粍涓涓�涓� stationType 涓嶄负绌虹殑鍏冪礌
+ var firstWithStationType = group.FirstOrDefault(x => !string.IsNullOrEmpty(x.stationType));
+ if (firstWithStationType != null)
+ {
+ return firstWithStationType;
+ }
+ else
+ {
+ // 濡傛灉鍒嗙粍涓兘鏄� stationType 涓虹┖锛屽垯杩斿洖绗竴涓厓绱狅紙姝ゆ椂鍗充负 stationType 涓虹┖鐨勶級
+ return group.First();
+ }
})
- .ToList();
+ .ToList();
dataList = dataList.Concat(data).ToList();
}
@@ -302,15 +302,15 @@
var today = DateTime.Today;
var dateRange = Enumerable.Range(0, 5).Select(offset => today.AddDays(-offset)); // 鑾峰彇鏈�杩�15澶╃殑鏃ユ湡鑼冨洿
- var data2 = db.Find(x => x.agv_createtime >= startDate && x.agv_createtime < today.AddDays(1)).ToList();
+ var data2 = db.Find(x => x.agv_finishedtime >= startDate && x.agv_finishedtime < today.AddDays(1)).ToList();
var result = dateRange.Reverse().Select(date =>
{
// 缁熻褰撴棩鍏ュ簱鏁伴噺
- var dayInventory = data2.Where(x => x.agv_createtime >= date && x.agv_createtime < date.AddDays(1) && x.agv_tasktype == "TaskType_Inbound").Sum(x => x.agv_qty);
+ var dayInventory = data2.Where(x => x.agv_finishedtime >= date && x.agv_finishedtime < date.AddDays(1) && x.agv_tasktype == AGVTaskTypeEnum.TaskType_Inbound.ToString()).Sum(x => x.agv_qty);
// 缁熻褰撴棩鍑哄簱鏁伴噺
- var dayOutbound = data2.Where(x => x.agv_createtime >= date && x.agv_createtime < date.AddDays(1) && x.agv_tasktype == "TaskType_Outbound").Sum(x => x.agv_qty);
+ var dayOutbound = data2.Where(x => x.agv_finishedtime >= date && x.agv_finishedtime < date.AddDays(1) && x.agv_tasktype == AGVTaskTypeEnum.TaskType_Outbound.ToString() || x.agv_tasktype == AGVTaskTypeEnum.TaskType_OutsourceCarry.ToString()).Sum(x => x.agv_qty);
return new
{
--
Gitblit v1.9.3