From 6cf884fcafe6fa25e0a0eef35014bd7766d30bb6 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期三, 19 十一月 2025 19:44:41 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 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..1b3e918 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,20 @@
         }
 
         [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);
+        }
     }
 }

--
Gitblit v1.9.3