From f3c59a17062fb0a89b5f89b7845341386952a6b1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 24 九月 2025 16:01:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
index 72c6997..30371e6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/WmsPushCloudController.java
@@ -10,6 +10,7 @@
 import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
 import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
 import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.core.wms.model.response.WmsCarInParkDataResponse;
 import com.doumee.service.business.third.WmsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +20,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * @author 姹熻箘韫�
@@ -101,6 +104,9 @@
         }
         return result;
     }
+
+
+
     @ApiOperation("銆怶MS銆戞帹閫佸彇娑堝嚭搴撳崟閫氱煡浠诲姟")
     @LoginNoRequired
     @PostMapping("/push/cancelOutbound")
@@ -144,4 +150,28 @@
         return result;
     }
 
+
+
+
+    @ApiOperation("銆怶MS銆戣幏鍙栬溅杈嗘槸鍚﹀叆鍥�")
+    @LoginNoRequired
+    @PostMapping("/push/carInParkInfo")
+    public WmsBaseResponse carInParkInfo(@RequestBody WmsBaseRequest<String> param) {
+        int success = Constants.ZERO;
+        WmsBaseResponse result = null;
+        try {
+            result = wmsService.getCarInPark(param);
+        }catch (BusinessException e){
+            log.error("銆怶MS銆戣幏鍙栬溅杈嗘槸鍚﹀叆鍥�===澶辫触锛�"+e.getMessage());
+            success = Constants.ONE;
+        }catch (Exception e){
+            log.error("銆怶MS銆戣幏鍙栬溅杈嗘槸鍚﹀叆鍥�===澶辫触锛�"+e.getMessage());
+            e.printStackTrace();
+            success = Constants.ONE;
+        }finally {
+            wmsService.saveInterfaceLog("/wms/push/carInParkInfo", "鑾峰彇杞﹁締鏄惁鍏ュ洯",JSONObject.toJSONString(param),
+                    success, JSONObject.toJSONString(result),Constants.ONE);
+        }
+        return result;
+    }
 }

--
Gitblit v1.9.3