From 266e4bf654c55ce2f7e9271048e4625f1b8b49f6 Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期一, 29 十二月 2025 14:36:08 +0800
Subject: [PATCH] Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu into htq20251215

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index 4c84613..76da4b1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -42,15 +42,32 @@
         }
 
         [HttpPost, Route("TTTTTAssignLocation"), AllowAnonymous, MethodParamsValidate]
-        public WebResponseContent TTTTTAssignLocation()
+        public WebResponseContent TTTTTAssignLocation(int locationType)
         {
 
-          
 
-            var sddd = Service.AssignLocation();
+
+            var sddd = Service.AssignLocation(locationType);
 
             return WebResponseContent.Instance.OK("resdasd", sddd);
         }
+        [HttpPost, Route("GetLocationTypes"), AllowAnonymous, MethodParamsValidate]
+        public WebResponseContent GetLocationTypes()
+        {
+            var lists = Service.GetLocationTypes();
+            return WebResponseContent.Instance.OK("", lists);
+        }
 
+        [HttpPost, Route("LocationDisableStatus")]
+        public WebResponseContent LocationDisableStatus([FromBody]int[] keys)
+        {
+            return Service.LocationDisableStatus(keys);
+        }
+
+        [HttpPost, Route("LocationEnableStatus")]
+        public WebResponseContent LocationEnableStatus([FromBody] int[] keys)
+        {
+            return Service.LocationEnableStatus(keys);
+        }
     }
 }

--
Gitblit v1.9.3