From 5cf0fe34b6ef60407e7e8802d3f756bed9d9b7ac Mon Sep 17 00:00:00 2001
From: yangyang
Date: 星期日, 29 六月 2025 16:23:51 +0800
Subject: [PATCH] 问题修复
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 39f9fe5..6a0bc81 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
@@ -13,6 +13,7 @@
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.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.service.MobileService;
@@ -151,7 +152,7 @@
return R.parse(CodeRes.USER_10003);
}
String system = null;//鐧婚檰绯荤粺
- if (wms) {
+ if (Objects.isNull(wms) || wms) {
system = String.valueOf(LoginSystemType.WMS);
}else {
system = String.valueOf(LoginSystemType.WCS);
@@ -174,6 +175,12 @@
}
+ /**
+ * @author Ryan
+ * @date 2025/6/25
+ * @description: 缁勬墭
+ * @version 1.0
+ */
@PostMapping("/comb/auth")
public R combMats(@RequestBody BatchMergeOrdersParam ordersParam) {
if (StringUtil.isNullOrEmpty(ordersParam.getOrderNo())) {
@@ -187,11 +194,15 @@
}
String str = ordersParam.getMergeNo().trim();
- // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ // CTU搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
if (str.charAt(0) == 'T') {
ordersParam.setMergeNo(str.substring(str.length() - 10));
}
-
+ 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) {
return R.ok("缁勬墭鎴愬姛锛侊紒");
@@ -284,6 +295,31 @@
return mobileService.selectShippingDetl(params);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/6/28
+ * @description: 鑾峰彇鎺ㄨ崘搴撲綅
+ * @version 1.0
+ */
+ @PostMapping("/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
@@ -295,7 +331,4 @@
}
return mobileService.confirmShippingDetl(params);
}
-
-
-
}
--
Gitblit v1.9.1