From 045c46e4891afefd6d1d9d8988f1416eacd3de1b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 25 三月 2022 14:44:49 +0800
Subject: [PATCH] #杰克缝纫机立库 【根据单号检索单据数据】 优化
---
src/main/java/com/zy/asrs/controller/MobileController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4f3b62b..b14651c 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -7,10 +7,13 @@
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.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.common.model.MobileLocDetlVo;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,6 +39,27 @@
private LocMastService locMastService;
@Autowired
private LocDetlService locDetlService;
+ @Autowired
+ private OrderService orderService;
+
+ /**
+ * 鏍规嵁鍗曞彿妫�绱㈠崟鎹暟鎹�
+ */
+ @RequestMapping("/order/serach/orderNo/auth")
+ @ManagerAuth
+ public R orderSearchByBarcode(@RequestParam String orderNo){
+ Order order = orderService.selectByNo(orderNo);
+ if (order.getSettle() > 2) {
+ return R.ok();
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (Cools.isEmpty(orderDetls)) {
+ return R.ok();
+ }
+ return R.ok().add(orderDetls);
+ }
+
+
/**
* 缁勬墭
@@ -47,6 +71,7 @@
return R.ok();
}
+
/**
* 鏍规嵁搴撲綅鍙锋煡鎵惧簱瀛樻槑缁�
*/
@@ -56,7 +81,7 @@
@RequestParam(required = false)String matNo){
if (!Cools.isEmpty(locNo)) {
LocMast locMast = locMastService.selectById(locNo);
- if (null == locMast || !"F".equals(locMast.getLocType())) {
+ if (null == locMast || !"F".equals(locMast.getLocSts())) {
return R.parse(BaseRes.EMPTY);
}
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
--
Gitblit v1.9.1