From e046dba174365eb8934ee1e4206f09821145e876 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 21 八月 2025 13:23:22 +0800
Subject: [PATCH] no message
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 d02c846..5b25040 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
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zy.asrs.framework.common.R;
@@ -238,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("鍗曟嵁鐘舵�佷慨鏀瑰け璐ワ紒锛�");
@@ -662,7 +663,16 @@
*/
@Override
public R getMatsByCode(String matnr) {
- return R.ok().add(matService.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr)));
+ QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
+ 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);
+ if (Objects.isNull(one)) {
+ throw new CoolException("鐗╂枡涓嶅瓨鍦紒锛�");
+ }
+ one.setAnfme(detl.getAnfme());
+ return R.ok().add(Arrays.asList(one));
}
/**
--
Gitblit v1.9.1