From 83b51a5a0774ea8ecb9a06304af3b956a21307c8 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期六, 08 三月 2025 09:06:55 +0800
Subject: [PATCH] CUT库条码T开头，截取后10位
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 49 insertions(+), 9 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..39f9fe5 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
@@ -1,9 +1,6 @@
package com.zy.asrs.wms.asrs.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.CodeRes;
import com.zy.asrs.common.domain.enums.LoginSystemType;
import com.zy.asrs.framework.annotations.ManagerAuth;
@@ -11,23 +8,20 @@
import com.zy.asrs.framework.common.R;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wms.asrs.entity.CacheSite;
-import com.zy.asrs.wms.asrs.entity.Loc;
import com.zy.asrs.wms.asrs.entity.Order;
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;
import com.zy.asrs.wms.asrs.service.MobileService;
import com.zy.asrs.wms.asrs.service.OrderService;
import com.zy.asrs.wms.asrs.service.WaitPakinService;
-import com.zy.asrs.wms.common.domain.BaseParam;
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;
@@ -35,7 +29,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
-import sun.nio.ch.IOStatus;
import java.util.*;
@@ -73,10 +66,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());
@@ -116,6 +116,13 @@
if (StringUtil.isNullOrEmpty(code)) {
return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
}
+
+ String str = code.trim();
+ // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ if (str.charAt(0) == 'T') {
+ code = str.substring(str.length() - 10);
+ }
+
List<WaitPakin> waitPakins = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, code));
return R.ok(waitPakins);
@@ -179,6 +186,12 @@
return R.error("璁㈠崟鏄庣粏涓嶈兘涓虹┖锛侊紒");
}
+ String str = ordersParam.getMergeNo().trim();
+ // CUT搴撴潯鐮乀寮�澶达紝鎴彇鍚�10浣�
+ if (str.charAt(0) == 'T') {
+ ordersParam.setMergeNo(str.substring(str.length() - 10));
+ }
+
boolean result = mobileService.batchMergeOrders(ordersParam);
if (result) {
return R.ok("缁勬墭鎴愬姛锛侊紒");
@@ -239,7 +252,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 +271,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