From 223cba9fa496be3174c047e122cbb85d6fa7764d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 03 七月 2025 09:56:56 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 c1c4935..e0a90c8 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
@@ -200,6 +200,8 @@
}
if (str.startsWith("PK")) {
ordersParam.setInType(OrderType.PK_IN_ORDER.id);
+ } else {
+ ordersParam.setInType(OrderType.UTC_OUT_ORDER.id);
}
boolean result = mobileService.batchMergeOrders(ordersParam);
if (result) {
@@ -293,6 +295,31 @@
return mobileService.selectShippingDetl(params);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/6/28
+ * @description: 鑾峰彇鎺ㄨ崘搴撲綅
+ * @version 1.0
+ */
+ @GetMapping("/recommend/locs")
+ public R getRecommend() {
+ return mobileService.getRecommendLocs();
+ }
+
+
+ /**
+ * @author Ryan
+ * @date 2025/6/28
+ * @description: 鏌ヨ鐗╂枡淇℃伅
+ * @version 1.0
+ */
+ @GetMapping("/mats/search/{matnr}")
+ public R getMats(@PathVariable String matnr) {
+ return mobileService.getMatsByCode(matnr);
+ }
+
+
/**
* 纭鍙戣揣鍗曟槑缁�
* @return
--
Gitblit v1.9.1