From 2fdf959ac739edd6de84aa8053b8b9683dce8e8b Mon Sep 17 00:00:00 2001
From: zhao
Date: 星期三, 07 七月 2021 14:53:24 +0800
Subject: [PATCH] 中策下任务接口

---
 HH.WMS.WebApi/Controllers/WmsApiController.cs |   55 +++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 12 deletions(-)

diff --git a/HH.WMS.WebApi/Controllers/WmsApiController.cs b/HH.WMS.WebApi/Controllers/WmsApiController.cs
index 9f33b68..b1c87ec 100644
--- a/HH.WMS.WebApi/Controllers/WmsApiController.cs
+++ b/HH.WMS.WebApi/Controllers/WmsApiController.cs
@@ -48,12 +48,12 @@
         /// </summary>
         /// <returns></returns>
         /// <history>[HanHe(zh)] CREATED 2018/5/3</history>
-        [HttpPost]
-        public string InWorkArea(List<InWorkAreaEntity> inWorkAreaEntitys)
-        {
-            var result =  WmsApiBLLRoute.InWorkArea(inWorkAreaEntitys);
-            return result;
-        }
+        //[HttpPost]
+        //public string InWorkArea(List<InWorkAreaEntity> inWorkAreaEntitys)
+        //{
+        //    var result =  WmsApiBLLRoute.InWorkArea(inWorkAreaEntitys);
+        //    return result;
+        //}
 
         [HttpPost]
         public string ReturnWorkArea(List<InWorkAreaEntity> inWorkAreaEntitys)
@@ -1084,12 +1084,47 @@
         /// <param name="jsonData"></param>
         /// <returns></returns>
         [HttpPost]
-        public object ReceiveTask(dynamic jsonData)
+        public object InWorkArea(dynamic jsonData)
         {
             var logPara = LogType.LogPara("浠诲姟涓嬪彂");
-            Log.Detail(logPara, "HCZCSendTask:浠诲姟涓嬪彂浼犻�鍙傛暟锛� + jsonData.ToString());
 
             ZCReceiveTaskEntity sendTaskEntity = JsonConvert.DeserializeObject<ZCReceiveTaskEntity>(jsonData.ToString());
+
+            if(string.IsNullOrEmpty(sendTaskEntity.BUSI_TYPE))
+            {
+                Log.Detail(logPara, "ZCSendTask浠诲姟涓嬪彂澶辫触锛岀己灏戝弬鏁癇USI_TYPE銆� + jsonData.ToString());
+                return new
+                {
+                    success = false,
+                    code = -1,
+                    lastTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    message = "缂哄皯鍙傛暟BUSI_TYPE"
+                };
+            }
+            if (string.IsNullOrEmpty(sendTaskEntity.Location_From) && string.IsNullOrEmpty(sendTaskEntity.Location_To))
+            {
+                Log.Detail(logPara, "ZCSendTask浠诲姟涓嬪彂澶辫触锛岃捣鐐瑰拰缁堢偣鍚屾椂涓虹┖銆� + jsonData.ToString());
+                return new
+                {
+                    success = false,
+                    code = -1,
+                    lastTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    message = "缂哄皯璧风偣Location_From鎴栫粓鐐筁ocation_To"
+                };
+            }
+            if (string.IsNullOrEmpty(sendTaskEntity.task_no))
+            {
+                Log.Detail(logPara, "ZCSendTask浠诲姟涓嬪彂澶辫触锛岀己灏戝弬鏁皌ask_no銆� + jsonData.ToString());
+                return new
+                {
+                    success = false,
+                    code = -1,
+                    lastTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
+                    message = "缂哄皯鍙傛暟task_no"
+                };
+            }
+
+            Log.Detail(logPara, "ZCSendTask浠诲姟涓嬪彂浼犻�鍙傛暟锛� + jsonData.ToString());
 
             //璋冪敤ReceiveTask鏂规硶淇濆瓨鑷充腑闂村簱
             var result = BLLCreator.Create<WmsApiBaseBLL>().ReceiveTask(sendTaskEntity);
@@ -1103,9 +1138,5 @@
         }
 
         #endregion
-
-
-
-
     }
 }

--
Gitblit v1.9.1