From 636a0e56fb705177dbd043a90e47c4b8be20f8fc Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 24 十二月 2024 10:01:30 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e920e33-148d-49c7-8f92-7c522736eb31.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 134 ++++++++------------------------------------
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs | 9 +-
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs | 10 ++-
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs | 18 +++---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 2
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/83e3b476-d887-46bd-be7e-12e5279adff6.vsidx | 0
8 files changed, 45 insertions(+), 128 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e920e33-148d-49c7-8f92-7c522736eb31.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e920e33-148d-49c7-8f92-7c522736eb31.vsidx"
new file mode 100644
index 0000000..25979e6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/1e920e33-148d-49c7-8f92-7c522736eb31.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/83e3b476-d887-46bd-be7e-12e5279adff6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/83e3b476-d887-46bd-be7e-12e5279adff6.vsidx"
new file mode 100644
index 0000000..21f3698
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/83e3b476-d887-46bd-be7e-12e5279adff6.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock"
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
index b0274d6..e2a252e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -10,139 +10,55 @@
public enum TaskTypeEnum
{
/// <summary>
- /// 搴撳唴绉诲簱
+ /// 棰嗘枡鍑哄簱
/// </summary>
- [Description("搴撳唴绉诲簱")]
- Relocation = 300,
- /// <summary>
- /// 搴撳绉诲簱
- /// </summary>
- [Description("搴撳绉诲簱")]
- RelocationIn = 301,
- /// <summary>
- /// 鍏ュ簱
- /// </summary>
- [Description("鍏ュ簱")]
- Inbound = 1050,
- /// <summary>
- /// 鐩樼偣鍏ュ簱
- /// </summary>
- [Description("鐩樼偣鍏ュ簱")]
- InInventory = 1100,
- /// <summary>
- /// 鍒嗘嫞鍏ュ簱
- /// </summary>
- [Description("鍒嗘嫞鍏ュ簱")]
- InPick = 1150,
- /// <summary>
- /// 璐ㄦ鍏ュ簱
- /// </summary>
- [Description("璐ㄦ鍏ュ簱")]
- InQuality = 1200,
- /// <summary>
- /// 娴嬭瘯鏋跺叆搴�
- /// </summary>
- [Description("娴嬭瘯鏋跺叆搴�")]
- TestInbound = 2000,
- /// <summary>
- /// 娌瑰ⅷ浠撳叆搴�
- /// </summary>
- [Description("娌瑰ⅷ浠撳叆搴�")]
- PrintingInbound = 2050,
- /// <summary>
- /// 杈呮枡浠撳叆搴�
- /// </summary>
- [Description("杈呮枡浠撳叆搴�")]
- AccessoryInbound = 2100,
- /// <summary>
- /// 鏉挎枡浠撳叆搴�
- /// </summary>
- [Description("鏉挎枡浠撳叆搴�")]
- SheetInbound = 2150,
- /// <summary>
- /// 骞茶啘浠撳叆搴�
- /// </summary>
- [Description("骞茶啘浠撳叆搴�")]
- DryfilmInbound = 2200,
- /// <summary>
- /// PP浠撳叆搴�
- /// </summary>
- [Description("PP浠撳叆搴�")]
- PPInbound = 2250,
- /// <summary>
- /// 鎴愬搧浠撳叆搴�
- /// </summary>
- [Description("鎴愬搧浠撳叆搴�")]
- ProductInbound = 2300,
- /// <summary>
- /// 闃荤剨浠撳叆搴�
- /// </summary>
- [Description("闃荤剨浠撳叆搴�")]
- SolderInbound = 2350,
- /// <summary>
- /// 娴嬭瘯鏋堕��搴�
- /// </summary>
- [Description("娴嬭瘯鏋堕��搴�")]
- TestBackbound=2400,
- /// <summary>
- /// 鍑哄簱
- /// </summary>
- [Description("鍑哄簱")]
- Outbound = 3000,
+ [Description("棰嗘枡鍑哄簱")]
+ Outbound = 100,
/// <summary>
/// 鐩樼偣鍑哄簱
/// </summary>
[Description("鐩樼偣鍑哄簱")]
- OutInventory = 3050,
+ OutInventory = 110,
/// <summary>
/// 鍒嗘嫞鍑哄簱
/// </summary>
[Description("鍒嗘嫞鍑哄簱")]
- OutPick = 3100,
+ OutPick = 120,
/// <summary>
/// 璐ㄦ鍑哄簱
/// </summary>
[Description("璐ㄦ鍑哄簱")]
- OutQuality = 3150,
+ OutQuality = 130,
/// <summary>
- /// 娴嬭瘯鏋跺嚭搴�
+ /// 閲囪喘鍏ュ簱
/// </summary>
- [Description("娴嬭瘯鏋跺嚭搴�")]
- TestOutbound = 4000,
+ [Description("閲囪喘鍏ュ簱")]
+ Inbound = 510,
/// <summary>
- /// 娌瑰ⅷ浠撳嚭搴�
+ /// 鐩樼偣鍏ュ簱
/// </summary>
- [Description("娌瑰ⅷ浠撳嚭搴�")]
- PrintingOutbound = 4050,
+ [Description("鐩樼偣鍏ュ簱")]
+ InInventory = 520,
/// <summary>
- /// 杈呮枡浠撳嚭搴�
+ /// 鍒嗘嫞鍏ュ簱
/// </summary>
- [Description("杈呮枡浠撳嚭搴�")]
- AccessoryOutbound = 4100,
+ [Description("鍒嗘嫞鍏ュ簱")]
+ InPick = 530,
/// <summary>
- /// 鏉挎枡浠撳嚭搴�
+ /// 璐ㄦ鍏ュ簱
/// </summary>
- [Description("鏉挎枡浠撳嚭搴�")]
- SheetOutbound = 4150,
+ [Description("璐ㄦ鍏ュ簱")]
+ InQuality = 540,
/// <summary>
- /// 骞茶啘浠撳嚭搴�
+ /// 鐢熶骇閫�鏂�
/// </summary>
- [Description("骞茶啘浠撳嚭搴�")]
- DryfilmOutbound = 4200,
+ [Description("鐢熶骇閫�鏂�")]
+ ProductionReturn = 550,
/// <summary>
- /// PP浠撳嚭搴�
+ /// 宸烽亾鍐呯Щ搴�
/// </summary>
- [Description("PP浠撳嚭搴�")]
- PPOutbound = 4250,
- /// <summary>
- /// 鎴愬搧浠撳嚭搴�
- /// </summary>
- [Description("鎴愬搧浠撳嚭搴�")]
- ProductOutbound = 4300,
- /// <summary>
- /// 闃荤剨浠撳嚭搴�
- /// </summary>
- [Description("闃荤剨浠撳嚭搴�")]
- SolderOutbound = 4350,
+ [Description("宸烽亾鍐呯Щ搴�")]
+ Relocation = 900
+
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index daedf38..263037e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -39,7 +39,7 @@
{
ITaskRepository Repository { get; }
- WebResponseContent PushTasksToWCS();
+ WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription = "");
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟(PDA浣跨敤锛屼粎鎵樼洏缁戝畾鍏ュ簱绔欏彴锛屼笉鍒嗛厤璐т綅)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
index d6a30ef..fa1ada2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/MesTaskService.cs"
@@ -64,7 +64,7 @@
SourceAddress = stockInfo.LocationCode,
TargetAddress = "",
TaskStatus = (int)TaskStatusEnum.New,
- TaskType = (int)TaskTypeEnum.TestOutbound,
+ TaskType = (int)TaskTypeEnum.Outbound,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
PalletType = stockInfo.PalletType,
WarehouseId = stockInfo.WarehouseId,
@@ -86,7 +86,7 @@
//_recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfoDetails, beforeQuantity, totalQuantity, StockChangeTypeEnum.MaterielGroup);
_unitOfWorkManage.CommitTran();
//灏嗕换鍔℃帹閫佸埌WCS
- PushTasksToWCS();
+ PushTasksToWCS(new List<Dt_Task>() { taskOut },"AGV");
responseContent.OK();
}
catch (Exception ex)
@@ -127,7 +127,7 @@
SourceAddress = backModel.SourceAddressCode,
TargetAddress = "",
TaskStatus = (int)TaskStatusEnum.New,
- TaskType = (int)TaskTypeEnum.TestBackbound,
+ TaskType = (int)TaskTypeEnum.Outbound,
TaskNum = BaseDal.GetTaskNum(nameof(SequenceEnum.SeqTaskNum)),
PalletType = stockInfo.PalletType,
WarehouseId = stockInfo.WarehouseId,
@@ -137,8 +137,7 @@
_unitOfWorkManage.BeginTran();
_stockRepository.StockInfoRepository.UpdateData(stockInfo);
_unitOfWorkManage.CommitTran();
- //灏嗕换鍔℃帹閫佸埌WCS
- PushTasksToWCS();
+
responseContent.OK();
}
catch (Exception ex)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
index 00206f2..008afe2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs"
@@ -92,13 +92,15 @@
/// 浠诲姟淇℃伅鎺ㄩ�佽嚦WCS
/// </summary>
/// <returns></returns>
- public WebResponseContent PushTasksToWCS()
+ public WebResponseContent PushTasksToWCS(List<Dt_Task> tasks, string agvDescription="")
{
try
{
- List<Dt_Task> tasks = BaseDal.QueryData(x => (TaskTypes.Contains(x.TaskType) && x.TaskStatus == (int)TaskStatusEnum.New));
List<WMSTaskDTO> taskDTOs = _mapper.Map<List<WMSTaskDTO>>(tasks);
-
+ taskDTOs.ForEach(x =>
+ {
+ x.AGVArea = agvDescription;
+ });
string response = HttpHelper.Post("http://127.0.0.1:9291/api/Task/ReceiveTask", taskDTOs.Serialize());
return JsonConvert.DeserializeObject<WebResponseContent>(response) ?? WebResponseContent.Instance.Error("杩斿洖閿欒");
@@ -160,7 +162,7 @@
locationInfo.LocationStatus = LocationStatusEnum.InStock.ObjToInt();
//娴嬭瘯鏋跺叆搴撳簱瀛樼姸鎬�
- if (task.TaskType == TaskTypeEnum.TestInbound.ObjToInt())
+ if (task.TaskType == TaskTypeEnum.Outbound.ObjToInt())
{
stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚鏈缓鍑哄簱鍗�.ObjToInt();
stockInfo.Details.ForEach(x =>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
index 67ca56d..e53c4fa 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskInfo/TaskController.cs"
@@ -18,15 +18,15 @@
{
}
- /// <summary>
- /// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
- /// </summary>
- /// <returns></returns>
- [HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
- public WebResponseContent PushTasksToWCS()
- {
- return Service.PushTasksToWCS();
- }
+ ///// <summary>
+ ///// 灏哤MS浠诲姟鎺ㄩ�佽嚦WCS
+ ///// </summary>
+ ///// <returns></returns>
+ //[HttpPost, HttpGet, Route("PushTasksToWCS"), AllowAnonymous]
+ //public WebResponseContent PushTasksToWCS()
+ //{
+ // return Service.PushTasksToWCS();
+ //}
/// <summary>
/// 鐢宠鍏ュ簱浠诲姟
--
Gitblit v1.9.3