From da58f97834d2bdaeb10e677bab7bdd372a778041 Mon Sep 17 00:00:00 2001
From: Huangxiaoqiang-03 <1247017146@qq.com>
Date: 星期四, 31 十月 2024 16:01:47 +0800
Subject: [PATCH] 添加PDA,添加堆垛机调度
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 105 +++++++++++++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 43 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
index a7748e3..dee5622 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
@@ -50,30 +50,40 @@
/// </summary>
/// <param name="endPoint"></param>
/// <returns></returns>
- public WebResponseContent CallMateriel(string endPoint)
+ public WebResponseContent CallMateriel(SaveModel saveModel)
{
- Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
-
- Dt_Task task = new Dt_Task()
+ try
{
- CurrentAddress = cachePoint.PointCode,
- Grade = 0,
- NextAddress = endPoint,
- OrderNo = "",
- PalletCode = cachePoint.Remark,
- Roadway = "",
- SourceAddress = cachePoint.PointCode,
- TargetAddress = endPoint,
- SourceKey = 0,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
- TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
- };
- cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ string endPoint = saveModel.MainData["endPoint"].ToString();
- _basicService.CachePointService.Repository.UpdateData(cachePoint);
- Repository.AddData(task);
- return WebResponseContent.Instance.OK();
+ Dt_CachePoint cachePoint = GetCachePointByEndPoint(endPoint);
+
+ Dt_Task task = new Dt_Task()
+ {
+ CurrentAddress = cachePoint.PointCode,
+ Grade = 0,
+ NextAddress = endPoint,
+ OrderNo = "",
+ PalletCode = cachePoint.Remark,
+ Roadway = "",
+ SourceAddress = cachePoint.PointCode,
+ TargetAddress = endPoint,
+ SourceKey = 0,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
+ TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
+ };
+ cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ Repository.AddData(task);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+
}
/// <summary>
@@ -81,31 +91,40 @@
/// </summary>
/// <param name="startPoint"></param>
/// <returns></returns>
- public WebResponseContent MaterielCarry(string startPoint)
+ public WebResponseContent MaterielCarry(SaveModel saveModel)
{
- Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
-
- Dt_Task task = new()
+ try
{
- CurrentAddress = startPoint,
- Grade = 0,
- NextAddress = cachePoint.PointCode,
- OrderNo = "",
- PalletCode = startPoint + "-AGV",
- Roadway = "",
- SourceAddress = startPoint,
- TargetAddress = cachePoint.PointCode,
- SourceKey = 0,
- TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
- TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
- TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
- };
- cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ string startPoint = saveModel.MainData["startPoint"].ToString();
- _basicService.CachePointService.Repository.UpdateData(cachePoint);
- Repository.AddData(task);
- return WebResponseContent.Instance.OK();
- }
+ Dt_CachePoint cachePoint = GetCachePointByStartPoint(startPoint);
+
+ Dt_Task task = new()
+ {
+ CurrentAddress = startPoint,
+ Grade = 0,
+ NextAddress = cachePoint.PointCode,
+ OrderNo = "",
+ PalletCode = startPoint + "-AGV",
+ Roadway = "",
+ SourceAddress = startPoint,
+ TargetAddress = cachePoint.PointCode,
+ SourceKey = 0,
+ TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
+ TaskStatus = AGVTaskStatusEnum.AGV_New.ObjToInt(),
+ TaskType = TaskTypeEnum.AGVCarry.ObjToInt(),
+ };
+ cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+
+ _basicService.CachePointService.Repository.UpdateData(cachePoint);
+ Repository.AddData(task);
+ return WebResponseContent.Instance.OK();
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+}
private Dt_CachePoint GetCachePointByStartPoint(string startPoint)
{
--
Gitblit v1.9.3