From 870ba727761c5e2d7a7b2a05d9b841f2d6ad4253 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 07 十一月 2023 08:09:57 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 2cc459f..56587e3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -83,6 +83,9 @@
@Autowired
private LocCheckService locCheckService;
+ @Autowired
+ private OrderCheckService orderCheckService;
+
@Override
@@ -902,7 +905,8 @@
EntityWrapper<LocCheck> wrapper = new EntityWrapper<>();
wrapper.eq("order_no", combParam.getOrderNo())
.eq("matnr", detl.getMatnr())
- .eq("loc_no", detl.getLocNo());
+ .eq("loc_no", detl.getLocNo())
+ .eq("batch",detl.getBatch());
LocCheck CheckDetl = locCheckService.selectOne(wrapper);
if (CheckDetl == null){
Date now = new Date();
@@ -920,6 +924,7 @@
locCheck.setCreateTime(now);
locCheck.setUpdateTime(now);
locCheck.setOrderNo(combParam.getOrderNo());
+ locCheck.setBatch(detl.getBatch());
if (!locCheckService.insert(locCheck)){
return R.error("鐩樼偣鏄庣粏鎻掑叆澶辫触");
@@ -937,6 +942,12 @@
}
+ OrderCheck orderCheck = orderCheckService.selectOne(new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo()));
+ orderCheck.setSettle(2L);
+ if (!orderCheckService.update(orderCheck,new EntityWrapper<OrderCheck>().eq("order_no", combParam.getOrderNo()))){
+ return R.error("鏇存柊鐩樼偣鍗曠姸鎬佸け璐ワ紒");
+ }
+
return R.ok("鐩樼偣鎴愬姛");
}
--
Gitblit v1.9.1