From 786c5ca17012ff3a01faf466b751bdbe70629b97 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期一, 25 八月 2025 15:25:46 +0800
Subject: [PATCH] 1
---
代码管理/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 2a0ac49..ae3874d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/NEWCode/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -68,7 +68,7 @@
// 瀹氫箟绾夸綋瀹炵洏鍏ュ簱璇锋眰鐨勫湴鍧�鍜屼换鍔＄被鍨�
var requests = new Dictionary<string, string>
{
- { "DB1002.1493.0", "ZJXL-WLX002" },
+ { "DB1002.693.0", "ZJXL-WLX002" },
{ "DB1002.1093.0", "FJXL-WLX002" }
};
@@ -148,21 +148,21 @@
}
string fromAdd = request.Value;
- string taskType = "璐熸瀬"; //request.Value.Contains("ZJXL") ? "姝ｆ瀬" :
+ string taskType = request.Value.Contains("ZJXL") ? "姝ｆ瀬" : "璐熸瀬"; //request.Value.Contains("ZJXL") ? "姝ｆ瀬" :
// 鏍规嵁浠诲姟绫诲瀷纭畾璇锋眰鍦板潃
(string upRequest, string gmRequest, string gmState) = GetRequestAddresses(taskType);
var isUpRequest = conveyorLine.Communicator.Read<bool>(upRequest);
- var isGMRequest = conveyorLine.Communicator.Read<bool>(gmRequest);
- var isGMState = conveyorLine.Communicator.Read<int>(gmState);
+ var isGMRequest = conveyorLine.Communicator.Read<bool>(gmRequest);//鏆傚瓨绾胯姹�
+ var isGMState = conveyorLine.Communicator.Read<int>(gmState);//鏆傚瓨绾垮嚭鍏ュ簱绫诲瀷鍒囨崲
// 鏍规嵁鏉′欢鍒涘缓浠诲姟瀵硅薄
Dt_Task task = null;
if (isUpRequest)
{
List<Dt_Task> dt_Task = _taskRepository.QueryData(x => x.SourceAddress == fromAdd && x.TaskState == (int)TaskInStatusEnum.InPending);
- if (dt_Task.Count < 0) { continue; }
+ if (dt_Task.Count <= 0) { continue; }
var tasks = dt_Task.Where(x => x.SourceAddress == fromAdd).OrderBy(t => t.CreateDate).First();
tasks.TaskState = (int)TaskInStatusEnum.InNew;
_taskService.UpdateData(tasks);
@@ -199,21 +199,24 @@
{
if (targetAddress != "WaitBind")
{
- var details = _detailsRepository.QueryData(x => x.TaskEndAddress == targetAddress).ToList();
+ var details = _detailsRepository.QueryData(x => x.TaskEndAddress == targetAddress).OrderBy(x => x.CreateDate).Take(2).ToList();
foreach (var item in details)
{
var taskCZ = _taskCZRepository.QueryFirst(x => x.TaskTaskID == item.TaskTaskID);
if (taskCZ.TaskType.Contains("姝ｆ瀬"))
{
taskCZ.TaskZJFinishNumber += 1;
+ _detailsRepository.DeleteData(item);
}
else
{
taskCZ.TaskFJFinishNumber += 1;
+ _detailsRepository.DeleteData(item);
}
if (taskCZ.TaskZJFinishNumber == taskCZ.TaskNumber || taskCZ.TaskFJFinishNumber == taskCZ.TaskNumber)
{
_taskCZRepository.DeleteData(taskCZ);
+
}
var isTrue = _taskCZRepository.UpdateData(taskCZ);
@@ -224,6 +227,15 @@
{
return null;
}
+ int type = 0;
+ if (targetAddress.Contains("ZC"))
+ {
+ type = 2;
+ }
+ else
+ {
+ type = 1;
+ }
return new Dt_Task
{
TaskNum = _taskService.GetTaskNum(),
@@ -232,15 +244,16 @@
CurrentAddress = currentAddress,
SourceAddress = currentAddress,
TaskState = targetAddress != "WaitBind" ? (int)TaskInStatusEnum.InNew : (int)TaskInStatusEnum.InPending,
- TaskType = (int)TaskOutboundTypeEnum.Outbound,
+ TaskType = type,
Grade = 1,
PalletCode = palletCode,
TargetAddress = targetAddress,
NextAddress = targetAddress,
Barcode = "",
- Roadway = $"{taskType}AGV",
+ Roadway = "AGV",
WMSId = czTaskID > 0 ? czTaskID : 0,
- Remark = remark
+ Remark = remark,
+ Floor = 3
};
}
--
Gitblit v1.9.3