From 28a788d3fca51fb4fd2f668b90fa95e87c2633a1 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 16 四月 2026 19:07:58 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/RuiShengZhiNeng/GaoPuLiTiKu
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/HKTaskExtend.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 bf4cffe..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妤肩殑灏忚溅锛岀洿鎺ユ墽琛屼换鍔�
@@ -107,7 +106,6 @@
{
// F01浠诲姟澶勭悊锛氭牴鎹洰鏍囧湴鍧�鍒ゆ柇闇�瑕佸摢涓ゼ灞傜殑灏忚溅
var result = _agvcartInfoService.CheckTheCar("MR-Q3-600LE-D(M)");
-
if (result != null && result.Status)
{
var dataList = result.Data as List<HIKROBOTQueryData>;
@@ -194,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浠诲姟鍙�
@@ -210,7 +213,7 @@
NextAddress = targetFloorInfo.PointCode,
TaskType = (int)TaskTypeEnum.MOVE,
Grade = task.Grade,
- PalletCode = "",
+ PalletCode = carType,
TaskState = (int)TaskStatusEnum.CallingHKtransportation,
// 澶嶅埗鍏朵粬蹇呰瀛楁
CreateDate = DateTime.Now,
--
Gitblit v1.9.3