From ccfbcdf2a2ee13a7575bb7bbd0cbf5311df2827b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 09 九月 2025 19:00:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 39 ++++++++++++++++++++++++++-------------
1 files changed, 26 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index d2bf006..ddadca4 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -239,10 +239,10 @@
orders.forEach(order -> {
List<OrderDetl> detls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, order.getId()));
Double sum = detls.stream().mapToDouble(OrderDetl::getQty).sum();
- Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum();
- Double v = Math.round((sum + summed) * 1000) / 1000.0;
+// Double summed = detls.stream().mapToDouble(OrderDetl::getWorkQty).sum();
+// Double v = Math.round((sum ) * 1000) / 1000.0;
Double anfme = detls.stream().mapToDouble(OrderDetl::getAnfme).sum();
- if (v.compareTo(anfme) == 0.0) {
+ if (sum.compareTo(anfme) == 0.0) {
order.setOrderSettle(OrderSettleType.COMPLETE.val());
if (!orderService.updateById(order)) {
throw new CoolException("鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -444,14 +444,13 @@
throw new CoolException("璁㈠崟鎾浣嶇粦瀹氬け璐ワ紒锛�");
}
-// if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
-// .eq(WaveSeed::getOrderNo, order.getOrderNo())
-// .set(WaveSeed::getSiteId, siteNo.getId())
-// .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
-// throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
-// }
- //缁戝畾鎴愬姛锛屾挱绉嶅浜伅
- sowLightMange(siteNo.getSiteNo(), order, "LIGHT");
+ if (!waveSeedMapper.update(new LambdaUpdateWrapper<WaveSeed>()
+ .eq(WaveSeed::getOrderNo, order.getOrderNo())
+ .set(WaveSeed::getSiteId, siteNo.getId())
+ .set(WaveSeed::getSiteNo, siteNo.getSiteNo()))) {
+ throw new CoolException("鎾绔欑偣鏇存柊澶辫触锛侊紒");
+ }
+
} else {
if (StringUtil.isNullOrEmpty(siteNo.getOrderNo())) {
throw new CoolException("褰撳墠鎾绔欑偣鏈粦瀹氳鍗曪紒锛�");
@@ -551,6 +550,20 @@
}
params.forEach(order -> {
+ CacheSite cacheSite = cacheSiteService.getOne(new LambdaQueryWrapper<CacheSite>().eq(CacheSite::getOrderId, order.getId()));
+ if (cacheSite != null) {
+ cacheSite.setSiteStatus(CacheSiteStatusType.O.id);
+ cacheSite.setOrderId(null);
+ cacheSite.setOrderNo(null);
+ cacheSite.setBarcode(null);
+ cacheSite.setPlatformId(null);
+ cacheSite.setPlatformNo(null);
+ cacheSite.setUpdateTime(new Date());
+ if (!cacheSiteService.updateById(cacheSite)) {
+ throw new CoolException("缂撳瓨绔欐竻绌哄け璐�");
+ }
+ }
+
OrderDetl byId = orderDetlService.getById(order.getId());
if (Objects.isNull(byId)) {
throw new CoolException("璁㈠崟鏄庣粏涓嶅瓨鍦紒锛�");
@@ -664,7 +677,7 @@
@Override
public R getMatsByCode(String matnr) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
- wrapper.eq("matnr", matnr).select("id, maktx, matnr, SUM(anfme) anfme");
+ wrapper.eq("matnr", matnr).select("matnr, SUM(anfme) anfme");
LocDetl detl = locDetlService.getOne(wrapper);
Mat one = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detl.getMatnr()), false);
@@ -672,7 +685,7 @@
throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
}
one.setAnfme(detl.getAnfme());
- return R.ok().add(one);
+ return R.ok().add(Arrays.asList(one));
}
/**
--
Gitblit v1.9.1