From e46aa927d231af83724683c7286d9db503e24cf7 Mon Sep 17 00:00:00 2001 From: z8018 <1282578289@qq.com> Date: 星期二, 10 六月 2025 11:46:20 +0800 Subject: [PATCH] 1 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Task_HtyService.cs | 113 +------------------------------------------------------- 1 files changed, 2 insertions(+), 111 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Task_HtyService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Task_HtyService.cs" index 94e6699..665b926 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Task_HtyService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Task_HtyService.cs" @@ -16,30 +16,7 @@ #endregion << 鐗� 鏈� 娉� 閲� >> using AutoMapper; -using Microsoft.AspNetCore.Mvc; -using Microsoft.AspNetCore.Mvc.RazorPages; -using NetTaste; -using Newtonsoft.Json; -using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime; -using OfficeOpenXml.FormulaParsing.Excel.Functions.Text; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Linq; -using System.Linq.Expressions; -using System.Reflection; -using System.Reflection.Metadata; -using System.Text; -using System.Threading.Tasks; -using WIDESEA_Comm.Http; -using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseServices; -using WIDESEAWCS_Core.Enums; -using WIDESEAWCS_DTO.Enum; -using WIDESEAWCS_DTO.TaskInfo; using WIDESEAWCS_ITaskInfoRepository; using WIDESEAWCS_ITaskInfoService; using WIDESEAWCS_Model.Models; @@ -47,7 +24,7 @@ namespace WIDESEAWCS_TaskInfoService { - public class Task_HtyService : ServiceBase<Dt_Task_hty, ITask_HtyRepository>, ITask_HtyService + public class Task_HtyService : ServiceBase<Dt_Task_Hty, ITask_HtyRepository>, ITask_HtyService { private readonly IRouterService _routerService; private readonly ITaskExecuteDetailService _taskExecuteDetailService; @@ -60,92 +37,6 @@ _taskExecuteDetailRepository = taskExecuteDetailRepository; _mapper = mapper; } - public WebResponseContent AddTaskHty(Dt_Task task) - { - WebResponseContent content = new WebResponseContent(); - Dt_Task_hty task_Hty = new Dt_Task_hty() - { - TaskNum = task.TaskNum, - PalletCode = task.PalletCode, - Roadway = task.Roadway, - TaskType = task.TaskType, - TaskState = task.TaskState, - SourceAddress = task.SourceAddress, - TargetAddress = task.TargetAddress, - CurrentAddress = task.CurrentAddress, - NextAddress = task.NextAddress, - ExceptionMessage = task.ExceptionMessage, - Grade = task.Grade, - WMSId = task.WMSId, - Creater = task.Creater, - TaskId = task.TaskId, - CreateDate = task.CreateDate, - Dispatchertime = task.Dispatchertime, - Remark = task.Remark, - Modifier = task.Modifier, - ModifyDate = DateTime.Now, - PalletCodequantity = task.PalletCodequantity, - }; - BaseDal.AddData(task_Hty); - return content; - } - - public static List<string> MaterialCuttingOutletList = new List<string>() { "B102", "B202" , "B402" , "A203" , "A403", "A603", "A803"}; - public static List<string> EdgeBandingCuttingOutletList = new List<string>() { "F20", "F21"}; - public static List<string> EdgeSandingCuttingOutletList = new List<string>() { "C13", "F14" }; - public static List<string> DrillingCuttingPositionList = new List<string>() { "Z13", "Z14" }; - - #region 绗洓鏉垮潡 - /// <summary> - /// 5鏃ュ唴鐨勫嚭鍏ュ簱 - /// </summary> - /// <returns></returns> - public WebResponseContent fifteenTotal_quantityndex() - { - WebResponseContent content = new WebResponseContent(); - var startDate = DateTime.Today.AddDays(-5); - var today = DateTime.Today; - var dateRange = Enumerable.Range(0, 5).Select(offset => today.AddDays(-offset)); - - var data2 = BaseDal.QueryData(x => x.CreateDate >= startDate && x.CreateDate < today.AddDays(1)).ToList(); - - var result = dateRange.Reverse().Select(date => - { - // 缁熻鏉挎潗涓嬫枡鍙� - //var MaterialCuttingOutlet = data2.Where(x => x.CreateDate >= date && x.CreateDate < date.AddDays(1) && MaterialCuttingOutletList.Contains(x.SourceAddress)).Count(); - var MaterialCuttingOutlet = 50; - - // 缁熻灏佽竟涓嬫枡鍙� - //var EdgeBandingCuttingOutlet = data2.Where(x => x.CreateDate >= date && x.CreateDate < date.AddDays(1) && EdgeBandingCuttingOutletList.Contains(x.SourceAddress)).Count(); - var EdgeBandingCuttingOutlet = 40; - - // 缁熻鐮傝竟涓嬫枡鍙� - //var EdgeSandingCuttingOutlet = data2.Where(x => x.CreateDate >= date && x.CreateDate < date.AddDays(1) && EdgeSandingCuttingOutletList.Contains(x.SourceAddress)).Count(); - var EdgeSandingCuttingOutlet = 80; - - // 缁熻閽诲瓟涓嬫枡浣� - //var DrillingCuttingPosition = data2.Where(x => x.CreateDate >= date && x.CreateDate < date.AddDays(1) && DrillingCuttingPositionList.Contains(x.SourceAddress)).Count(); - var DrillingCuttingPosition = 30; - - return new - { - Date = date.ToString("MM-dd"), - MaterialCuttingOutlets = MaterialCuttingOutlet, - EdgeBandingCuttingOutlets = EdgeBandingCuttingOutlet, - EdgeSandingCuttingOutlets = EdgeSandingCuttingOutlet, - DrillingCuttingPositions = DrillingCuttingPosition, - }; - }); - - var datat = new - { - Daily_statistics = result.ToList(), - }; - return content.OK(data: datat); - } - #endregion - - - + } } -- Gitblit v1.9.3