From ccf149086fc5f568e3ee7289c2426a6bbb2a31c7 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期三, 17 七月 2024 08:47:01 +0800
Subject: [PATCH] # 出库确认
---
src/main/java/com/zy/asrs/controller/MobileController.java | 21 +++++++++++++--------
1 files changed, 13 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 c59642f..26bc198 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -215,7 +215,7 @@
@ManagerAuth(memo = "鍑哄簱纭鑾峰彇淇℃伅")
public R wrkDetlSearchByBatch(@RequestBody String batch){
if (Cools.isEmpty(batch)){
- return R.error().add("鍙傛暟涓虹┖");
+ return R.error("鍙傛暟涓虹┖");
}
String[] batch1 = batch.split("绠卞彿锛�");
String[] batch2 = batch1[1].split("瑙勬牸锛�");
@@ -227,7 +227,7 @@
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("鏈煡鍒版暟鎹�");
+ return R.error("鏈煡鍒版暟鎹�");
}
wrkDetl = new WrkDetl();
wrkDetl.sync(wrkDetlLog);
@@ -236,7 +236,7 @@
wrkDetl.setDeadTime(wrkDetlLog.getDeadTime());
}
if (Cools.isEmpty(wrkDetl)){
- return R.error().add("鏈煡鍒版暟鎹�");
+ return R.error("鏈煡鍒版暟鎹�");
}
return R.ok().add(wrkDetl);
}
@@ -246,7 +246,7 @@
public R orderSearchByBatch(@RequestBody String batch){
try{
if (Cools.isEmpty(batch)){
- return R.error().add("鍙傛暟涓虹┖");
+ return R.error("鍙傛暟涓虹┖");
}
// String[] batch1 = batch.split("绠卞彿锛�");
// String[] batch2 = batch1[1].split("瑙勬牸锛�");
@@ -258,23 +258,28 @@
// 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("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
+ return R.error("鏈煡鍒版暟鎹�:宸ヤ綔鏄庣粏涓虹┖");
}
orderNo=wrkDetlLog.getOrderNo();
}else {
+ if (wrkDetl.getDeadTime().equals("宸茬‘璁�")) {
+ return R.error("褰撳墠浠诲姟宸茬‘璁わ紝璇烽噸缃紒");
+ }
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().add("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo);
+ return R.error("鏈煡鍒版暟鎹�:璁㈠崟鏄庣粏涓虹┖"+orderNo);
}
if (!orderDetl.getQty$().equals("宸插畬鎴�")){
- return R.error().add("浠诲姟鏈畬鎴�");
+ return R.error("浠诲姟鏈畬鎴�");
}
if (!Cools.isEmpty(orderDetl.getSource()) && orderDetl.getSource()==1){
- return R.error().add("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
+ return R.error("浠诲姟宸茬‘璁わ紝璇峰嬁閲嶅纭锛侊紒锛�");
}
+ wrkDetl.setSource(1);
+ wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()).eq("wrk_no",wrkDetl.getWrkNo()));
orderDetl.setSource(1);
orderDetlService.updateById(orderDetl);
return R.ok();
--
Gitblit v1.9.1