From 51cddd71e47650c65fb9bd41596bcfedb81b10d5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期四, 26 二月 2026 17:41:24 +0800
Subject: [PATCH] 优化wms和凯乐士接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 42 ++++++++++++++++++------------------------
1 files changed, 18 insertions(+), 24 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 9c0bf7a..f7722d1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -16,6 +16,7 @@
#endregion << 鐗� 鏈� 娉� 閲� >>
using AutoMapper;
+using Dm;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
@@ -143,19 +144,20 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == wMSCancelTask.TaskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
- dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
+
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
-
//鍥涘悜杞�
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
-
//娴峰悍
bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //杩欓噷灏嗙姸鎬佹敼鍙樹簡198鍙栨秷浠诲姟
+ dt_Task.TaskType = TaskOutStatusEnum.OutCancel.ObjToInt();
if (isGALAXISTask)
{
- var KLS = new CancelGALAXISTask {
+ var KLS = new CancelGALAXISTask
+ {
taskId= dt_Task.WMSTaskNum,
reportTime=DateTime.Now.ToString()
};
@@ -165,16 +167,11 @@
GALAXISReturn agvContent = response.DeserializeObject<GALAXISReturn>();
if (agvContent.success == true && agvContent.code == 0)
{
- BaseDal.UpdateData(dt_Task);
- }
- else
- {
- content.Error("鍙栨秷浠诲姟澶辫触");
+ BaseDal.UpdateData(dt_Task);
+ return content.OK("鍙栨秷浠诲姟鎴愬姛", dt_Task);
}
}
-
- //BaseDal.UpdateData(dt_Task);
- content.OK("鍙栨秷浠诲姟鎴愬姛",dt_Task);
+ content.Error("鍙栨秷浠诲姟澶辫触");
}
catch (Exception ex)
{
@@ -196,7 +193,7 @@
{
Dt_Task dt_Task = BaseDal.QueryFirst(x => x.WMSTaskNum == updateTaskPriority.taskCode);
if (dt_Task == null) throw new Exception("鏈煡璇㈠埌浠诲姟鍙风浉鍏充换鍔�");
- dt_Task.Grade = updateTaskPriority.taskPriority;
+
// 鍒ゆ柇褰撳墠浠诲姟鏄惁涓哄嚡涔愬＋浠诲姟
bool isGALAXISTask = dt_Task.TaskType == (int)TaskTypeEnum.MLInbound ||
dt_Task.TaskType == (int)TaskTypeEnum.MLOutbound;
@@ -205,7 +202,9 @@
bool isAGV = dt_Task.TaskType == (int)TaskTypeEnum.CPInbound || dt_Task.TaskType == (int)TaskTypeEnum.CPOutbound;
//娴峰悍
- bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound|| dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ bool isHK = dt_Task.TaskType == (int)TaskTypeEnum.Carry || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJInbound || dt_Task.TaskType == (int)TaskTypeEnum.CJOutbound;
+ //淇敼鍘熸湰浠诲姟浼樺厛绾�
+ dt_Task.Grade = updateTaskPriority.taskPriority;
#region 鍑箰澹�
if (isGALAXISTask)
{
@@ -223,16 +222,11 @@
if (agvContent.success == true && agvContent.code == 0)
{
BaseDal.UpdateData(dt_Task);
- }
- else
- {
- content.Error("淇敼浠诲姟浼樺厛绾уけ璐�");
+ return content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
}
}
#endregion
-
-
- content.OK("淇敼浠诲姟浼樺厛绾ф垚鍔�", dt_Task);
+ content.Error("淇敼浠诲姟浼樺厛绾уけ璐�");
}
catch (Exception ex)
{
@@ -258,7 +252,7 @@
var rgvList = _rGVLocationInfoService.Repository.QueryData(x =>wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in rgvList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
rgv.AddRange(rgvList);
}
@@ -268,7 +262,7 @@
var KLSLocationInfoList = _kLSLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in KLSLocationInfoList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
kls.AddRange(KLSLocationInfoList);
}
@@ -277,7 +271,7 @@
var hkList = _hKLocationInfoService.Repository.QueryData(x => wMSUpdateLocationArea.LocationCodes.Contains(x.LocationCode)).ToList();
foreach (var item in hkList)
{
- item.LocationCode = wMSUpdateLocationArea.UpdateAreaCode;
+ item.WarehouseId = wMSUpdateLocationArea.UpdateAreaCode.ObjToInt();
}
hk.AddRange(hkList);
}
--
Gitblit v1.9.3