From 59cf6b97399bc8c9fe39926fa13aa39cbd827270 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期六, 21 十二月 2024 15:39:01 +0800
Subject: [PATCH] 出库提取界面加搜索条件，提取出来包装一个木箱明细全部出来
---
src/main/java/com/zy/asrs/controller/MobileController.java | 52 ++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 42 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 69b722d..96b3c97 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -11,6 +11,8 @@
import com.zy.asrs.entity.param.*;
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.mapper.OrderMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.WrkDto;
import com.zy.common.web.BaseController;
@@ -18,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import java.util.*;
/**
@@ -54,6 +57,12 @@
private WrkDetlLogService wrkDetlLogService;
@Autowired
private RgvOneSignService rgvOneSignService;
+
+ @Resource
+ private OrderMapper orderMapper;
+
+ @Resource
+ private OrderDetlMapper orderDetlMapper;
// 鍟嗗搧涓婃灦
@@ -563,15 +572,11 @@
return mobileService.pdckqr(param);
}
-// @PostMapping("/pdtz/auth")
-// @ManagerAuth(memo = "鐩樼偣璋冩暣搴撳瓨")
-// public synchronized R pdtz(@RequestBody PdckqrParam param) {
-// // 鏍规嵁宸ヤ綔鍙风‘璁ゅ鏍�
-// if(Cools.isEmpty(param) || Cools.isEmpty(param.getBarcode()) || Cools.isEmpty(param.getMaterials())){
-// return R.parse(BaseRes.PARAM);
-// }
-// return mobileService.pdtz(param);
-// }
+ @PostMapping("/pdtz/auth")
+ @ManagerAuth(memo = "鐩樼偣寮傚父鎸夊疄鐗╄皟鏁村簱瀛樹俊鎭�")
+ public synchronized R pdtz(@RequestBody PdtzParam param) {
+ return mobileService.pdtz(param);
+ }
@PostMapping("/pdaWarehousingNow")
@ManagerAuth(memo = "pda缁勬墭绔嬪嵆鍏ュ簱")
@@ -588,9 +593,36 @@
@PostMapping("/pdaFxprk")
@ManagerAuth(memo = "pda鍙嶄慨鍝佸叆搴�")
- public synchronized R pdaFxprk(@RequestBody FxprkParam param) {
+ public synchronized R pdaFxprk(@RequestBody GwmsGenerateInventoryDto param) {
return mobileService.pdaFxprk(param, getUserId());
}
+ @PostMapping("/pdaFhhd")
+ @ManagerAuth(memo = "pda鍙戣揣鏍稿")
+ public synchronized R pdaFhhd(@RequestBody PdaDhhdParam param) {
+
+ if (Cools.isEmpty(param)) {
+ return R.parse("鍙傛暟鏈夎锛岃妫�鏌ュ弬鏁�");
+ }
+
+ return mobileService.pdaFhhd(param, getUserId());
+ }
+
+ @GetMapping("/getOrderNoList/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋ā绯婃煡璇㈠崟鎹�")
+ public synchronized R getOrderByLikeOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderMapper.selectOrderNosByOrderNoLike(orderNo));
+
+ }
+
+ @GetMapping("/getOrderDetlByOrderNo/{orderNo}")
+ @ManagerAuth(memo = "鎸夊崟鎹紪鍙锋煡璇㈠崟鎹槑缁�")
+ public synchronized R getOrderByOrderNo(@PathVariable("orderNo") String orderNo) {
+
+ return R.ok(orderDetlMapper.selectDetlList(orderNo));
+
+ }
+
}
--
Gitblit v1.9.1