From 4496b9019ba423dd1c51c719bcc0a5938d90fff9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 22 四月 2025 17:33:18 +0800 Subject: [PATCH] #修改优化 1. DO单明细编码优化 2. DO单明细新增优化 3. 出库单新增单据增加新单据功能 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 177 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 177 insertions(+), 0 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java new file mode 100644 index 0000000..421985e --- /dev/null +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java @@ -0,0 +1,177 @@ +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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.vincent.rsf.framework.common.Cools; +import com.vincent.rsf.framework.common.R; +import com.vincent.rsf.framework.exception.CoolException; +import com.vincent.rsf.server.api.entity.dto.PoItemsDto; +import com.vincent.rsf.server.api.service.ReceiveMsgService; +import com.vincent.rsf.server.api.service.ReportMsgService; +import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams; +import com.vincent.rsf.server.manager.controller.params.BatchUpdateParam; +import com.vincent.rsf.server.manager.entity.AsnOrder; +import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import com.vincent.rsf.server.manager.entity.AsnOrderItemLog; +import com.vincent.rsf.server.manager.entity.AsnOrderLog; +import com.vincent.rsf.server.manager.enums.AsnExceStatus; +import com.vincent.rsf.server.manager.mapper.AsnOrderMapper; +import com.vincent.rsf.server.manager.mapper.PurchaseMapper; +import com.vincent.rsf.server.manager.service.*; +import com.vincent.rsf.server.system.constant.SerialRuleCode; +import com.vincent.rsf.server.system.mapper.SerialRuleMapper; +import com.vincent.rsf.server.system.utils.SerialRuleUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +/** + * @author Ryan + * @description + * @throws + * @return + * @time 2025/3/7 08:02 + */ +@Service("outStockServiceImpl") +public class OutStockServiceImpl extends ServiceImpl<AsnOrderMapper, AsnOrder> implements OutStockService { + + @Autowired + private ReceiveMsgService receiveMsgService; + @Autowired + private ReportMsgService reportMsgService; + @Resource + private PurchaseMapper purchaseMapper; + @Autowired + private AsnOrderItemService asnOrderItemService; + @Autowired + private AsnOrderLogService asnOrderLogService; + @Autowired + private AsnOrderItemLogService asnOrderItemLogService; + @Resource + private SerialRuleMapper serialRuleMapper; + + /** + * @author Ryan + * @description 鏇存柊鎴栦繚瀛樻槑缁� + * @param + * @return + * @time 2025/4/7 13:28 + */ + @Transactional(rollbackFor = Exception.class) + private void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception{ + AsnOrder orders = params.getOrders(); + + params.getItems().forEach(item -> { + item.put("asnId", orders.getId()); + item.put("asnCode", orders.getCode()); + item.put("poCode", orders.getPoCode()); + item.put("createBy", loginUserId); + item.put("updateBy", loginUserId); + if (!asnOrderItemService.fieldsSave(item)) { + throw new CoolException("鏄庣粏淇濆瓨澶辫触锛侊紒"); + } + }); + List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>() + .eq(AsnOrderItem::getAsnId, params.getOrders().getId())); + double sum = orderItems.stream().mapToDouble(AsnOrderItem::getAnfme).sum(); + orders.setAnfme(sum); + if (!this.updateById(orders)) { + throw new CoolException("璁″垝鏀惰揣鏁伴噺淇敼澶辫触锛侊紒"); + } + } + + + /** + * @author Ryan + * @description 鍒犻櫎鍘熶富鍗曞強鏄庣粏锛屽姞鍏ュ巻鍙叉。 + * @param + * @return + * @time 2025/3/19 19:53 + */ + @Transactional(rollbackFor = Exception.class) + private void operateOrderLogs(AsnOrder asrder) throws Exception{ + if (Objects.isNull(asrder) || Objects.isNull(asrder.getId())) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + asrder.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val); + + if (!this.updateById(asrder)) { + throw new CoolException("鍗曟嵁鍏抽棴澶辫触锛侊紒"); + } + List<AsnOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, asrder.getId())); + if (orderItems.isEmpty()) { + throw new CoolException("鏀惰揣鏄庣粏涓虹┖锛侊紒"); + } +// if (Objects.isNull(asrder.getAnfme()) || asrder.getAnfme().compareTo(0.00) == 0) { +// throw new CoolException("鏀惰揣鏁伴噺涓嶈兘涓洪浂锛侊紒"); +// } + AsnOrder order = this.getById(asrder.getId()); + AsnOrderLog orderLog = new AsnOrderLog(); + order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_DONE.val); + BeanUtils.copyProperties(order, orderLog); + orderLog.setId(null); + orderLog.setAsnId(order.getId()); + + if (!this.saveOrUpdate(order)) { + throw new CoolException("鐘舵�佷慨鏀瑰け璐ワ紒锛�"); + } + orderLog.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CLOSE.val); + if (!asnOrderLogService.save(orderLog)) { + throw new CoolException("涓诲崟鍘嗗彶妗f坊鍔犲け璐ワ紒锛�"); + } + List<AsnOrderItemLog> logs = new ArrayList<>(); + List<AsnOrderItem> items = asnOrderItemService.list(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId())); + items.forEach(item -> { + AsnOrderItemLog itemLog = new AsnOrderItemLog(); + BeanUtils.copyProperties(item, itemLog); + itemLog.setAsnItemId(itemLog.getId()) + .setLogId(orderLog.getId()) + .setAsnId(item.getAsnId()); + logs.add(itemLog); + }); + + if (!asnOrderItemLogService.saveBatch(logs)) { + throw new CoolException("閫氱煡鍗曟槑缁嗗巻鍙叉。淇濆瓨澶辫触锛侊紒"); + } + if (!asnOrderItemService.remove(new LambdaQueryWrapper<AsnOrderItem>().eq(AsnOrderItem::getAsnId, order.getId()))) { + throw new CoolException("鍘熷崟鎹槑缁嗗垹闄ゅけ璐ワ紒锛�"); + } + if (!this.removeById(asrder.getId())) { + throw new CoolException("鍘熷崟鎹垹闄ゅけ璐ワ紒锛�"); + } + } + + /** + * @author Ryan + * @description 鍙栨秷鍑哄簱鍗曟嵁 + * @param + * @return + * @time 2025/4/22 10:40 + */ + @Override + @Transactional(rollbackFor = Exception.class) + public R cancelOutOrder(String id) { + if (Cools.isEmpty(id)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + AsnOrder order = this.getById(id); + if (Objects.isNull(order)) { + throw new CoolException("鍗曟嵁涓嶅瓨鍦紒锛�"); + } + if (!order.getExceStatus().equals(AsnExceStatus.ASN_EXCE_STATUS_UN_EXCE.val)) { + throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷负" + AsnExceStatus.getExceStatus(order.getExceStatus()) + "锛� 涓嶅彲鎵ц鍙栨秷鎿嶄綔锛侊紒"); + } + order.setExceStatus(AsnExceStatus.ASN_EXCE_STATUS_TASK_CANCEL.val).setStatus(0); + + if (!this.saveOrUpdate(order)) { + throw new CoolException("鍗曟嵁鍙栨秷澶辫触锛侊紒"); + } + return R.ok("鎿嶄綔鎴愬姛"); + } +} -- Gitblit v1.9.1