From 63250869b7059e1ffc108a16eaffc557f8a44689 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 28 七月 2025 09:30:14 +0800 Subject: [PATCH] 调拔单功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 119 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java index b4b3026..cf840e9 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TransferServiceImpl.java @@ -1,12 +1,131 @@ package com.vincent.rsf.server.manager.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.manager.controller.params.TransferItemParams; +import com.vincent.rsf.server.manager.entity.TransferItem; +import com.vincent.rsf.server.manager.entity.WkOrder; +import com.vincent.rsf.server.manager.entity.WkOrderItem; +import com.vincent.rsf.server.manager.enums.AsnExceStatus; +import com.vincent.rsf.server.manager.enums.CheckExceStatus; +import com.vincent.rsf.server.manager.enums.OrderSourceType; +import com.vincent.rsf.server.manager.enums.OrderType; import com.vincent.rsf.server.manager.mapper.TransferMapper; import com.vincent.rsf.server.manager.entity.Transfer; +import com.vincent.rsf.server.manager.service.AsnOrderItemService; +import com.vincent.rsf.server.manager.service.TransferItemService; import com.vincent.rsf.server.manager.service.TransferService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.vincent.rsf.server.system.constant.SerialRuleCode; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; +import org.apache.commons.lang3.StringUtils; +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.Objects; @Service("transferService") public class TransferServiceImpl extends ServiceImpl<TransferMapper, Transfer> implements TransferService { + @Autowired + private TransferItemService transferItemService; + + /** + * @author Ryan + * @date 2025/7/25 + * @description: 淇濆瓨璋冩嫈鍗曞強鏄庣粏 + * @version 1.0 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R saveTransfer(TransferItemParams params, Long loginUserId) { + if (Objects.isNull(params.getTransfer())) { + throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖"); + } + Transfer transfer = params.getTransfer(); + if (StringUtils.isBlank(transfer.getType() + "")) { + throw new CoolException("涓氬姟绫诲瀷涓嶈兘涓虹┖锛侊紒"); + } + + String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer); + if (StringUtils.isBlank(ruleCode)) { + throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_TRANSFER_ORDER_CODE銆嶆槸鍚﹁缃纭紒锛�"); + } + transfer.setCode(ruleCode) + .setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val) + .setSource(OrderSourceType.ORDER_SOURCE_TYPE_SYSTEM.val) + .setUpdateBy(loginUserId) + .setCreateBy(loginUserId); + if (!this.save(transfer)) { + throw new CoolException("涓诲崟淇濆瓨澶辫触锛侊紒"); + } + if (params.getItems().isEmpty()) { + throw new CoolException("鏀惰揣閫氱煡鍗曟槑缁嗕笉鑳戒负绌猴紒锛�"); + } + params.setTransfer(transfer); + try { + svaeOrUpdateOrderItem(params, loginUserId); + } catch (Exception e) { + throw new CoolException(e.getMessage()); + } + return R.ok(); + } + + + /** + * @author Ryan + * @date 2025/7/28 + * @description: 璋冩嫈鍗曟嵁淇敼 + * @version 1.0 + */ + private void svaeOrUpdateOrderItem(TransferItemParams params, Long loginUserId) { + Transfer orders = params.getTransfer(); + params.getItems().forEach(item -> { + item.put("transferId", orders.getId()); + item.put("transferCode", orders.getCode()); + item.put("createBy", loginUserId); + item.put("updateBy", loginUserId); + if (!transferItemService.fieldsSave(item, loginUserId)) { + throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); +// List<TransferItem> orderItems = transferItemService.list(new LambdaQueryWrapper<TransferItem>() +// .eq(TransferItem::getTransferId, params.getTransfer().getId())); +// Double sum = orderItems.stream().mapToDouble(TransferItem::getAnfme).sum(); + if (!this.updateById(orders)) { + throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒"); + } + } + + + /** + * @author Ryan + * @date 2025/7/25 + * @description: 璋冩嫈鍗曞強鏄庣粏淇敼 + * @version 1.0 + */ + @Override + public R updateTransfer(TransferItemParams params, Long loginUserId) { + Transfer orders = params.getTransfer(); + if (Objects.isNull(orders)) { + throw new CoolException("涓诲崟淇℃伅涓嶈兘涓虹┖锛侊紒"); + } + if (Objects.isNull(orders.getId())) { + throw new CoolException("鏁版嵁閿欒锛氬崟鎹甀D涓嶈兘涓虹┖锛侊紒"); + } + if (!this.updateById(orders)) { + throw new CoolException("涓诲崟淇敼澶辫触锛侊紒"); + } + if (Objects.isNull(params.getItems()) || params.getItems().isEmpty()) { + return R.ok("鏄庣粏鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + + svaeOrUpdateOrderItem(params, loginUserId); + + return R.ok("淇敼瀹屾垚锛侊紒"); + + } } -- Gitblit v1.9.1