From a1c235841ddeef9159092a0c261dfc298058743c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 16 七月 2024 10:11:42 +0800
Subject: [PATCH] # 出库确认
---
src/main/java/com/zy/asrs/controller/MobileController.java | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 3b41da0..390c72f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -215,17 +215,19 @@
@ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
- return R.error("鍙傛暟涓虹┖");
+ return R.error().add("鍙傛暟涓虹┖");
}
String[] batch1 = batch.split("绠卞彿锛�");
String[] batch2 = batch1[1].split("瑙勬牸锛�");
- batch = batch2[0];
+ batch = batch2[0].replaceAll(" ", "");
// List<Order> orders = orderService.selectorderNoL(batch);
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
+// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetl)){
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
+// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
if (Cools.isEmpty(wrkDetlLog)){
- return R.error("鏈煡鍒版暟鎹�");
+ return R.error().add("鏈煡鍒版暟鎹�");
}
wrkDetl = new WrkDetl();
wrkDetl.sync(wrkDetlLog);
@@ -234,7 +236,7 @@
wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
}
if (Cools.isEmpty(wrkDetl)){
- return R.error("鏈煡鍒版暟鎹�");
+ return R.error().add("鏈煡鍒版暟鎹�");
}
return R.ok().add(wrkDetl);
}
@@ -242,37 +244,43 @@
@RequestMapping("/order/search/batch/auth")
@ManagerAuth(memo = "鍑哄簱纭")
public R orderSearchByBatch(@RequestBody String batch){
- if (Cools.isEmpty(batch)){
- return R.error("鍙傛暟涓虹┖");
- }
- String[] batch1 = batch.split("绠卞彿锛�");
- String[] batch2 = batch1[1].split("瑙勬牸锛�");
- batch = batch2[0];
- String orderNo = "";
- WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
- if (Cools.isEmpty(wrkDetl)) {
- WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
- if (Cools.isEmpty(wrkDetlLog)) {
- return R.error("鏈煡鍒版暟鎹�");
+ try{
+ if (Cools.isEmpty(batch)){
+ return R.error().add("鍙傛暟涓虹┖");
}
- orderNo=wrkDetlLog.getOrderNo();
- }else {
- orderNo=wrkDetl.getOrderNo();
- }
+// String[] batch1 = batch.split("绠卞彿锛�");
+// String[] batch2 = batch1[1].split("瑙勬牸锛�");
+// batch = batch2[0];
+ String orderNo = "";
+// WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetl wrkDetl = wrkDetlService.selectWrkDetlByOrderNoNotNull(batch);
+ if (Cools.isEmpty(wrkDetl)) {
+// WrkDetlLog wrkDetlLog = wrkDetlLogService.selectOne(new EntityWrapper<WrkDetlLog>().eq("batch", batch).and().ne("order_no","").and().isNotNull("order_no").orderBy("io_time",false));
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
+ if (Cools.isEmpty(wrkDetlLog)) {
+ return R.error().add("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
+ }
+ orderNo=wrkDetlLog.getOrderNo();
+ }else {
+ orderNo=wrkDetl.getOrderNo();
+ }
// 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("鏈煡鍒版暟鎹�");
+ OrderDetl orderDetl = orderDetlService.selectOne(new EntityWrapper<OrderDetl>().eq("batch", batch).eq("order_no",orderNo));
+ if (Cools.isEmpty(orderDetl)){
+ return R.error().add("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo);
+ }
+ if (!orderDetl.getQty$().equals("宸插畬鎴�")){
+ return R.error().add("浠诲姟鏈畬鎴�");
+ }
+ if (orderDetl.getSource()==1){
+ return R.error().add("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
+ }
+ orderDetl.setSource(1);
+ orderDetlService.updateById(orderDetl);
+ return R.ok();
+ } catch (Exception e){
+ return R.error().add(e.getMessage());
}
- if (!orderDetl.getQty$().equals("宸插畬鎴�")){
- return R.error("浠诲姟鏈畬鎴�");
- }
- if (orderDetl.getSource()==1){
- return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
- }
- orderDetl.setSource(1);
- orderDetlService.updateById(orderDetl);
- return R.ok();
}
// @RequestMapping("/truss/auth")
--
Gitblit v1.9.1