From 9d6a02b54ea894771c48ff660d86b48990eccb7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 09 八月 2025 09:48:03 +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 | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 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 6a0bc81..9210137 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
@@ -27,6 +27,7 @@
import com.zy.asrs.wms.system.service.UserService;
import io.jsonwebtoken.lang.Collections;
import io.netty.util.internal.StringUtil;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -65,6 +66,7 @@
* @param barcode
* @return
*/
+ @ApiOperation("鍏ュ簱鍗曟嵁--鎵爜鑾峰彇璁㈠崟鏄庣粏鍒楄〃")
@PostMapping("/mat/auth")
public R getProductForBarcode(@RequestBody Map<String, String> barcode) {
if (Objects.isNull(barcode)) {
@@ -79,7 +81,9 @@
return R.error("璁㈠崟涓嶅瓨鍦紒");
}
- List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());
+
+
+ List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId() , barcode.get("matnr"));
return R.ok(orders);
}
@@ -283,6 +287,32 @@
}
+ @ApiOperation("鑾峰彇搴撲綅璇︾粏")
+ @GetMapping("/flat/transfer/{barcode}")
+ public R getDetlsBycode(@PathVariable String barcode) {
+ if (Objects.isNull(barcode)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok().add(mobileService.getDetlsByCode(barcode));
+ }
+
+
+ @ApiOperation("骞虫澘杞Щ")
+ @PostMapping("/locs/transfer")
+ public R changeFlatBarcode(@RequestBody Map<String, String> param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (Objects.isNull(param.get("barcode"))) {
+ return R.error("婧愬簱浣嶄笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.get("tarCode"))) {
+ return R.error("鐩爣搴撲綅涓嶈兘涓虹┖锛侊紒");
+ }
+
+ return mobileService.transferLocs(param);
+ }
+
/**
* 鑾峰彇鍙戣揣璁㈠崟鏄庣粏
* @return
@@ -302,7 +332,7 @@
* @description: 鑾峰彇鎺ㄨ崘搴撲綅
* @version 1.0
*/
- @PostMapping("/recommend/locs")
+ @GetMapping("/recommend/locs")
public R getRecommend() {
return mobileService.getRecommendLocs();
}
@@ -329,6 +359,7 @@
if (params.isEmpty()) {
throw new CoolException("鍙戣揣鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
}
+
return mobileService.confirmShippingDetl(params);
}
}
--
Gitblit v1.9.1