From c50c03326511330d50a0d8bc64b560fccb5c72be Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 九月 2023 10:36:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MobileController.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 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..8683a42 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -145,7 +145,7 @@
}
@RequestMapping("/wrkDetl/search/batch/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
return R.error("鍙傛暟涓虹┖");
@@ -170,27 +170,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();
}
--
Gitblit v1.9.1