From 8f316cbca92dc248151863320c506f961ed95db8 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 17:18:00 +0800
Subject: [PATCH] 1
---
/dev/null | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 10 +++++-----
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b22719c-a0d4-4fe6-9ae9-4eb7a870198d.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/62b5ac34-861b-44ca-8306-87349bba393f.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/TaskRepository.cs | 4 +++-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs | 23 ++++++++++++++---------
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f976bcc4-34e4-4214-b8b4-c5c7d3547085.vsidx | 0
7 files changed, 22 insertions(+), 15 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/62b5ac34-861b-44ca-8306-87349bba393f.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/62b5ac34-861b-44ca-8306-87349bba393f.vsidx"
new file mode 100644
index 0000000..e781914
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/62b5ac34-861b-44ca-8306-87349bba393f.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/96267f00-540d-4339-98d8-6ee87f3f50ec.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/96267f00-540d-4339-98d8-6ee87f3f50ec.vsidx"
deleted file mode 100644
index 0e171c2..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/96267f00-540d-4339-98d8-6ee87f3f50ec.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index c06132e..45bb9a3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -51,11 +51,11 @@
if (task != null)
{
bool sendFlag = true;
- if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
- {
- //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
- sendFlag = false;
- }
+ //if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt() || task.TaskType == TaskTypeEnum.PalletOutbound.ObjToInt())
+ //{
+ // //鍚慦MS鐢宠鍑哄叆搴撳彛鏄惁鏈夌┖鎵樼洏
+ // sendFlag = false;
+ //}
if(sendFlag)
{
StackerCraneTaskCommand? stackerCraneTaskCommand = ConvertToStackerCraneTaskCommand(task);
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b22719c-a0d4-4fe6-9ae9-4eb7a870198d.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b22719c-a0d4-4fe6-9ae9-4eb7a870198d.vsidx"
new file mode 100644
index 0000000..a819e62
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0b22719c-a0d4-4fe6-9ae9-4eb7a870198d.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1139bf04-b8e9-4a91-8262-140ce76c24e9.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1139bf04-b8e9-4a91-8262-140ce76c24e9.vsidx"
deleted file mode 100644
index ab14659..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1139bf04-b8e9-4a91-8262-140ce76c24e9.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/986b3ed5-6eee-4f92-a58f-f5cd9b1c4552.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/986b3ed5-6eee-4f92-a58f-f5cd9b1c4552.vsidx"
deleted file mode 100644
index 7bf286c..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/986b3ed5-6eee-4f92-a58f-f5cd9b1c4552.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f976bcc4-34e4-4214-b8b4-c5c7d3547085.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f976bcc4-34e4-4214-b8b4-c5c7d3547085.vsidx"
new file mode 100644
index 0000000..de9be8a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f976bcc4-34e4-4214-b8b4-c5c7d3547085.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/TaskRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/TaskRepository.cs"
index 87598ea..8701370 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/TaskRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoRepository/TaskRepository.cs"
@@ -36,7 +36,9 @@
public int GetTaskNum(string sequenceName)
{
- return Db.Ado.GetScalar($"SELECT NEXT VALUE FOR {sequenceName}").ObjToInt();
+ int taskNum = Db.Ado.GetScalar($"SELECT NEXT VALUE FOR {sequenceName}").ObjToInt();
+ if (taskNum >= 99999999) Db.Ado.GetScalar($"ALTER SEQUENCE {sequenceName} RESTART WITH {1}");
+ return taskNum;
}
public override int AddData(Dt_Task entity)
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 38b8cf7..2debb9b 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"
@@ -22,12 +22,17 @@
public WebResponseContent ShelfOutboundCarry(Dt_Task outTask)
{
//鍒ゆ柇鏄惁涓虹數鑺簱锛岃緟鏂欏簱浜哄伐澶勭悊(绔嬪簱鐩爣鍦板潃杞崲鎴怉GV绔欑偣鍦板潃)
- if (!outTask.Roadway.Contains("CP")) return WebResponseContent.Instance.OK();
Dt_RoadwayInfo dt_RoadwayInfo = _basicService.RoadwayInfoService.Repository.QueryFirst(x => x.OutSCStationCode == outTask.TargetAddress);
- if (dt_RoadwayInfo == null) return WebResponseContent.Instance.OK();
+ if (dt_RoadwayInfo == null || dt_RoadwayInfo.AreaId == 11) return WebResponseContent.Instance.OK();
Dt_CachePoint startcachePoint = new Dt_CachePoint();
Dt_CachePoint cachePoint = GetCachePointByStartPoint(dt_RoadwayInfo.OutStationCode, ref startcachePoint);
-
+ if (startcachePoint.EnableStatus == EnableStatusEnum.Disable.ObjToInt()) return WebResponseContent.Instance.OK();
+ //if (dt_RoadwayInfo.AreaId == 11)//杈呮枡涓嶇敤AGV鎼繍
+ //{
+ // startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ // _basicService.CachePointService.Repository.UpdateData(startcachePoint);
+ // return WebResponseContent.Instance.OK();
+ //}
Dt_Task task = new()
{
CurrentAddress = startcachePoint.PointCode,
@@ -46,10 +51,10 @@
Creater = App.User.UserId > 0 ? App.User.UserName : "System",
};
cachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
- startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
+ //startcachePoint.PointStatus = LocationStatusEnum.Lock.ObjToInt();
_basicService.CachePointService.Repository.UpdateData(cachePoint);
- _basicService.CachePointService.Repository.UpdateData(startcachePoint);
+ //_basicService.CachePointService.Repository.UpdateData(startcachePoint);
Repository.AddData(task);
SendAGVTask(task, cachePoint);
return WebResponseContent.Instance.OK();
@@ -325,10 +330,10 @@
if (qty > 0) startCachePoint.PointStatus = LocationStatusEnum.InStock.ObjToInt();
startCachePoint.Remark = qty.ToString();
}
- else if (startCachePoint.AreaId == 1)
- {
- startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
- }
+ //else if (startCachePoint.AreaId == 1)
+ //{
+ // startCachePoint.PointStatus = LocationStatusEnum.PalletLock.ObjToInt();
+ //}
_basicService.CachePointService.Repository.UpdateData(startCachePoint);
}
}
--
Gitblit v1.9.3