From 5a06c9a6923fde7889ac33d84de74f5e64b67bb8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 27 二月 2025 19:21:46 +0800
Subject: [PATCH] #修改 集货区绑定可流动问题修复
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 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 d17bb24..9179179 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
@@ -16,6 +16,7 @@
import com.zy.asrs.wms.asrs.entity.WaitPakin;
import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
+import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.PageRequest;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
@@ -73,10 +74,17 @@
*/
@PostMapping("/mat/auth")
public R getProductForBarcode(@RequestBody Map<String, String> barcode) {
+ if (Objects.isNull(barcode)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
if (StringUtil.isNullOrEmpty(barcode.get("barcode"))) {
return R.error("鏉＄爜涓嶈兘涓虹┖锛侊紒");
}
Order order = orderService.selectByBarcode(barcode.get("barcode"));
+
+ if (Objects.isNull(order)) {
+ return R.error("璁㈠崟涓嶅瓨鍦紒");
+ }
List<OrderInfoDto> orders = orderService.getDetlForOrderId(order.getId());
@@ -239,7 +247,7 @@
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
if (Objects.isNull(param.get("barcode"))) {
- throw new CoolException("瀹瑰櫒缂栫爜涓嶈兘涓虹┖");
+ throw new CoolException("鎾澧欏鍣ㄧ紪鐮佷笉鑳戒负绌�");
}
if (Objects.isNull(param.get("orderNo"))) {
throw new CoolException("璁㈠崟缂栧彿涓嶈兘涓虹┖锛侊紒");
@@ -258,4 +266,31 @@
}
}
+
+ /**
+ * 鑾峰彇鍙戣揣璁㈠崟鏄庣粏
+ * @return
+ */
+ @PostMapping("/shipping/order/detl")
+ public R getOrderDetl(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.selectShippingDetl(params);
+ }
+
+ /**
+ * 纭鍙戣揣鍗曟槑缁�
+ * @return
+ */
+ @PostMapping("/shipping/confirm")
+ public R confirmShipping(@RequestBody List<ShippingOrderDetlDto> params) {
+ if (params.isEmpty()) {
+ throw new CoolException("鍙戣揣鍗曟槑缁嗕笉鑳戒负绌猴紒锛�");
+ }
+ return mobileService.confirmShippingDetl(params);
+ }
+
+
+
}
--
Gitblit v1.9.1