From e79cf581b2f0038a41de5da1c6eadb3541f4d69e Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期六, 28 九月 2024 08:10:13 +0800
Subject: [PATCH] 问题修改

---
 Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs |  104 +++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 90 insertions(+), 14 deletions(-)

diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 7d14fa9..bc403f1 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -1,6 +1,8 @@
-锘縰sing System.Diagnostics.CodeAnalysis;
+锘縰sing Elastic.Clients.Elasticsearch;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
 using System.Text;
-using WCS.Application.OpenApi.Dto;
+using WCS.Application.Entity;
 
 namespace WCS.Application;
 
@@ -9,6 +11,7 @@
 /// </summary>
 [ApiDescriptionSettings("寮�鏀炬帴鍙�", Name = "Demo", Order = 100)]
 //[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)]
+[AllowAnonymous]
 public class DemoOpenApi : IDynamicApiController
 {
     private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
@@ -26,32 +29,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 +103,58 @@
                 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 };
         }
     }
+
+    /// <summary>
+    /// WCS鎺ユ敹WMS涓嬪彂鐨勫叆搴撳崟浠诲姟
+    /// </summary>
+    /// <param name="models"></param>
+    /// <returns></returns>
+    [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