From 2b35183407eb7b1b1524f7b101f1098d9caea042 Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期三, 02 四月 2025 15:13:24 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java | 85 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 85 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java index f973218..84f0eda 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/QlyIsptItemServiceImpl.java @@ -1,12 +1,97 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.manager.controller.params.IsptItemsParams; +import com.vincent.rsf.server.manager.controller.params.QlyInspectAndItem; +import com.vincent.rsf.server.manager.entity.QlyInspect; import com.vincent.rsf.server.manager.mapper.QlyIsptItemMapper; import com.vincent.rsf.server.manager.entity.QlyIsptItem; +import com.vincent.rsf.server.manager.service.QlyInspectService; import com.vincent.rsf.server.manager.service.QlyIsptItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; @Service("qlyIsptItemService") public class QlyIsptItemServiceImpl extends ServiceImpl<QlyIsptItemMapper, QlyIsptItem> implements QlyIsptItemService { + @Autowired + private QlyInspectService qlyInspectService; + + /** + * @author Ryan + * @description 鎵归噺淇敼 + * @param + * @return + * @time 2025/4/1 09:40 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public boolean batchUpdate(IsptItemsParams params) { + if (Objects.isNull(params.getIsptItem()) || params.getIsptItem().isEmpty()) { + throw new CoolException("ID涓嶈兘涓虹┖锛侊紒"); + } + List<QlyIsptItem> isptItem = params.getIsptItem(); + List<Long> list = isptItem.stream().map(QlyIsptItem::getId).collect(Collectors.toList()); + if (params.getType().equals("2") || params.getType().equals("1")) { + isptItem.forEach(item -> { + if (params.getType().equals("1")) { + //TODO 鍏堟崱鍚庢敹涓洪�佽揣鏁伴噺锛屽厛鏀跺悗鎹′负鏀惰揣鏁伴噺 + item.setSafeQty(item.getDlyQty()); + item.setDisQty(0.0); + } else { + item.setSafeQty(0.0); + item.setDisQty(item.getDlyQty()); + } + if (!this.update(new LambdaUpdateWrapper<QlyIsptItem>() + .set(QlyIsptItem::getSafeQty, item.getSafeQty()) + .set(QlyIsptItem::getIsptResult, params.getType()) + .set(QlyIsptItem::getDisQty, item.getDisQty()) + .in(QlyIsptItem::getId, item.getId()))) { + throw new CoolException("淇敼澶辫触锛侊紒"); + } + }); + } else { + if (!this.updateBatchById(isptItem)) { + throw new CoolException("鏄庣粏淇敼澶辫触"); + } + } + + List<QlyIsptItem> isptItems = this.list(new LambdaQueryWrapper<QlyIsptItem>().in(QlyIsptItem::getId, list)); + if (isptItems.isEmpty()) { + throw new CoolException("鏁版嵁閿欒锛氭槑缁嗕笉瀛樺湪锛侊紒"); + } + Map<Long, List<QlyIsptItem>> listMap = isptItems.stream().collect(Collectors.groupingBy(QlyIsptItem::getIspectId)); + for (Long key : listMap.keySet()) { + QlyInspect inspect = qlyInspectService.getById(key); + List<QlyIsptItem> items = listMap.get(key); + Double safeQty = items.stream().mapToDouble(QlyIsptItem::getSafeQty).sum(); + Double dlyQty = items.stream().mapToDouble(QlyIsptItem::getDlyQty).sum(); + Double disQty = items.stream().mapToDouble(QlyIsptItem::getDisQty).sum(); + Double qlyQty = safeQty + disQty; + //瀹夊叏鏁伴噺锛岃川妫�鏁伴噺 + inspect.setSafeQty(safeQty) + .setIsptQty(qlyQty); + if (Double.compare(disQty, 0) > 0) { + inspect.setIsptResult(Short.parseShort("4")); + } + if (Double.compare(safeQty, dlyQty) == 0) { + inspect.setIsptStatus("1"); + inspect.setIsptResult(Short.parseShort("1")); + } + if (!qlyInspectService.updateById(inspect)) { + throw new CoolException("璐ㄦ鏁伴噺淇敼澶辫触锛侊紒"); + } + } + return true; + } } -- Gitblit v1.9.1