From 65770aa39d487c43ff342773c268367d597d3567 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 12 五月 2022 14:13:43 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4b690b8..f182e75 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -18,10 +18,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* 绉诲姩绔帴鍙ｆ帶鍒跺櫒
@@ -128,6 +125,30 @@
return R.ok();
}
+ @RequestMapping("/pakout/query/auth/v2")
+ @ManagerAuth
+ public R pakoutQueryV2(@RequestParam(required = false) String barcode,
+ @RequestParam(required = false) Integer staNo,
+ @RequestParam(required = false) String matnr){
+ if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
+ return R.ok();
+ }
+ if (!Cools.isEmpty(barcode)) {
+ WrkMast wrkMast = wrkMastService.selectByBarcode(barcode);
+ if (wrkMast != null) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ // 鍘婚櫎宸插嚭搴撶‘璁ょ殑鏄庣粏
+ wrkDetls.removeIf(wrkDetl -> wrkDetl.getInspect() == 1);
+ return R.ok().add(wrkDetls);
+ }
+ }
+ if (!Cools.isEmpty(matnr)) {
+ List<WrkDetl> wrkDetls = wrkDetlService.selectPakoutQuery(staNo, matnr);
+ return R.ok().add(wrkDetls);
+ }
+ return R.ok();
+ }
+
@RequestMapping("/pakout/confirm/auth")
@ManagerAuth
@Transactional
@@ -135,6 +156,11 @@
if (Cools.isEmpty(list)) {
return R.ok();
}
+
+ // todo:luxiaotao 鎷ｆ枡鍑哄簱鍙慨鏀瑰伐浣滄。鏄庣粏
+
+
+
Set<Integer> wrkNos = new HashSet<>();
for (WrkDetl wrkDetl : list) {
wrkNos.add(wrkDetl.getWrkNo());
--
Gitblit v1.9.1