From dbbd4120b2281f2305c01bd476925f4c170d3722 Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期五, 20 三月 2026 11:44:01 +0800
Subject: [PATCH] 同步
---
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 1 -
项目代码/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt | 0
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs | 10 +++++-----
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs | 2 +-
项目代码/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs | 2 +-
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs | 6 +++++-
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs | 8 ++++----
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs | 14 +++++++++-----
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs | 8 ++++----
9 files changed, 29 insertions(+), 22 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index d5058ba..2d3686e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -44,7 +44,6 @@
throw new Exception();
}
-
//todo 浼樺寲 濡傛湭鏌ヨ鍒颁换鍔″垯澶勭悊
//if (content.Data != null)
//{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
index cd6c629..49d7a14 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -667,17 +667,21 @@
{
if(task.NextAddress == task.TargetAddress)
{
- int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
- task.TaskState = nextStatus;
- task.CurrentAddress = task.NextAddress;
- task.NextAddress = task.NextAddress;
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+
+ task.TaskState = nextStatus;
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+ //task_Hty.CarType = task.CarType;
+ task_Hty.PVI = task.PVI;
+ BaseDal.DeleteData(task);
+ _taskHtyRepository.AddData(task_Hty);
}
else
{
-
var routers = _routerService.QueryNextRoutes(task.NextAddress, task.TargetAddress);
if (!routers.Any()) return WebResponseContent.Instance.Error($"鏈壘鍒拌澶囪矾鐢变俊鎭�");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs"
index 344a59d..96a18d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/TT/CommonConveyorLineTTJob.cs"
@@ -82,11 +82,11 @@
_stationManagerRepository = stationManagerRepository;
}
- static Dictionary<string, string> TCRoadWay = new Dictionary<string, string>()
- {
- { "TC05", "SC02-SC04" },
- { "TC06", "SC06-SC08" },
- };
+ //static Dictionary<string, string> TCRoadWay = new Dictionary<string, string>()
+ //{
+ // { "TC05", "SC02-SC04" },
+ // { "TC06", "SC06-SC08" },
+ //};
public async Task Execute(IJobExecutionContext context)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
index 7b4292e..800abee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/.vs/WIDESEA_WMSServer/v17/HierarchyCache.v1.txt"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs"
index 2a1635c..50cc8ec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Dt_PalletStockInfo.cs"
@@ -155,7 +155,7 @@
public int TaskStatus { get; set; }
/// <summary>
- /// 淇濈暀鐘舵��
+ /// 淇濈暀鐘舵�� 0-涓嶄繚鐣� 1-淇濈暀
/// </summary>
[ImporterHeader(Name = "淇濈暀鐘舵��")]
[ExporterHeader(DisplayName = "淇濈暀鐘舵��")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
index 28e966c..3ae3103 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
@@ -39,14 +39,14 @@
var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == item.workOrderNo && x.orderType == item.workOrderType);
if (assemblyOrderInfo == null) throw new Exception($"鎷夊姩閿佽溅澶辫触:鏈煡鎬昏宸ュ崟鍙穥item.workOrderNo}");
- Dt_PalletStockInfo carinfo = null;
+ //Dt_PalletStockInfo carinfo = null;
VV_StockInfo OutStock = new VV_StockInfo();
- Dt_CarBodyInfo carbodyinfo = null;
+ //Dt_CarBodyInfo carbodyinfo = null;
if (!string.IsNullOrEmpty(item.pvi))
{
// carinfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial);
//carbodyinfo = _carBodyRepository.QueryFirst(x => x.pbMaterial == item.pbMaterial && x.PVI == item.pvi);
- OutStock = _VVStockInfoRepository.QueryFirst(X => X.PVI == item.pvi && X.pbMaterial == item.pbMaterial);
+ OutStock = _VVStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0);
if (OutStock == null)
{
throw new Exception($"鏈壘鍒版寚瀹歅VI杞﹁韩淇℃伅{item.pvi}");
@@ -56,7 +56,7 @@
{
//carinfo = _palletStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial).OrderBy(x => x.biwInPassTime).FirstOrDefault();
//carbodyinfo = _carBodyRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.BodyStatus == 0).OrderBy(x => x.biwInPassTime).FirstOrDefault();
- OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.workOrderType == item.workOrderType).OrderBy(x => x.biwInPassTime).FirstOrDefault();
+ OutStock = _VVStockInfoRepository.QueryData(x => x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0 && x.workOrderType == item.workOrderType).OrderBy(x => x.biwInPassTime).FirstOrDefault();
}
if (OutStock == null)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
index bbb4868..9172a7c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
@@ -72,6 +72,10 @@
foreach (var item in maxGroup)
{
var number = _taskRepository.QueryData(x => x.TargetAddress == item.Key).Count();
+ if (item.Count() - number <= 0)
+ {
+ continue;
+ }
result.Add(item.Key, item.Count() - number);
}
@@ -114,7 +118,7 @@
TaskNum = _taskRepository.GetTaskNo().Result,
Creater = "Systeam",
PVI = json.PVI,
-
+ CarType = carInfo.CarType
};
_unitOfWorkManage.BeginTran();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
index 4b58e56..7d41a5a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
@@ -108,7 +108,7 @@
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
hasTask = new Dt_Task
{
- Grade = 1,
+ Grade = 3,
Roadway = Outstation.Roadway,
TargetAddress = "RB043",
Dispatchertime = DateTime.Now,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
index a023b44..077d7d1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
@@ -41,12 +41,12 @@
{
//娑傝涓嶇敓浜� 鍒欏仠姝㈡媺鍔ㄥ嚭搴�
var area = _areaInfoRepository.QueryFirst(x => x.AreaCode == "2");
- if (area.AreaStatus != 1l) { return Task.CompletedTask; }
+ if (area.AreaStatus != 1) { return Task.CompletedTask; }
var stockInfo = _palletStockInfoRepository.Db.Queryable<Dt_PalletStockInfo>()
//.Where(x => x.LockStatue == 0)
.Includes(x => x.CarBodyInfo)
- .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0)
+ .Where(x => x.CarBodyInfo.CarType == 1 && x.TaskStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0)
.OrderBy(x => x.CreateDate) // 鎺掑簭
.ToList(); // 鑾峰彇绗竴涓厓绱�
@@ -73,7 +73,7 @@
var location = _locationRepository.QueryFirst(x => x.LocationCode == stock.LocationCode);
location.LocationStatus = (int)LocationEnum.InStockDisable;
lockStock.TaskStatus = 1;
- if (stationLists == null || stationLists.Count == 0) throw new Exception("鍑哄簱绔欏彴鏈厤缃垨鏈惎鐢�");
+ if (!stationLists.Any()) throw new Exception("鍑哄簱绔欏彴鏈厤缃垨鏈惎鐢�");
Dt_StationManager Outstation = null;
@@ -92,7 +92,7 @@
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
hasTask = new Dt_Task
{
- Grade = 1,
+ Grade = 3,
Roadway = Outstation.Roadway,
TargetAddress = Outstation.stationChildCode,
Dispatchertime = DateTime.Now,
--
Gitblit v1.9.3