From 9b85a8b67aa6354ee9ea1a13c5799bf1c934922f Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 31 十月 2024 18:12:14 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 158 insertions(+), 18 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 0224c16..838dae2 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -1,22 +1,162 @@
-锘縩amespace WCS.Application;
+锘縰sing Elastic.Clients.Elasticsearch;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Text;
+using WCS.Application.Entity;
-///// <summary>
-///// 绀轰緥寮�鏀炬帴鍙�
-///// </summary>
-//[ApiDescriptionSettings("寮�鏀炬帴鍙�", Name = "Demo", Order = 100)]
+namespace WCS.Application;
+
+/// <summary>
+/// 绀轰緥寮�鏀炬帴鍙�
+/// </summary>
+[ApiDescriptionSettings("寮�鏀炬帴鍙�", Name = "Demo", Order = 100)]
//[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]
-//public class DemoOpenApi : IDynamicApiController
-//{
-// private readonly UserManager _userManager;
+[AllowAnonymous]
+public class DemoOpenApi : IDynamicApiController
+{
+ private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
-// public DemoOpenApi(UserManager userManager)
-// {
-// _userManager = userManager;
-// }
+ private readonly UserManager _userManager;
-// [HttpGet("helloWord")]
-// public Task<string> HelloWord()
-// {
-// return Task.FromResult($"Hello word. {_userManager.Account}");
-// }
-//}
\ No newline at end of file
+ public DemoOpenApi(UserManager userManager)
+ {
+ _userManager = userManager;
+ }
+
+ //[HttpGet("helloWord")]
+ //public Task<string> HelloWord()
+ //{
+ // 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 ResponseModel AddWcsTask(ResponseTasksModel models)
+ {
+ ResponseModel result = new ResponseModel();
+ try
+ {
+ // 楠岃瘉浠诲姟鏄惁宸插瓨鍦�
+ var taskInfo = _db.Queryable<WcsTask>().First(w => w.TaskNo == models.TaskNo);
+ if (taskInfo != null)
+ {
+ result.StatusCode = -1;
+ result.Msg = "浠诲姟:" + models.TaskNo + ";宸插瓨鍦�!";
+ return result;
+ }
+ if (models.TaskType == "0")
+ {
+ models.Order = 1;
+ }
+ else
+ {
+ models.Order = 2;
+ }
+ //鏂板浠诲姟
+ var taskAdd = new WcsTask()
+ {
+ TaskNo = models.TaskNo,
+ TaskType = TaskTypeEnum.Out,
+ Status = TaskStatusEnum.Wait,
+ //IsSuccess =TaskSuccessEnum.Success,
+ Levels = 999,
+ Origin = "WMS",
+ StartRoadway= models.StartRoadway,
+ StartLocate = models.StartLocate,
+ EndLocate = models.EndLocate,
+ EndRoadway= models.EndRoadway,
+ PalletNo = models.PalletNo,
+
+ //LotNo =models.LotNo,
+ //SkuNo=models.SkuNo,
+ //SkuName=models.SkuName,
+ //Qty=models.Qty
+ };
+ _db.Insertable(taskAdd).ExecuteCommand();
+
+ return new ResponseModel() { StatusCode = 0, Msg = "鎻掑叆鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
+ }
+ }
+
+ /// <summary>
+ /// WCS鎺ユ敹WMS涓嬪彂鐨勫叆搴撳崟浠诲姟
+ /// </summary>
+ /// <param name="models"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [AllowAnonymous]
+ public ResponseModel AddOrderTask(List<ResponseOrderTaskModel> models)
+ {
+ ResponseModel result = new ResponseModel();
+ try
+ {
+ foreach (var item in models)
+ {
+ // 楠岃瘉浠诲姟鏄惁宸插瓨鍦�
+ //var taskInfo = _db.Queryable<WcsOderTask>().First(w => w.OrderNo == item.OrderNo && w.SkuNo == item.SkuNo && w.LotNo == item.LotNo);
+ //if (taskInfo == null)
+ //{
+ var orderAdd = new WcsOderTask()
+ {
+ OrderNo = item.OrderNo,
+ TaskNo = "",
+ LotNo = item.LotNo,
+ SkuNo = item.SkuNo,
+ SkuName = item.SkuName,
+ BoxType = item.BoxType,
+ Qty = item.Qty,
+ TaskType = (TaskTypeEnum)item.TaskType,
+ };
+ _db.Insertable(orderAdd).ExecuteCommand();
+ //}
+ }
+ return new ResponseModel() { StatusCode = 0, Msg = "鎻掑叆鎴愬姛" };
+ }
+ catch (Exception ex)
+ {
+ return new ResponseModel() { StatusCode = -1, Msg = ex.Message };
+ }
+ }
+
+}
\ No newline at end of file
--
Gitblit v1.8.0