From 90ac374a64e47e2bd97ee9245f4cafb50ad5dbbb Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期五, 17 四月 2026 17:31:02 +0800
Subject: [PATCH] 添加成品出库任务等待移库上报WMS
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
index ba18d44..169dd92 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs"
@@ -63,7 +63,6 @@
// Q3CK 鏄疉A鈫扚F鐨勮法妤煎眰浠诲姟锛屽彧鑳戒娇鐢ㄤ笓鐢ㄥ皬杞�
var code = item.TaskType == (int)TaskTypeEnum.Q3CK ? "AA" : "FF";
var specialCarInAA = dataList.FirstOrDefault(d => d.mapCode == code);
-
if (specialCarInAA != null)
{
// 鏈夊湪1妤肩殑灏忚溅锛岀洿鎺ユ墽琛屼换鍔�
@@ -71,6 +70,7 @@
if (content.Status)
{
item.TaskState = (int)TaskStatusEnum.Execut;
+ _taskService.UpdateData(item);
}
}
else
@@ -85,11 +85,13 @@
{
// 鍘熶换鍔＄姸鎬佹敼涓虹瓑寰呯┖杞�
item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
+ _taskService.UpdateData(item);
}
}
else
{
item.ExceptionMessage = "鏈壘鍒板彲鐢ˋGV灏忚溅";
+ _taskService.UpdateData(item);
}
}
}
@@ -97,13 +99,13 @@
else
{
item.ExceptionMessage = "鑾峰彇AGV灏忚溅淇℃伅澶辫触";
+ _taskService.UpdateData(item);
}
}
else if (item.TaskType == (int)TaskTypeEnum.F01)
{
// F01浠诲姟澶勭悊锛氭牴鎹洰鏍囧湴鍧�鍒ゆ柇闇�瑕佸摢涓ゼ灞傜殑灏忚溅
var result = _agvcartInfoService.CheckTheCar("MR-Q3-600LE-D(M)");
-
if (result != null && result.Status)
{
var dataList = result.Data as List<HIKROBOTQueryData>;
@@ -111,7 +113,7 @@
{
// 浠庝换鍔＄殑璧峰鍦板潃涓彁鍙栭渶瑕佺殑妤煎眰浠ｇ爜
string requiredMapCode = GetMapCodeFromAddress(item.SourceAddress);
- if (string.IsNullOrEmpty(requiredMapCode))
+ if (requiredMapCode==null)
{
item.ExceptionMessage = $"鏃犳硶浠庣洰鏍囧湴鍧� {item.SourceAddress} 涓瘑鍒ゼ灞備俊鎭�";
_taskService.UpdateData(item);
@@ -128,6 +130,7 @@
if (content.Status)
{
item.TaskState = (int)TaskStatusEnum.Execut;
+ _taskService.UpdateData(item);
}
}
else
@@ -141,17 +144,18 @@
if (callCarResult.Status)
{
item.TaskState = (int)TaskStatusEnum.WaitingHkAGVMovePosition;
+ _taskService.UpdateData(item);
}
}
else
{
item.ExceptionMessage = "鏈壘鍒板彲鐢ˋGV灏忚溅";
+ _taskService.UpdateData(item);
}
}
}
}
}
- _taskService.UpdateData(item);
}
}
@@ -188,12 +192,17 @@
var currentFloorInfo = FloorMapping.FloorMap[currentMapCode];
var targetFloorInfo = FloorMapping.FloorMap[targetMapCode];
- // 璁剧疆浠诲姟淇℃伅
- //task.SourceAddress = currentFloorInfo.PointCode; // 璧风偣锛氬皬杞﹀綋鍓嶄綅缃殑鐐逛綅
- //task.CurrentAddress = currentFloorInfo.PointCode; // 褰撳墠浣嶇疆锛氬皬杞﹀綋鍓嶄綅缃殑鐐逛綅
- //task.TargetAddress = targetFloorInfo.PointCode; // 鐩爣鐐癸細鐩爣妤煎眰鐐逛綅
- //task.NextAddress = targetFloorInfo.PointCode; // 璁板綍鐩爣妤煎眰浠ｇ爜
+ // 璁板綍浣跨敤鐨凙GV灏忚溅鍨嬪彿鍒颁换鍔′腑
+ var carType= "";
+ if (task.TaskType==(int)TaskTypeEnum.F01)
+ {
+ carType = "MR-Q3-600LE-D(M)";
+ }
+ else// 1-6/6-1鐨勪换鍔�
+ {
+ carType = "MR-Q3-600LE-D(M)(YWGP)";
+ }
Dt_Task newTask = new Dt_Task
{
WMSTaskNum = "HK_" + task.WMSTaskNum, // 鐢熸垚鍞竴鐨刉MS浠诲姟鍙�
@@ -204,7 +213,7 @@
NextAddress = targetFloorInfo.PointCode,
TaskType = (int)TaskTypeEnum.MOVE,
Grade = task.Grade,
- PalletCode = "",
+ PalletCode = carType,
TaskState = (int)TaskStatusEnum.CallingHKtransportation,
// 澶嶅埗鍏朵粬蹇呰瀛楁
CreateDate = DateTime.Now,
@@ -263,20 +272,16 @@
private string GetMapCodeFromAddress(string address)
{
if (string.IsNullOrEmpty(address))
+ {
return null;
-
+ }
// 鍦板潃鏍煎紡绀轰緥 锛欰A 瀵瑰簲 0339050AA0309145
// keys 鏄� AA銆丅B銆丆C銆丏D銆丒E銆丗F锛寁ule鏄搴旂殑鐐逛綅淇℃伅
- foreach (var floorCode in FloorMapping.FloorMap.Keys)
+ else
{
- if (address.Contains(floorCode))
- {
- return floorCode;//杩斿洖鐨勫氨鏄疉A銆丅B銆丆C銆丏D銆丒E銆丗F涓殑涓�涓紝浠ｈ〃瀵瑰簲鐨勬ゼ灞�
- }
+ var reslut = _stationInfoService.Repository.QueryFirst(x => x.StationCode == address);
+ return reslut.FloorNumber;
}
- return null;
}
-
-
}
}
--
Gitblit v1.9.3