From 00e64cba66377cb75c9c947908627fe9f631746e Mon Sep 17 00:00:00 2001
From: Admin <Admin@ADMIN>
Date: 星期三, 21 一月 2026 13:53:14 +0800
Subject: [PATCH] '手动上传'
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs | 33 ++++++++++++++++++++++++++-------
1 files changed, 26 insertions(+), 7 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs"
index e0a187f..6b305e7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/WMSCruJob.cs"
@@ -145,7 +145,7 @@
x.Roadway == task.Roadway &&
(x.TaskStatus == SC_IN_EXECUTING ||
x.TaskStatus == SC_OUT_EXECUTING ||
- x.TaskStatus == RELOCATION_EXECUTING || x.TaskStatus == RELOCCATION_NEW));
+ x.TaskStatus == RELOCATION_EXECUTING));
if (hasExecutingTask)
continue;
@@ -255,12 +255,12 @@
task.TaskStatus = successStatus;
if(task.TaskStatus== (int)OutTaskStatusEnum.SC_OutExecuting)
{
- string Result = MesOutTaskStatusEnum.鍑哄簱寮�濮�.GetDescription();
+ string Result = MesOutTaskStatusEnum.Start.GetDescription();
//璋冨彇涓婃父绯荤粺鍙嶉寮�濮嬩换鍔�
_taskService.OutStoreDocCallback(task.TaskNum,Result, "鎿嶄綔鎴愬姛");
}else if(task.TaskStatus == (int)InTaskStatusEnum.PLC_InExecuting)
{
- string Result = MesInTaskStatusEnum.鍏ュ簱寮�濮�.GetDescription();
+ string Result = MesInTaskStatusEnum.Start.GetDescription();
//璋冨彇涓婃父绯荤粺鍙嶉寮�濮嬩换鍔�
_taskService.InStoreDocCallback(task.TaskNum, Result, "鎿嶄綔鎴愬姛",task.PalletCode,"");
}
@@ -294,6 +294,9 @@
/// <returns></returns>
public WebResponseContent JudgmentIsRelocations(Dt_Task dt_Task)
{
+ const int PLC_IN_FINISH = (int)InTaskStatusEnum.PLC_InFinish;
+ const int SC_IN_EXECUTING = (int)InTaskStatusEnum.SC_IntExecuting;
+ const int SC_OUT_EXECUTING = (int)OutTaskStatusEnum.SC_OutExecuting;
WebResponseContent content = new WebResponseContent();
try
{
@@ -304,7 +307,7 @@
int locrow = judgmentRow(dt_Location.RoadwayNo, dt_Location.Row);
Dt_LocationInfo shallowLocation = _locationInfoService.Repository.QueryData(x => x.RoadwayNo == dt_Location.RoadwayNo && x.Row == locrow && x.Layer == dt_Location.Layer && x.Column == dt_Location.Column).FirstOrDefault();
if (shallowLocation.LocationStatus == (int)LocationStatusEnum.Free) return content.OK();
- if (shallowLocation.LocationStatus != (int)(int)LocationStatusEnum.InStock) return content.Error();
+
//鍒ゆ柇鏄惁鏈夌Щ搴撲换鍔�
var TransferTask = _taskService.Repository.QueryData(x=>x.TaskStatus== (int)RelocationTaskStatusEnum.RelocationNew && x.CurrentAddress== shallowLocation.LocationCode).FirstOrDefault();
@@ -319,17 +322,29 @@
int.Parse(TransferTask.PalletType),
TransferTask.CurrentAddress,
TransferTask.NextAddress,
- TransferTask.TargetAddress);
+ dt_Task.TargetAddress);
if (result.IsSuccess)
{
+ TransferTask.TaskStatus = (int)RelocationTaskStatusEnum.RelocationExecuting;
+ _taskService.UpdateData(TransferTask);
return content.OK();
}
else
{
+ UpdateTaskStatus(dt_Task, result,
+ successStatus: dt_Task.TaskStatus == PLC_IN_FINISH ? SC_IN_EXECUTING : SC_OUT_EXECUTING, 1);
+
WriteLog.GetLog("鍒ゆ柇宸烽亾鍐呯Щ搴�").Write($"涓嬪彂鍫嗗灈鏈轰换鍔″け璐ワ紝鍘熷洜锛歿result.Message}", $"鐢熸垚绉诲簱浠诲姟:GenerateTransferTask");
return content.Error();
}
}
+
+ var CuttTransferTask = _taskService.Repository.QueryData(x => x.TaskStatus == (int)RelocationTaskStatusEnum.RelocationNew).FirstOrDefault();
+ //鍒ゆ柇褰撳墠鏄惁鏈夌Щ搴撲换鍔�
+ if (CuttTransferTask!=null) return content.Error();
+
+
+ if (shallowLocation.LocationStatus != (int)LocationStatusEnum.InStock) return content.Error();
//鐢熸垚绉诲簱浠诲姟锛岃繘琛屼笅鍙�
return content =GenerateTransferTask(shallowLocation.LocationCode);
@@ -404,8 +419,10 @@
_stockInfoService.UpdateData(dt_StockInfo);
_unitOfWorkManage.CommitTran();
+
+ return webResponse.Error("宸茬敓鎴愮Щ搴撲换鍔�");
//杩涜涓嬪彂缁欏爢鍨涙満浠诲姟
- WCSginseng result = _taskService.SC_IssueTasks(
+ /*WCSginseng result = _taskService.SC_IssueTasks(
task.TaskId,
int.Parse(task.Roadway),
task.TaskNum,
@@ -416,13 +433,15 @@
task.TargetAddress);
if (result.IsSuccess)
{
+ task.TaskStatus = (int)RelocationTaskStatusEnum.RelocationExecuting;
+ _taskService.UpdateData(task);
return webResponse.OK();
}
else
{
WriteLog.GetLog("鍒ゆ柇宸烽亾鍐呯Щ搴�").Write($"涓嬪彂鍫嗗灈鏈轰换鍔″け璐ワ紝鍘熷洜锛歿result.Message}", $"鐢熸垚绉诲簱浠诲姟:GenerateTransferTask");
return webResponse.Error();
- }
+ }*/
}
else
{
--
Gitblit v1.9.3