From 0cbe01e1241f9af562d86dc79b5f0949ada81dba Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期三, 22 十月 2025 09:20:08 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 727 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 583 insertions(+), 144 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 1a41b9e..c388408 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -17,9 +17,12 @@
using Autofac.Core;
using AutoMapper;
+using HslCommunication;
using Magicodes.ExporterAndImporter.Core;
+using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Routing;
using NetTaste;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
@@ -28,6 +31,7 @@
using SqlSugar;
using StackExchange.Profiling.Internal;
using System;
+using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
@@ -37,6 +41,8 @@
using System.Net.NetworkInformation;
using System.Reflection;
using System.Reflection.Metadata;
+using System.Reflection.PortableExecutable;
+using System.Runtime.InteropServices;
using System.Security.Policy;
using System.Text;
using System.Threading.Tasks;
@@ -60,6 +66,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using static Microsoft.IO.RecyclableMemoryStreamManager;
+using static System.Net.Mime.MediaTypeNames;
namespace WIDESEAWCS_TaskInfoService
{
@@ -72,6 +79,7 @@
private readonly ITask_HtyService _task_HtyService;
private readonly IMapper _mapper;
private readonly IEquipmentStatusService _equipmentStatus;
+ private readonly IAgvStationService _gvStationService;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -86,7 +94,7 @@
public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();
- public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus) : base(BaseDal)
+ public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus, IAgvStationService agvStationService) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -95,6 +103,7 @@
_mapper = mapper;
_routerRepository = routerRepository;
_equipmentStatus = equipmentStatus;
+ _gvStationService = agvStationService;
}
/// <summary>
@@ -117,8 +126,6 @@
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
public ExpoReverse TaskInstruction(ExpoTaskDTO expoTask)
{
-
-
ExpoReverse content = new ExpoReverse();
try
{
@@ -134,8 +141,6 @@
WriteLog.Write_Log("浠诲姟鎺ユ敹", "浠诲姟閲嶅", "寮傚父浠诲姟", $"浠诲姟鍙凤細{dt_Tasks.TaskNum}閲嶅,鍏板墤绯荤粺涓嬪彂閲嶅浠诲姟锛侊紒锛�");
return content;
}
-
-
if (item.type == 1) //鍏ュ簱
{
Dt_Task dt_Task = new Dt_Task();
@@ -149,35 +154,35 @@
dt_Task.SourceAddress = item.startAddress;
dt_Task.TargetAddress = item.endAddress;
dt_Task.CurrentAddress = item.startAddress;
- dt_Task.NextAddress = "0"; //鐩墠鏆傛棤
+ dt_Task.NextAddress = "1021"; //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
BaseDal.AddData(dt_Task);
content.code = 0;
+
+ int taskidt = BaseDal.QueryFirst(x => x.TaskNum == dt_Task.TaskNum).TaskId;
+ _taskExecuteDetailService.AddTaskExecuteDetail(taskidt, $"绯荤粺鑷姩娴佺▼锛屽垱寤轰换鍔�");
}
else if (item.type == 2) //鍑哄簱
{
string roadway = "";
- string CurrentAddress = "";
switch (item.startAddress)
{
case "1":
roadway = "RGV110";
- CurrentAddress = "1101";
break;
case "2":
roadway = "RGV112";
- CurrentAddress = "1121";
break;
case "3":
roadway = "RGV114";
- CurrentAddress = "1141";
break;
case "4":
roadway = "RGV115";
- CurrentAddress = "1151";
break;
}
+
+ AGVStation gVStation = _gvStationService.Corridorequipment(roadway);
Dt_Task dt_Task = new Dt_Task();
dt_Task.TaskNum = item.taskNo;
@@ -186,15 +191,17 @@
dt_Task.TaskType = (int)TaskOutboundTypeEnum.Outbound;
dt_Task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly; //鍙栬揣
dt_Task.RGVCurrentexecution = "0"; //鐩墠鏆傛棤
- dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew; //鐩墠鏆傛棤
+ dt_Task.TaskState = (int)TaskOutStatusEnum.OutNewLj; //鐩墠鏆傛棤
dt_Task.SourceAddress = item.startAddress;
- dt_Task.TargetAddress = "";
- dt_Task.CurrentAddress = CurrentAddress;
- dt_Task.NextAddress = "0"; //鐩墠鏆傛棤
+ dt_Task.TargetAddress = "0";
+ dt_Task.CurrentAddress = gVStation.Motherinlaw.ToString();
+ dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString(); //鐩墠鏆傛棤
dt_Task.Grade = item.priority;
dt_Task.WMSId = 0; //鐩墠鏆傛棤
BaseDal.AddData(dt_Task);
content.code = 0;
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskId, $"绯荤粺鑷姩娴佺▼锛屽垱寤轰换鍔�");
}
else
{
@@ -219,9 +226,215 @@
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
- public Dt_Task QueryStackerCraneTask(string DeviceCode)
+ public Dt_Task QueryStackerCraneTask(AGVStation GdMuChe, AGVStation GdZiche)
{
- return BaseDal.QueryFirst(x => x.Roadway == DeviceCode, TaskOrderBy);
+ if (GdZiche.Station_Area == 3) //3宸烽亾姣嶈溅
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.Roadway == GdMuChe.ChildPosiDeviceCode && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && x.TaskState == (int)TaskOutStatusEnum.OutNew, TaskOrderBy); //鑾峰彇鍒板搴旀瘝杞︾殑浠诲姟
+ if (dt_Task != null)
+ {
+ Dt_Task dt_Task4 = BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.NextAddress == GdZiche.MotherCarDeviceCode.ToString() && x.Grade < dt_Task.Grade, TaskOrderBy);
+
+ Dt_Task dt_Taskhcj = BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp && x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish && x.CurrentAddress == GdZiche.HCJStorageaddress.ToString() && x.Grade < dt_Task.Grade, TaskOrderBy);
+ if (dt_Task4 == null && dt_Taskhcj == null) //鍦ㄤ袱涓珯鍙扮殑浠诲姟浼樺厛绾ч兘姝ｅ父锛屽垯姝ｅ父绉诲姩
+ {
+ return dt_Task;
+ }
+
+ }
+ //鑾峰彇HCJ绔欏彴浠诲姟涓�4宸蜂换鍔�
+
+ return null;
+ }
+ return null;
+ }
+
+ public Dt_Task ObtainHCJtask(string curraderr)
+ {
+ return BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp && (x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting) && x.CurrentAddress == curraderr, TaskOrderBy);
+ }
+ public Dt_Task ObtainMuChetask(string Nextaderr)
+ {
+ return BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && x.TaskState == (int)TaskOutStatusEnum.OutNew && x.NextAddress == Nextaderr, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅鏄惁鏈変换鍔★紝杩涜鍒ゆ柇
+ /// </summary>
+ public Dt_Task ObtainMuChetaskbool(AGVStation ZicheinnerSide)
+ {
+ return BaseDal.QueryFirst(x => x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly && (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskType == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting), TaskOrderBy);
+ }
+
+ public Dt_Task GetChariotTaskBool(string ChildPosiDeviceCode)
+ {
+ Dt_Task dt_Task2 = BaseDal.QueryFirst(x => x.Roadway == ChildPosiDeviceCode, TaskOrderBy);
+ if (dt_Task2 != null) return dt_Task2;
+ return null;
+ }
+
+ /// <summary>
+ /// 鑾峰彇HCJ绔欏彴鏄惁鏈変换鍔�
+ /// </summary>
+ public Dt_Task GetHCJTaskBool(string ChildPosiDeviceCode,int HCJaddres)
+ {
+ Dt_Task dt_Task2 = BaseDal.QueryFirst(x => x.Roadway == ChildPosiDeviceCode && x.CurrentAddress== HCJaddres.ToString(), TaskOrderBy);
+ if (dt_Task2 != null) return dt_Task2;
+ return null;
+ }
+
+ public Dt_Task ChildVehicleMission(AGVStation aGVStation)
+ {
+ Dt_Task dt_Tasks2 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.MotherCardeputy.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if (dt_Tasks2 != null) return dt_Tasks2;
+
+ Dt_Task dt_Tasks = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.MotherCarDeviceCode.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if (dt_Tasks != null) return dt_Tasks;
+
+ Dt_Task dt_Tasks3 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.HCJStorageaddress.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ if (dt_Tasks3 != null) return dt_Tasks3;
+ return null;
+ }
+
+
+ public Dt_Task GetFinhuoTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+
+ public Dt_Task GetOutkouFinhuoTask(string DeviceCode, string curraderr)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing && x.NextAddress != "", TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍑哄簱鍙ｅ瓙杞﹀彇璐�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ /// <param name="curraderr"></param>
+ /// <returns></returns>
+ public Dt_Task GetOutchachekouFinhuoTask(string DeviceCode, string curraderr)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp && x.CurrentAddress == curraderr, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鍏ュ簱鍙栬揣浠诲姟
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ /// <param name="type">1锛氭煡鎵鹃渶瑕佸彇璐х殑浠诲姟</param>
+ public Dt_Task PickupWarehouse(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InNew && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+
+
+ /// <summary>
+ /// 浠诲姟鏌ユ壘
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ /// <param name="type">1锛氭煡鎵鹃渶瑕佸彇璐х殑浠诲姟 2锛氭煡鎵鹃渶瑕佹斁璐х殑浠诲姟</param>
+ public Dt_Task GetInkouFinhuoTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.NextAddress != "" && x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 姣嶈溅绉诲姩浠诲姟
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task MothermachinemovementTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔★紙鍏ュ簱锛�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ /// <returns></returns>
+ public Dt_Task MothermachinemovementTask2(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarExecuting || x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly), TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇姣嶈溅绉诲姩浠诲姟鍜岀Щ鍔ㄤ腑鐨勪换鍔★紙鍑哄簱锛�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task OutMothermaTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskOutStatusEnum.OutNew || x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarExecuting || x.RGVTaskType == (int)TaskOutStatusEnum.RGV_OutMothercarFinish), TaskOrderBy);
+ }
+
+
+ /// <summary>
+ /// 瀛愯溅杩涜鏀捐揣浠诲姟
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task ViceChariotPlacingTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 瀛愯溅鍙栬揣浠诲姟锛屽彇璐CJ浠诲姟
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task ViceChariotPickupTask(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+
+ /// <summary>
+ /// 鑾峰彇瀛愯溅鍙栬揣浠诲姟锛岃繘鍏ユ瘝杞﹀彇璐�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task OutPickupZiche(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskOutStatusEnum.RGV_OutMothercarFinish || x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheExecuting) && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+
+
+
+ /// <summary>
+ /// 鍒ゆ柇鏄惁鏈夊瓙杞﹀彇HCJ浠诲姟锛屾垨鑰呭湪鎵ц鐨勪换鍔�
+ /// </summary>
+ /// <param name="DeviceCode"></param>
+ public Dt_Task ViceChariotPickupTask2(string DeviceCode)
+ {
+ return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && (x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting || x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish) && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
+ }
+
+
+
+
+
+ public WebResponseContent UpdateDeliveryAddress(string NextAddress, int tasktype)
+ {
+ WebResponseContent webResponse = new WebResponseContent();
+ try
+ {
+ Dt_Task dt_Task = null;
+ if (tasktype == 1)
+ {
+ dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.NextAddress == "999");
+
+ }
+ else
+ {
+ dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.NextAddress == "999");
+ }
+ if (dt_Task == null) return webResponse.Error("鏈壘鍒伴渶瑕佷慨鏀圭殑浠诲姟锛屾棤闇�淇敼");
+ dt_Task.NextAddress = NextAddress;
+ BaseDal.UpdateData(dt_Task);
+ return webResponse.OK("浠诲姟鏀捐揣鍦板潃淇敼鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ return webResponse.Error($"浠诲姟鏀捐揣鍦板潃淇敼澶辫触锛佸師鍥狅細{ex.Message}");
+ throw;
+ }
}
public WebResponseContent UpdateRGVTasktype(int taskNum, int RGVTasktype)
@@ -250,8 +463,6 @@
}
task.RGVTaskType = RGvtype;
bool updatesta = BaseDal.UpdateData(task);
- string Meesgt = $"鐩爣鍦板潃锛歿task.CurrentAddress},浠诲姟绫诲瀷锛歿rwlx}锛屼慨鏀圭姸鎬侊細{updatesta}";
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, Meesgt);
content = WebResponseContent.Instance.OK();
}
@@ -288,7 +499,7 @@
task.ExceptionMessage = message;
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "鏇存柊浠诲姟寮傚父锛�" + task.ExceptionMessage);
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
@@ -346,7 +557,14 @@
task.Modifier = "System";
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -396,7 +614,9 @@
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔＄姸鎬併�恵task.TaskState}銆�");
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐鎭㈠鎸傝捣浠诲姟,鎭㈠鎸傝捣鏃朵换鍔＄姸鎬併�恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -421,7 +641,20 @@
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
int oldState = task.TaskState;
- Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ Dt_TaskExecuteDetail taskExecuteDetail = null;
+
+ if (task.CurrentAddress == "1061")
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+ }
+ else
+ {
+ taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
+
+ }
+
+
+
if (taskExecuteDetail != null)
{
task.TaskState = taskExecuteDetail.TaskState;
@@ -437,7 +670,13 @@
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"浜哄伐灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戝洖婊氬埌銆恵task.TaskState}銆�");
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戝洖褰掑埌銆恵afterstaterem}銆�");
content = WebResponseContent.Instance.OK();
}
@@ -521,9 +760,13 @@
try
{
- if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ if (task.TaskType == (int)TaskInboundTypeEnum.Inbound) //姝ｅ父娴佺▼
{
HandleInboundTask(task);
+ }
+ else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && (task.NextAddress == "1001" || task.NextAddress == "1002"))
+ {
+ task.TaskState = (int)TaskInStatusEnum.RGV_InMothercarFinish;
}
else if (task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
@@ -537,10 +780,28 @@
task.ExceptionMessage = string.Empty;
BaseDal.UpdateData(task);
- _taskExecuteDetailService.AddTaskExecuteDetail(
- task.TaskId,
- $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵task.TaskState}銆�"
- );
+ string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //鍓嶄竴涓姸鎬�
+ string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //鍚庝竴涓姸鎬�
+
+ string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //鍚庝竴涓姸鎬�
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
+ $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣烦杞埌銆恵afterstaterem}銆�"
+ : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldstaterem}銆戣浆鍒般�恵afterstaterem}銆�");
+
+
+ if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish) //鍏ュ簱浠诲姟瀹屾垚
+ {
+ //AutomaticTaskCompleted(task); //浠诲姟瀹屾垚
+ if (task.NextAddress == "1001" || task.NextAddress == "1002")
+ {
+ //寮傚父鎺掗櫎浠诲姟鏃讹紝寮傚父涓婃姤
+ }
+ else
+ {
+ //姝ｅ父浠诲姟锛屾甯镐笂鎶�
+ }
+
+ }
return WebResponseContent.Instance.OK();
}
@@ -562,7 +823,7 @@
break;
case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
- HandleInboundRelease(task);
+ HandleInboundRelease(task); //鍏ュ簱RGV鏀捐揣瀹屾垚鍚庯紝淇敼浠诲姟鐘舵�佸埌瀛愯溅鍙栬揣浠诲姟
break;
case (int)TaskInStatusEnum.RGV_InZicheExecuting:
@@ -571,14 +832,8 @@
break;
case (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting:
- task.TaskState = (int)TaskInStatusEnum.RGV_InZicheReleaseFinish;
- task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
- break;
-
- case (int)TaskInStatusEnum.RGV_InZichemoveExecuting:
HandleInboundZichemove(task);
break;
-
case (int)TaskInStatusEnum.RGV_InMothercarExecuting:
task.TaskState = (int)TaskInStatusEnum.RGV_InMothercarFinish;
break;
@@ -588,46 +843,72 @@
}
}
+ /// <summary>
+ /// 鍏ュ簱RGV鏀捐揣瀹屾垚鍚�
+ /// </summary>
+ /// <param name="task"></param>
private void HandleInboundRelease(Dt_Task task)
{
task.TaskState = (int)TaskInStatusEnum.RGV_InReleaseFinish;
task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
- var routes = _routerRepository.QueryData(x =>
+ Dt_Router routes = _routerRepository.QueryFirst(x =>
x.StartPosi == task.NextAddress &&
x.InOutType == 1 &&
- x.IsEnd == false
- );
-
- foreach (var route in routes)
+ x.IsEnd == false && x.ChildPosi == task.TargetAddress
+ );
+ if (task.TargetAddress != "1" && task.TargetAddress != "2")
{
- if (route.ChildPosi == task.TargetAddress ||
- (int.Parse(route.ChildPosi) > 2 && int.Parse(task.TargetAddress) > 2))
- {
- task.Roadway = route.ChildPosiDeviceCode;
- task.CurrentAddress = route.StartPosi;
- task.NextAddress = route.NextPosi;
- break; // 鎵惧埌鍖归厤璺敱鍚庨��鍑哄惊鐜�
- }
+
+ routes = _routerRepository.QueryFirst(x =>
+ x.StartPosi == task.NextAddress &&
+ x.InOutType == 1 &&
+ x.IsEnd == false && x.ChildPosi == "1061"
+ );
}
+ task.Roadway = routes.ChildPosiDeviceCode;
+ task.CurrentAddress = routes.StartPosi;
+ task.NextAddress = routes.NextPosi;
}
private void HandleInboundZichemove(Dt_Task task)
{
- var route = _routerRepository.QueryFirst(x =>
- x.IsEnd == true &&
- x.ChildPosi == task.NextAddress &&
- x.InOutType == 1
- );
+ if (task.TargetAddress == "1" || task.TargetAddress == "2")
+ {
+ task.TaskState = (int)TaskInStatusEnum.RGV_InZicheReleaseFinish;
+ task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
- if (route == null)
- throw new InvalidOperationException("鏈壘鍒板搴旂殑缁撴潫璺敱");
+ Dt_Router dt_InRouter = _routerRepository.QueryFirst(x => x.IsEnd == true && x.StartPosi == task.NextAddress && x.InOutType == 1);
+ task.CurrentAddress = dt_InRouter.StartPosi;
+ task.NextAddress = dt_InRouter.NextPosi;
+ task.Roadway = dt_InRouter.ChildPosiDeviceCode;
- task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
- task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
- task.CurrentAddress = route.StartPosi;
- task.NextAddress = route.NextPosi;
- task.Roadway = route.ChildPosiDeviceCode;
+ }
+ else
+ {
+ //瀛愯溅瀹屾垚
+ Dt_Router dt_Routernei = _routerRepository.QueryFirst(x => x.StartPosi == task.NextAddress && x.InOutType == 1 && x.ChildPosi == task.TargetAddress && x.IsEnd == false);
+ if (dt_Routernei != null)
+ {
+ task.TaskState = (int)TaskInStatusEnum.RGV_InReleaseFinish;
+ task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
+
+ task.CurrentAddress = dt_Routernei.StartPosi;
+ task.NextAddress = dt_Routernei.NextPosi;
+ task.Roadway = dt_Routernei.ChildPosiDeviceCode;
+ }
+ else
+ {
+ Dt_Router dt_Routernei2 = _routerRepository.QueryFirst(x => x.StartPosi == task.NextAddress && x.InOutType == 1 && x.ChildPosi == task.TargetAddress && x.IsEnd==true);
+
+ task.TaskState = (int)TaskInStatusEnum.RGV_InZicheReleaseFinish;
+ task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
+
+ task.CurrentAddress = dt_Routernei2.StartPosi;
+ task.NextAddress = dt_Routernei2.NextPosi;
+ task.Roadway = dt_Routernei2.ChildPosiDeviceCode;
+ }
+ }
}
#endregion
@@ -638,6 +919,10 @@
switch (task.TaskState)
{
case (int)TaskOutStatusEnum.RGV_OutMothercarExecuting:
+ Dt_Router dt_Router = _routerRepository.QueryFirst(x => x.StartPosi == task.NextAddress && x.InOutType == 2);
+ task.CurrentAddress = dt_Router.StartPosi;
+ task.NextAddress = dt_Router.NextPosi;
+ task.Roadway = dt_Router.ChildPosiDeviceCode;
task.TaskState = (int)TaskOutStatusEnum.RGV_OutMothercarFinish;
task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
break;
@@ -680,6 +965,8 @@
task.TaskState = (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish;
task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
task.Roadway = "RGV118";
+ task.CurrentAddress = "1171";
+ task.NextAddress = "";
}
else
{
@@ -695,7 +982,7 @@
task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
task.CurrentAddress = nextRoute.StartPosi;
task.NextAddress = nextRoute.NextPosi;
- task.Roadway = route.ChildPosiDeviceCode;
+ task.Roadway = nextRoute.ChildPosiDeviceCode;
}
}
#endregion
@@ -704,7 +991,7 @@
#region 鍏板墤璋冨彇鎺ュ彛鍐呭
/// <summary>
- /// 鏌ヨRGV鐘舵��
+ /// 鏌ヨRGV鐘舵�侊紙瀹屾垚锛屽緟娴嬭瘯锛�
/// </summary>
/// <param name="statusquery"></param>
/// <returns></returns>
@@ -728,60 +1015,72 @@
rGVstatus.msg = "鏄庡拰WCS鎺ユ敹鍒癛GV缂栧彿涓虹┖锛岃妫�鏌�";
return rGVstatus;
}
-
IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == item.rgvTag);
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- DeviceProDTO? deviceProDTO = conveyorLine.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RGVCurrentlocation" && x.DeviceProParamType == "ReadDeviceCommand");
+ if (device == null)
+ {
+ rGVstatus.code = 1;
+ rGVstatus.msg = "鏌ヨ鐨凴GV宸叉柇绾�";
+ return rGVstatus;
+ }
+ SpeStackerCrane Commonstacker = (SpeStackerCrane)device;
+
+ //褰撳墠浣嶇疆
+ DeviceProDTO? deviceProDTO = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RGVCurrentlocation" && x.DeviceProParamType == "RGVCurrentlocation");
+
if (item.type == "pick") //鍙栬揣
{
//鑾峰彇璁惧
//鑾峰彇鍙栬揣绔欏彴璐т綅绔欏彴
- Dt_Router dt_Router = _routerRepository.QueryFirst(x => x.InOutType == 1 && x.ChildPosiDeviceCode == item.rgvTag && x.IsEnd == true);
+ AGVStation aGVStation = _gvStationService.Corridorequipment(item.rgvTag);
+ if (aGVStation == null)
+ {
+ rGVstatus.code = 1;
+ rGVstatus.msg = "鏈煡鎵惧埌璇GV";
+ return rGVstatus;
+ }
-
- int Currentlocation = conveyorLine.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
- if (Currentlocation == int.Parse(dt_Router.NextPosi)) //涓烘棤璐�
+ int Currentlocation = Commonstacker.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
+ if (Currentlocation == aGVStation.Motherinlaw) //鏄惁鍦ㄥ彇璐т綅
{
rGVstatus.code = 0;
rGVstatus.data = new List<RgvOperation>
- {
- new RgvOperation { rgvTag = item.rgvTag, type = "pick", status = 1 },
- };
+ {
+ new RgvOperation { rgvTag = item.rgvTag, type = "pick", status = 1 },
+ };
}
else
{
rGVstatus.code = 0;
rGVstatus.data = new List<RgvOperation>
- {
- new RgvOperation { rgvTag = item.rgvTag, type = "pick", status = 0 },
- };
+ {
+ new RgvOperation { rgvTag = item.rgvTag, type = "pick", status = 0 },
+ };
}
}
else if (item.type == "put") //鏀捐揣
{
+ AGVStation aGVStation = _gvStationService.Corridorequipment(item.rgvTag);
+ int Currentlocation = Commonstacker.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
- int Currentlocation = conveyorLine.Communicator.Read<short>(deviceProDTO.DeviceProAddress);
- switch (Currentlocation)
+ DeviceProDTO? deviceProFh = Commonstacker.DeviceProDTOs.FirstOrDefault(x => x.DeviceChildCode == item.rgvTag && x.DeviceProParamName == "RgvEquipmentStatus" && x.DeviceProParamType == "RgvEquipmentStatus");
+ int Itstock = Commonstacker.Communicator.Read<short>(deviceProFh.DeviceProAddress);
+
+ if (aGVStation.Motherinlaw== Currentlocation && Itstock==0)
{
- case 1101:
- case 1121:
- case 1141:
- case 1151:
- rGVstatus.code = 0;
- rGVstatus.data = new List<RgvOperation>
+ rGVstatus.code = 0;
+ rGVstatus.data = new List<RgvOperation>
{
new RgvOperation { rgvTag = item.rgvTag, type = "put", status = 2 },
};
- break;
- default:
- rGVstatus.code = 0;
- rGVstatus.data = new List<RgvOperation>
+ }
+ else
+ {
+ rGVstatus.code = 0;
+ rGVstatus.data = new List<RgvOperation>
{
new RgvOperation { rgvTag = item.rgvTag, type = "put", status = 0 },
};
- break;
}
-
}
else
{
@@ -801,6 +1100,7 @@
}
}
+
/// <summary>
@@ -824,24 +1124,61 @@
if (item.rgvTag == null)
{
+
expoReverse.code = 1;
expoReverse.msg = "鏄庡拰WCS鎺ユ敹鍒癛GV缂栧彿涓虹┖锛岃妫�鏌�";
return expoReverse;
}
+ //鏌ユ壘RGV瀹屾垚鐨勪换鍔�
if (item.type == "pick") //鍙栬揣
{
- expoReverse.code = 0;
+ if (item.status == 1) //鍫嗗灈鏈鸿繘琛屽彇璐т腑
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish && x.Roadway == item.rgvTag);
+ if (dt_Task == null)
+ {
+ expoReverse.code = 1;
+ expoReverse.msg = "鏄庡拰WCS鏈壘鍒伴渶瑕佸彇璐х殑浠诲姟";
+ return expoReverse;
+ }
+ dt_Task.TaskState = (int)TaskInStatusEnum.SC_InExecuting;
+ BaseDal.UpdateData(dt_Task);
+ expoReverse.code = 0;
+ }
+ else if (item.status == 2)
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState == (int)TaskInStatusEnum.SC_InExecuting && x.Roadway == item.rgvTag);
+ if (dt_Task == null)
+ {
+ expoReverse.code = 1;
+ expoReverse.msg = "鏄庡拰WCS鏈壘鍒伴渶瑕佸彇璐х殑浠诲姟";
+ return expoReverse;
+ }
+ dt_Task.TaskState = (int)TaskInStatusEnum.InFinish;
+ AutomaticTaskCompleted(dt_Task); //鏈夐棶棰�,绛夊緟浼樺寲
+ BaseDal.DeleteData(dt_Task);
+ expoReverse.code = 0;
+ }
+
}
else if (item.type == "put") //鏀捐揣
{
+ if (item.status == 2) //鍫嗗灈鏈烘墽琛屼腑
+ {
+ Dt_Task dt_Task = BaseDal.QueryFirst(x => x.TaskType == (int)TaskOutboundTypeEnum.Outbound && x.TaskState == (int)TaskOutStatusEnum.OutNewLj && x.Roadway == item.rgvTag);
+ if (dt_Task != null)
+ {
+ dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ BaseDal.UpdateData(dt_Task);
+ }
+ }
expoReverse.code = 0;
}
else
{
expoReverse.code = 1;
expoReverse.msg = $"鏄庡拰WCS鎺ユ敹鐨勫弬鏁扮被鍨嬮敊璇紝瀹為檯鎺ユ敹鍊间负锛歿item.type}";
-
}
}
@@ -905,7 +1242,7 @@
}
/// <summary>
- /// 浠诲姟鍙栨秷鎺ュ彛
+ /// 浠诲姟鍙栨秷鎺ュ彛(寰呮祴璇�)
/// </summary>
/// <param name="sCErrorStatus"></param>
/// <returns></returns>
@@ -997,7 +1334,7 @@
/// <summary>
- /// 浠诲姟淇℃伅鐘舵�佷笂浼�(鍥哄畾鍏ュ簱鎺ュ彛)
+ /// 浠诲姟淇℃伅鐘舵�佷笂浼�(鍥哄畾鍏ュ簱鎺ュ彛)鍙繘琛屾祴璇� 1.褰撴墽琛岃浠诲姟鐨勬椂鍊欙紝涓婃姤鍏板墤浠诲姟鎵ц涓�
/// </summary>
/// <param name="sCErrorStatus"></param>
/// <returns></returns>
@@ -1019,14 +1356,15 @@
}
/// <summary>
- /// 浠诲姟淇℃伅鐘舵�佷笂浼�(鍥哄畾鍑哄簱鎺ュ彛)
+ /// 浠诲姟淇℃伅鐘舵�佷笂浼�(鍥哄畾鍑哄簱鎺ュ彛)鍙繘琛屾祴璇�
/// </summary>
/// <param name="sCErrorStatus"></param>
/// <returns></returns>
public WebResponseContent TaskResultOut(string taskNo, string finalAddress, int status, string remark)
{
WebResponseContent responseContent = new WebResponseContent();
- TaskfeedbackResponse reception = new TaskfeedbackResponse { data = new List<TaskfeedbackData> { new TaskfeedbackData { taskNo = taskNo, type = 1, finalAddress = finalAddress, status = status, remark = remark } } };
+
+ TaskfeedbackResponse reception = new TaskfeedbackResponse { data = new List<TaskfeedbackData> { new TaskfeedbackData { taskNo = taskNo, type = 2, finalAddress = finalAddress, status = status, remark = remark } } };
StkRunStatusReturns LJReturns = HttpHelper.Post<StkRunStatusReturns>(urlLanJianWCSAPI + LanJiantaskResult, reception, "浠诲姟鍙嶉鎺ュ彛");
if (LJReturns.code == 0)
{
@@ -1040,26 +1378,16 @@
return responseContent;
}
-
/// <summary>
- /// 浜哄伐鎵嬪姩瀹屾垚
+ /// 鑷姩瀹屾垚浠诲姟
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
/// <exception cref="NotImplementedException"></exception>
- public WebResponseContent CompletedManually(int id)
+ public WebResponseContent AutomaticTaskCompleted(Dt_Task dt_task)
{
-
- var db = BaseDal.Db as SqlSugarClient;
-
try
{
- db.Ado.BeginTran();
-
-
- Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
- if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
-
var res = _task_HtyService.AddData(new Dt_Task_hty
{
TaskNum = dt_task.TaskNum,
@@ -1073,38 +1401,80 @@
NextAddress = dt_task.NextAddress,
WMSId = dt_task.WMSId,
Dispatchertime = dt_task.Dispatchertime,
- Remark = "浜哄伐鎵嬪姩瀹屾垚",
+ Remark = "鑷姩瀹屾垚",
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ RGVTaskType = dt_task.RGVTaskType,
+ RGVCurrentexecution = dt_task.RGVCurrentexecution
+ });
+ return WebResponseContent.Instance.OK();
+
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触锛�");
+ }
+ }
+
+
+ /// <summary>
+ /// 浜哄伐鎵嬪姩瀹屾垚
+ /// </summary>
+ /// <param name="ids"></param>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent CompletedManually(int id, int CompletionType)
+ {
+
+ var db = BaseDal.Db as SqlSugarClient;
+
+ try
+ {
+ db.Ado.BeginTran();
+
+ Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
+ if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+ string Remark = CompletionType == 1 ? "浜哄伐鎵嬪姩瀹屾垚" : "鑷姩瀹屾垚";
+ var res = _task_HtyService.AddData(new Dt_Task_hty
+ {
+ TaskNum = dt_task.TaskNum,
+ PalletCode = dt_task.PalletCode,
+ Roadway = dt_task.Roadway,
+ TaskType = dt_task.TaskType,
+ TaskState = dt_task.TaskState,
+ SourceAddress = dt_task.SourceAddress,
+ TargetAddress = dt_task.TargetAddress,
+ CurrentAddress = dt_task.CurrentAddress,
+ NextAddress = dt_task.NextAddress,
+ WMSId = dt_task.WMSId,
+ Dispatchertime = dt_task.Dispatchertime,
+ Remark = Remark,
Creater = App.User.UserName,
CreateDate = DateTime.Now,
RGVTaskType = dt_task.RGVTaskType,
RGVCurrentexecution = dt_task.RGVCurrentexecution
});
- int oldState = dt_task.TaskState;
- _taskExecuteDetailService.AddTaskExecuteDetail(
- dt_task.TaskId,
- $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_task.TaskState}銆�"
-);
-
if (res.Status == false)
{
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ return WebResponseContent.Instance.Error($"{Remark}澶辫触锛�");
}
var deletetask = BaseDal.DeleteData(dt_task);
- if (deletetask == false) {
+ if (deletetask == false)
+ {
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
+ return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
}
db.Ado.CommitTran();
- return WebResponseContent.Instance.OK("鎵嬪姩瀹屾垚鎴愬姛锛�");
+ return WebResponseContent.Instance.OK($"{Remark}鎴愬姛锛�");
}
catch (Exception ex)
{
db.Ado.RollbackTran();
- return WebResponseContent.Instance.Error("鎵嬪姩瀹屾垚澶辫触锛�");
+ return WebResponseContent.Instance.Error("浠诲姟瀹屾垚澶辫触锛�");
}
}
@@ -1124,7 +1494,7 @@
Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
if (dt_task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
//if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew || dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
- if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
+ /*if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
{
if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
}
@@ -1132,33 +1502,42 @@
{
if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"浠诲姟鐘舵�佷笉鍏佽鍙栨秷");
- }
- var res = _task_HtyService.AddData(new Dt_Task_hty
- {
- TaskNum = dt_task.TaskNum,
- PalletCode = dt_task.PalletCode,
- Roadway = dt_task.Roadway,
- TaskType = dt_task.TaskType,
- TaskState = dt_task.TaskType >= (int)TaskInboundTypeEnum.Inbound ? (int)TaskInStatusEnum.InCancel : (int)TaskOutStatusEnum.OutCancel,
- SourceAddress = dt_task.SourceAddress,
- TargetAddress = dt_task.TargetAddress,
- CurrentAddress = dt_task.CurrentAddress,
- NextAddress = dt_task.NextAddress,
- WMSId = dt_task.WMSId,
- Dispatchertime = dt_task.Dispatchertime,
- Remark = "浜哄伐鎵嬪姩鍙栨秷浠诲姟",
- Creater = App.User.UserName,
- CreateDate = DateTime.Now,
- RGVTaskType = dt_task.RGVTaskType,
- RGVCurrentexecution = dt_task.RGVCurrentexecution
- });
- if (res.Status == false) {
+ }*/
+
+ Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
+ {
+ TaskNum = dt_task.TaskNum,
+ PalletCode = dt_task.PalletCode,
+ Roadway = dt_task.Roadway,
+ TaskType = dt_task.TaskType,
+ TaskState = dt_task.TaskType >= (int)TaskInboundTypeEnum.Inbound ? (int)TaskInStatusEnum.InCancel : (int)TaskOutStatusEnum.OutCancel,
+ SourceAddress = dt_task.SourceAddress,
+ TargetAddress = dt_task.TargetAddress,
+ CurrentAddress = dt_task.CurrentAddress,
+ NextAddress = dt_task.NextAddress,
+ WMSId = dt_task.WMSId,
+ Dispatchertime = dt_task.Dispatchertime,
+ Remark = "浜哄伐鎵嬪姩鍙栨秷浠诲姟",
+ Creater = App.User.UserName,
+ CreateDate = DateTime.Now,
+ RGVTaskType = dt_task.RGVTaskType,
+ RGVCurrentexecution = dt_task.RGVCurrentexecution
+ };
+ var res = _task_HtyService.AddData(dt_Task_Hty);
+ if (res.Status == false)
+ {
db.Ado.RollbackTran();
return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
}
+ /*int oldState = dt_task.TaskState;
+ _taskExecuteDetailService.AddTaskExecuteDetail(
+ dt_task.TaskId,
+ $"鑷姩浠诲姟鐘舵�佷粠銆恵oldState}銆戣繘鍏ュ埌銆恵dt_Task_Hty.TaskState}銆�"
+);*/
- var deletetask = BaseDal.DeleteData(dt_task);
- if (deletetask == false) {
+ bool deletetask = BaseDal.DeleteData(dt_task);
+ if (!deletetask)
+ {
db.Ado.RollbackTran();
return WebResponseContent.Instance.Error("鍒犻櫎浠诲姟澶辫触鎵�鏈夋搷浣滃洖婊氾紒");
}
@@ -1171,5 +1550,65 @@
return WebResponseContent.Instance.Error("鍙栨秷浠诲姟澶辫触锛�");
}
}
+
+
+
+
+ /// <summary>
+ /// 浠诲姟涓嬩竴姝ユ墽琛�
+ /// </summary>
+ /// <param name="sCErrorStatus"></param>
+ /// <returns></returns>
+ public WebResponseContent NextStepeXecuted(int taskid)
+ {
+ WebResponseContent responseContent = new WebResponseContent();
+ Dt_Task task = BaseDal.QueryData().Where(x => x.TaskNum == taskid).FirstOrDefault();
+ if (task == null) return WebResponseContent.Instance.Error($"鏈煡璇㈠埌浠诲姟");
+ switch (task.TaskState)
+ {
+ //鍏ュ簱鐘舵��
+ case (int)TaskInStatusEnum.RGV_InNew:
+ case (int)TaskInStatusEnum.RGV_InPickupFinish:
+ case (int)TaskInStatusEnum.RGV_InReleaseFinish:
+ case (int)TaskInStatusEnum.RGV_InZicheFinish:
+ case (int)TaskInStatusEnum.RGV_InZicheReleaseFinish:
+ //鍏ュ簱鐘舵��
+ //鍑哄簱鐘舵��
+ case (int)TaskOutStatusEnum.OutNew:
+ case (int)TaskOutStatusEnum.RGV_OutMothercarFinish:
+ case (int)TaskOutStatusEnum.RGV_OutZicheFinish:
+ case (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish:
+ case (int)TaskOutStatusEnum.RGV_OutPickupFinish:
+ //鍑哄簱鐘舵��
+ //璋冨彇涓嬪彂鐨勬帴鍙�
+ responseContent = UpdateTaskStatusToNext(task);
+ break;
+
+
+ //鍏ュ簱鐘舵��
+ case (int)TaskInStatusEnum.RGV_InPickupExecuting:
+ case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
+ case (int)TaskInStatusEnum.RGV_InZicheExecuting:
+ case (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting:
+ case (int)TaskInStatusEnum.RGV_InMothercarExecuting:
+ //鍏ュ簱鐘舵��
+ //鍑哄簱鐘舵��
+ case (int)TaskOutStatusEnum.RGV_OutMothercarExecuting:
+ case (int)TaskOutStatusEnum.RGV_OutZicheExecuting:
+ case (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting:
+ case (int)TaskOutStatusEnum.RGV_OutPickupExecuting:
+ case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
+ //鍑哄簱鐘舵��
+ //璋冨彇瀹屾垚鎺ュ彛
+ responseContent = UpdateTaskStatus(task.TaskNum);
+ break;
+ case (int)TaskInStatusEnum.RGV_InMothercarFinish:
+ return WebResponseContent.Instance.Error("RGV閮ㄥ垎浠诲姟宸茶蛋浣�,涓嶅彲寰�涓嬫墽琛�");
+ default:
+ return WebResponseContent.Instance.Error("浠诲姟鐘舵�侀敊璇紝鎵ц涓嬩竴姝ュけ璐�");
+ }
+ // 鍒涘缓骞惰祴鍊�
+ return responseContent;
+ }
}
}
--
Gitblit v1.9.3