From 113342593a17ecb75cd2f7f5af271a2528fd4a10 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 10:42:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 101 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 59d2898..a099f85 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -71,6 +71,13 @@
return R.ok("涓嬫灦鎴愬姛");
}
+ @RequestMapping("/search/sign/auth/v2")
+// @ManagerAuth(memo = "鎷嗗彔鐩樻ā寮忓垏鎹�")
+ public R orderSearchByBarcodeV2(@RequestParam boolean sign){
+ Integer signRu = 1;
+ return R.ok(signRu);
+ }
+
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -144,8 +151,60 @@
return R.ok().add(combParams);
}
+ @RequestMapping("/order/search/orderNo/auth/v2")
+ @ManagerAuth(memo = "閫�搴撳崟鑾峰彇")
+ public R orderSearchByBarcodeV2(@RequestParam String orderNo){
+ if (Cools.isEmpty(orderNo)){
+ orderNo=null;
+ }
+ List<Order> orders = orderService.selectorderNoL(orderNo);
+ if (Cools.isEmpty(orders)){
+ return R.ok();
+ }
+ LinkedList<CombParam> combParams = new LinkedList<>();
+ if (!Cools.isEmpty(orders)){
+ for (Order order:orders){
+ CombParam combParam=new CombParam();
+ if (order == null) {
+ continue;
+ }
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType.getPakin() == null || docType.getPakin() != 1 || !docType.getDocName().equals("閫�璐у叆搴撳崟")) {
+ continue;
+ }
+ if (order.getSettle() > 2) {
+ continue;
+ }
+ List<OrderDetl> orderDetls = orderService.selectWorkingDetls(order.getId());
+ if (!Cools.isEmpty(orderDetls)) {
+ LinkedList<CombParam.CombMat> combMats = new LinkedList<>();
+ for (OrderDetl orderDetl:orderDetls){
+ if (orderDetl.getWorkQty()!=0){
+ continue;
+ }
+ CombParam.CombMat combMat = new CombParam.CombMat();
+ combMat.setMatnr(orderDetl.getMatnr());
+ combMat.setBatch(orderDetl.getBatch());
+ combMat.setAnfme(orderDetl.getAnfme()-orderDetl.getWorkQty());
+ combMat.setMaktx(orderDetl.getMaktx());
+ combMat.setSpecs(orderDetl.getSpecs());
+ combMat.setWeight(orderDetl.getWeight());
+ combMats.add(combMat);
+ }
+ if (combMats.size()==0){
+ continue;
+ }
+ combParam.setCombMats(combMats);
+ }
+ combParam.setOrderNo(order.getOrderNo());
+ combParams.add(combParam);
+ }
+ }
+ return R.ok().add(combParams);
+ }
+
@RequestMapping("/wrkDetl/search/batch/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
@@ -170,27 +229,32 @@
}
@RequestMapping("/order/search/batch/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍑哄簱纭")
public R orderSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
}
-// List<Order> orders = orderService.selectorderNoL(batch);
+ String orderNo = "";
WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch));
- if (Cools.isEmpty(wrkDetl)){
+ if (Cools.isEmpty(wrkDetl)) {
WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch));
- if (Cools.isEmpty(wrkDetlLog)){
+ if (Cools.isEmpty(wrkDetlLog)) {
return R.error("鏈煡鍒版暟鎹�");
}
- wrkDetl = new WrkDetl();
- wrkDetl.sync(wrkDetlLog);
- wrkDetl.setBatch(wrkDetlLog.getBatch());
- wrkDetl.setBarcode(wrkDetlLog.getBarcode());
- wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
+ orderNo=wrkDetlLog.getOrderNo();
+ }else {
+ orderNo=wrkDetl.getOrderNo();
}
- if (Cools.isEmpty(wrkDetl)){
+// List<Order> orders = orderService.selectorderNoL(batch);
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
+ if (Cools.isEmpty(orderDetl)){
return R.error("鏈煡鍒版暟鎹�");
}
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error("浠诲姟鏈畬鎴�");
+ }
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
return R.ok();
}
@@ -201,13 +265,20 @@
return R.ok("缁勬墭鎴愬姛");
}
- @RequestMapping("/truss/comd/auth")
- @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
- public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
- mobileService.trussComb2(combParam, getUserId());
+ @RequestMapping("/truss/order/auth")
+ @ManagerAuth(memo = "閫�搴擄紝1妤兼鏋堕��搴擄紝閫�搴撳崟閫�搴�")
+ public R trussCombOrder(@RequestBody TrussCombParam combParam){
+ mobileService.trussCombOrder(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
+// @RequestMapping("/truss/comd/auth")
+// @ManagerAuth(memo = "鎵嬪姩鍏ュ簱锛�2妤兼棤闇�妗佹灦鎵嬪姩鍏ュ簱")
+// public R trussComb2(@RequestBody PalletizingCompleteParam combParam){
+// mobileService.trussComb2(combParam, getUserId());
+// return R.ok("缁勬墭鎴愬姛");
+// }
+
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
--
Gitblit v1.9.1