From 07cdd2d370db314d237acb828c76283f1d1f4afd Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 31 十二月 2024 20:25:41 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index cb1c1dc..afc4f30 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -12,8 +12,10 @@
import com.zy.asrs.wms.asrs.service.MobileService;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.system.controller.BaseController;
+import com.zy.asrs.wms.system.entity.Host;
import com.zy.asrs.wms.system.entity.User;
import com.zy.asrs.wms.system.entity.UserLogin;
+import com.zy.asrs.wms.system.service.HostService;
import com.zy.asrs.wms.system.service.UserLoginService;
import com.zy.asrs.wms.system.service.UserService;
import io.jsonwebtoken.lang.Collections;
@@ -30,7 +32,6 @@
@Value("${super.pwd}")
private String superPwd;
-
@Autowired
private UserService userService;
@Autowired
@@ -40,6 +41,15 @@
@Autowired
private MobileService mobileService;
+ /**
+ * 鑾峰彇鐢ㄦ埛鏈烘瀯
+ * @return
+ */
+ @GetMapping("/current/host")
+ public R getUserHost() {
+ List<Host> hosts = mobileService.getHosts();
+ return R.ok(hosts);
+ }
/**
* 鍏ュ簱鍗曟嵁--鎵爜鑾峰彇璁㈠崟鏄庣粏鍒楄〃
@@ -56,9 +66,9 @@
if (!(order.getOrderType() == 1)) {
return R.error("闈炲叆搴撹鍗曪紝 涓嶅彲鎿嶄綔锛侊紒");
}
- if (order.getOrderSettle() > 2) {
- return R.error("鍗曟嵁褰撳墠鐘舵�佷笉鍙仛鍏ュ簱鎿嶄綔锛侊紒");
- }
+// if (order.getOrderSettle() > 2) {
+// return R.error("鍗曟嵁褰撳墠鐘舵�佷笉鍙仛鍏ュ簱鎿嶄綔锛侊紒");
+// }
List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());
return R.ok(orders);
@@ -130,4 +140,5 @@
return R.ok("缁勬墭澶辫触锛侊紒");
}
}
+
}
--
Gitblit v1.9.1