From d77d9ff80f5fd8cd70c775fbfc30dc27061bfad2 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 09:13:06 +0800
Subject: [PATCH] 增加缠膜机交互和修改满放和空取程序

---
 Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs |   72 ++++++++++++++++++++++++++++++++++--
 1 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
index 6de853a..467a690 100644
--- a/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/DemoOpenApi.cs
@@ -85,7 +85,7 @@
                 result.Msg = "浠诲姟:" + models.TaskNo + ";宸插瓨鍦�!";
                 return result;
             }
-            if (models.TaskType == "0")
+            if (models.TaskType == "0" && models.TaskType == "0")
             {
                 models.Order = 1;
             }
@@ -93,11 +93,30 @@
             {
                 models.Order = 2;
             }
+            Enum type;
+            var bale = "0";
+            if (models.TaskType == "0" )
+            {
+                type = TaskTypeEnum.In;
+            }
+            else if (models.TaskType == "1")
+            {
+                type = TaskTypeEnum.Out;
+            }
+            else if (models.TaskType == "3")
+            {
+                type = TaskTypeEnum.In;
+                bale = "1";//瑁瑰寘
+            }
+            else
+            {
+                type = TaskTypeEnum.Move;
+            }
             //鏂板浠诲姟
             var taskAdd = new WcsTask()
             {
                 TaskNo = models.TaskNo,
-                TaskType = TaskTypeEnum.Out,
+                TaskType = (TaskTypeEnum?)type,
                 Status = TaskStatusEnum.Wait,
                 //IsSuccess =TaskSuccessEnum.Success,
                 Levels = 999,
@@ -107,6 +126,8 @@
                 EndLocate = models.EndLocate,
                 EndRoadway= models.EndRoadway,
                 PalletNo = models.PalletNo,
+                IsBale = bale,
+
 
                 //LotNo =models.LotNo,
                 //SkuNo=models.SkuNo,
@@ -210,7 +231,7 @@
                 }
                 if (item.DelistList2.Count == 0)
                 {
-                    throw new Exception("鍊肩爜闆嗗悎涓嶈兘涓虹┖");
+                    throw new Exception("鏀爜闆嗗悎涓嶈兘涓虹┖");
                 }
                 //浜岀骇鐮�
                 foreach (var item2 in item.DelistList2)
@@ -227,6 +248,11 @@
                     {
                         throw new Exception("鐢熶骇鏃ユ湡鎴栧け鏁堟棩鏈熸牸寮忛敊璇�");
                     };
+                    DateTime? stortime = null;
+                    if (!string.IsNullOrWhiteSpace(models.StoreTime))
+                    {
+                        stortime = DateTime.Parse(models.StoreTime);
+                    }
 
                     var boxAdd = new WcsBoxInfo()
                     {
@@ -244,7 +270,7 @@
                         //InspectStatus = models.InspectStatus锛�
                         ProductionTime = proTime,
                         ExpirationTime = expTime,
-                        StoreTime = DateTime.Parse(models.StoreTime),
+                        StoreTime = stortime,
                         EndLotFlag = string.IsNullOrWhiteSpace(models.EndBatchMark) ? "0" : models.EndBatchMark,
 
                         BoxNo2 = item.BoxNo2,
@@ -276,4 +302,42 @@
         }
     }
 
+    /// <summary>
+    /// WCS鎺ュ彈璧嬬爜绯荤粺鎺ㄩ�佺殑绠辩爜绉婚櫎
+    /// </summary>
+    /// <param name="models">绠辩爜淇℃伅</param>
+    /// <returns>鍙嶉淇℃伅</returns>
+    [HttpPost]
+    [AllowAnonymous]
+    public ResponseFuMaModel DelgatesHttpBoxInfo(FumaBoxInfoInput models)
+    {
+
+        try
+        {
+            string str = JsonConvert.SerializeObject(models);
+            Log.Information("鎺ユ敹璧嬬爜鎺ㄩ�佺殑绠辩爜绉婚櫎锛�" + str);
+            var num = _db.Queryable<WcsBoxInfo>().Where(m => m.BoxNo == models.BoxNo && m.IsDelete == false).ToList();
+            if (num.Count > 0)
+            {
+                //WCS瀛樺湪绠辩爜淇℃伅锛屾洿鏂扮鐮佷俊鎭�(闇�鍒ゆ柇绠辩爜鏄惁宸茬粍鐩樺叆搴�)
+                var num2 = num.Count(m => m.Status != "0" || !string.IsNullOrWhiteSpace(m.PalletNo));
+                if (num2 > 0)
+                {
+                    throw new Exception("璇ョ宸茬洏鍏ュ簱锛屼笉鍙洿鏂颁俊鎭�");
+                }
+            }
+            if (num.Count == 0)
+            {
+                throw new Exception("鏈壘鍒拌绠辩爜锛岀鐮佺Щ闄ゅけ璐ワ紒");
+            }
+
+            _db.Deleteable(num).ExecuteCommand();
+            return new ResponseFuMaModel() { Success = "0", Message = "绉婚櫎绠辩爜鎴愬姛" };
+        }
+        catch (Exception ex)
+        {
+            return new ResponseFuMaModel() { Success = "-1", Message = ex.Message };
+        }
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.8.0