From cacd32ecf49438a3417d9dfc7e78ba24b4ea5f92 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期六, 09 四月 2022 14:15:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 11 ++++++++++-
src/main/java/com/zy/asrs/controller/MobileController.java | 19 +++++++++++--------
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 760253c..ef13ebd 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -5,15 +5,9 @@
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.LocMast;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
-import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.MobileService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +35,8 @@
private LocDetlService locDetlService;
@Autowired
private OrderService orderService;
+ @Autowired
+ private DocTypeService docTypeService;
/**
* 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
@@ -50,6 +46,13 @@
@ManagerAuth
public R orderSearchByBarcode(@RequestParam String orderNo){
Order order = orderService.selectByNo(orderNo);
+ if (order == null) {
+ return R.ok();
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1) {
+ return R.ok();
+ }
if (order.getSettle() > 2) {
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 99e4332..7edb05f 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -57,7 +57,7 @@
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/default/v1")
+ @PostMapping("/order/pakin/new/default/v1")
@Transactional
public synchronized R orderCreate(@RequestHeader(required = false) String appkey,
@RequestBody OpenOrderPakinParam param) {
@@ -155,6 +155,15 @@
return R.ok();
}
+ /**
+ * 鍏ュ簱鍗曞洖鍐�
+ */
+ @PostMapping("/order/pakin/complete/default/v1")
+ @Transactional
+ public synchronized R orderComplete(@RequestHeader(required = false) String appkey) {
+ auth(appkey, null);
+ return R.ok();
+ }
/**
* 搴撳瓨缁熻
--
Gitblit v1.9.1