From e5f650ad8b4693cb9f7514808dbd8ee7ccf9b3d7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 16 七月 2024 17:09:48 +0800
Subject: [PATCH] # 出库确认
---
src/main/java/com/zy/asrs/controller/MobileController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 8eb092a..c59642f 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -219,12 +219,12 @@
}
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.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.selectWrkDetlByOrderNoNotNull(batch);
+ 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().add("鏈煡鍒版暟鎹�");
@@ -248,15 +248,15 @@
if (Cools.isEmpty(batch)){
return R.error().add("鍙傛暟涓虹┖");
}
- String[] batch1 = batch.split("绠卞彿锛�");
- String[] batch2 = batch1[1].split("瑙勬牸锛�");
- batch = batch2[0];
+// 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.selectWrkDetlByOrderNoNotNull(batch);
+ WrkDetlLog wrkDetlLog = wrkDetlLogService.selectWrkDetlLogByOrderNoNotNull(batch);
if (Cools.isEmpty(wrkDetlLog)) {
return R.error().add("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
}
@@ -272,14 +272,14 @@
if (!orderDetl.getQty$().equals("宸插畬鎴�")){
return R.error().add("浠诲姟鏈畬鎴�");
}
- if (orderDetl.getSource()==1){
+ if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
return R.error().add("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
}
orderDetl.setSource(1);
orderDetlService.updateById(orderDetl);
return R.ok();
} catch (Exception e){
- return R.error().add(e);
+ return R.error().add(e.getMessage());
}
}
--
Gitblit v1.9.1