From 3d2f1d836cd271a51f0c02b99f538070a783139d Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 23 九月 2024 08:17:15 +0800
Subject: [PATCH] 增加WCS接受WMS下发任务的方法
---
/dev/null | 141 -----------------------------------
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 58 +++++++++++---
Admin.NET/WCS.Application/WCS.Application.csproj | 4 +
3 files changed, 49 insertions(+), 154 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 7d14fa9..e873ac5 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -1,6 +1,5 @@
锘縰sing System.Diagnostics.CodeAnalysis;
using System.Text;
-using WCS.Application.OpenApi.Dto;
namespace WCS.Application;
@@ -26,32 +25,65 @@
// return Task.FromResult($"Hello word. {_userManager.Account}");
//}
+ // <summary>
+ /// WCS鎺ュ彈WMS涓嬪彂鐨勪换鍔�(鍗曟潯浠诲姟)
+ /// </summary>
+ /// <param name="models">浠诲姟淇℃伅</param>
+ /// <returns>鍙嶉淇℃伅</returns>
+ [AllowAnonymous]
+ public ResponseModel AddWcsTasks(List<ResponseTasksModel> modelList)
+ {
+ ResponseModel result = new ResponseModel();
+ result.StatusCode = 0;
+ try
+ {
+ foreach (var models in modelList)
+ {
+ var res = AddWcsTask(models);
+ if (res.StatusCode == -1)
+ {
+ result.StatusCode = -1;
+ result.Msg = res.Msg;
+ }
+ else if (res.StatusCode == 0)
+ {
+ result.StatusCode = 0;
+ result.Msg = models.TaskNo + "浠诲姟" + res.Msg;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
+ }
+ return result;
+ }
/// <summary>
/// WCS鎺ュ彈WMS涓嬪彂鐨勪换鍔�(鍗曟潯浠诲姟)
/// </summary>
/// <param name="models">浠诲姟淇℃伅</param>
/// <returns>鍙嶉淇℃伅</returns>
[AllowAnonymous]
- public WCSResultModel AddWcsTask(WCSTasks models)
+ public ResponseModel AddWcsTask(ResponseTasksModel models)
{
- WCSResultModel result = new WCSResultModel();
+ ResponseModel result = new ResponseModel();
try
{
// 楠岃瘉浠诲姟鏄惁宸插瓨鍦�
var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == models.TaskNo);
if (taskInfo != null)
{
- result.StatusCode = "-1";
+ result.StatusCode = -1;
result.Msg = "浠诲姟:" + models.TaskNo + ";宸插瓨鍦�!";
return result;
}
- if (models.Type == "0")
+ if (models.TaskType == "0")
{
- models.Levels = "1.5";
+ models.Order = 1;
}
else
{
- models.Levels = "2";
+ models.Order = 2;
}
//鏂板浠诲姟
var taskAdd = new WcsTask()
@@ -67,18 +99,18 @@
EndRoadway= models.EndRoadway,
PalletNo = models.PalletNo,
- LotNo =models.LotNo,
- SkuNo=models.SkuNo,
- SkuName=models.SkuName,
- Qty=models.Qty
+ //LotNo =models.LotNo,
+ //SkuNo=models.SkuNo,
+ //SkuName=models.SkuName,
+ //Qty=models.Qty
};
_db.Insertable(taskAdd).ExecuteCommand();
- return new WCSResultModel() { StatusCode = "1", Msg = "鎻掑叆鎴愬姛" };
+ return new ResponseModel() { StatusCode = 0, Msg = "鎻掑叆鎴愬姛" };
}
catch (Exception ex)
{
- return new WCSResultModel() { StatusCode = "-1", Msg = ex.Message };
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
}
}
}
\ No newline at end of file
diff --git a/Admin.NET/WCS.Application/OpenApi/Dto/WCSResultModel.cs b/Admin.NET/WCS.Application/OpenApi/Dto/WCSResultModel.cs
deleted file mode 100644
index 6bfd3fb..0000000
--- a/Admin.NET/WCS.Application/OpenApi/Dto/WCSResultModel.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Application.OpenApi.Dto;
-public class WCSResultModel
-{
- /// <summary>
- /// 1:鎴愬姛 -1:澶辫触
- /// </summary>
- public string StatusCode { get; set; }
- public string Msg { get; set; }
-}
diff --git a/Admin.NET/WCS.Application/OpenApi/Dto/WCSTasks.cs b/Admin.NET/WCS.Application/OpenApi/Dto/WCSTasks.cs
deleted file mode 100644
index 33725a9..0000000
--- a/Admin.NET/WCS.Application/OpenApi/Dto/WCSTasks.cs
+++ /dev/null
@@ -1,141 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WCS.Application.OpenApi.Dto;
-/// <summary>
-/// 浠诲姟瀹炰綋绫�
-/// </summary>
-public class WCSTasks
-{
- public int? Id { get; set; }
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public string Type { get; set; }
- /// <summary>
- /// 鐘舵��
- /// </summary>
- public string Status { get; set; }
- /// <summary>
- /// 鏄惁鍥為鎴愬姛
- /// </summary>
- public int? IsSuccess { get; set; }
- /// <summary>
- /// 寮傚父淇℃伅
- /// </summary>
- public string Information { get; set; }
- /// <summary>
- /// 鏉ユ簮
- /// </summary>
- public string Origin { get; set; }
- /// <summary>
- /// 璧峰浣嶇疆
- /// </summary>
- public string StartLocat { get; set; }
- public string StartLocate { get; set; }
- /// <summary>
- /// 璧峰宸烽亾
- /// </summary>
- public string StartRoadway { get; set; }
-
- /// <summary>
- /// 鐩爣浣嶇疆
- /// </summary>
- public string EndLocate { get; set; }
- /// <summary>
- /// 鐩爣宸烽亾
- /// </summary>
- public string EndRoadway { get; set; }
- /// <summary>
- /// 鎵樼洏鍙�
- /// </summary>
- public string PalletNo { get; set; }
- /// <summary>
- /// 鎵樼洏绫诲瀷
- /// </summary>
- public string PalletType { get; set; }
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- public string LotNo { get; set; }
- /// <summary>
- /// 渚涜揣鎵规
- /// </summary>
- public string SupplierLot { get; set; }
- /// <summary>
- /// 鐗╂枡缂栫爜
- /// </summary>
- public string SkuNo { get; set; }
- /// <summary>
- /// 鐗╂枡鍚嶇О
- /// </summary>
- public string SkuName { get; set; }
-
- /// <summary>
- /// 鐗╂枡绫诲瀷
- /// </summary>
- public string SkuType { get; set; }
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- public int? Qty { get; set; }
- /// <summary>
- /// 鍙栨秷鏃堕棿
- /// </summary>
- public DateTime? CancelDate { get; set; }
- /// <summary>
- /// 瀹屾垚鏃堕棿
- /// </summary>
- public DateTime? FinishDate { get; set; }
- /// <summary>
- /// 鏈�鍚庡啓鍏ユ祦绋嬫帶鍒跺瓧鍊�
- /// </summary>
- public string WcsPosValue { get; set; }
- /// <summary>
- /// 浼樺厛绾�
- /// </summary>
- public string Levels { get; set; }
-
- /// <summary>
- /// 鏄惁瑁瑰寘
- /// </summary>
- public string IsBale { get; set; }
- /// <summary>
- /// 鏄惁鎵撳甫
- /// </summary>
- public string IsBelt { get; set; }
- /// <summary>
- /// 鏄惁鍚屾鍒癢MS
- /// </summary>
- public string SyncWms { get; set; }
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string Demo { get; set; }
- public string IsStacking1 { get; set; }
- public string IsStacking2 { get; set; }
- public string IsStacking3 { get; set; }
- public string Dismantling { get; set; }
- /// <summary>
- /// 鐗╂枡浠诲姟绫诲瀷
- /// </summary>
- public string TaskType { get; set; }
-
-
- public string IsDel { get; set; }
- public DateTime? TopTime { get; set; }
- public DateTime? CreateTime { get; set; }
- public int? CreateUser { get; set; }
- public DateTime? UpdateTime { get; set; }
- public int? UpdateUser { get; set; }
-
- public string OutMode { get; set; }
- public int Order { get; set; }
-}
\ No newline at end of file
diff --git a/Admin.NET/WCS.Application/WCS.Application.csproj b/Admin.NET/WCS.Application/WCS.Application.csproj
index 963419a..5d4d149 100644
--- a/Admin.NET/WCS.Application/WCS.Application.csproj
+++ b/Admin.NET/WCS.Application/WCS.Application.csproj
@@ -126,4 +126,8 @@
<ProjectReference Include="..\Admin.NET.Core\Admin.NET.Core.csproj" />
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="OpenApi\Dto\" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.8.0