代码优化

skyouc

22 小时以前 ebdfa825c07189b5f8e89f147d96d1bc612589db

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java

@@ -8,17 +8,22 @@
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.entity.AsnOrder;
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.Matnr;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.CheckExceStatus;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.manager.mapper.CheckOrderMapper;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.CheckOrderItemService;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.manager.service.MatnrService;
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;
@@ -29,13 +34,14 @@
import java.util.stream.Collectors;

@Service("checkOrderService")
public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, AsnOrder> implements CheckOrderService {
public class CheckOrderServiceImpl extends ServiceImpl<CheckOrderMapper, WkOrder> implements CheckOrderService {

    @Autowired
    private MatnrService matnrService;

    @Autowired
    private CheckOrderItemService checkOrderItemService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;

    /**
     * @author Ryan
@@ -59,11 +65,11 @@
        Map<String, List<CheckOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(CheckOrderTemplate::getCode));
        for (String key : listMap.keySet()) {
            CheckOrderTemplate template = listMap.get(key).stream().findFirst().get();
            AsnOrder asnOrder = this.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
            if (!Objects.isNull(asnOrder)) {
            WkOrder wkOrder = this.getOne(new LambdaQueryWrapper<WkOrder>().eq(WkOrder::getCode, template.getCode()));
            if (!Objects.isNull(wkOrder)) {
                continue;
            }
            AsnOrder order = new AsnOrder();
            WkOrder order = new WkOrder();
            order.setCode(template.getCode())
                    .setMemo(template.getMemo())
                    .setUpdateBy(loginUserId)
@@ -73,9 +79,9 @@
            if (!this.save(order)) {
                throw new CoolException("单据保存失败！！");
            }
            List<AsnOrderItem> items = new ArrayList<>();
            List<WkOrderItem> items = new ArrayList<>();
            for (CheckOrderTemplate orderTemplate : listMap.get(key)) {
                AsnOrderItem orderItem = new AsnOrderItem();
                WkOrderItem orderItem = new WkOrderItem();
                Matnr matnr = null;
                if (StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
                    matnr = matnrService.getOne(new LambdaQueryWrapper<Matnr>()
@@ -98,10 +104,10 @@
                }
            }
            if (!items.isEmpty()) {
                double purQty = items.stream().mapToDouble(AsnOrderItem::getAnfme).sum();
                if (!this.update(new LambdaUpdateWrapper<AsnOrder>()
                        .set(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
                        .set(AsnOrder::getAnfme, purQty).eq(AsnOrder::getId, order.getId()))) {
                double purQty = items.stream().mapToDouble(WkOrderItem::getAnfme).sum();
                if (!this.update(new LambdaUpdateWrapper<WkOrder>()
                        .set(WkOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
                        .set(WkOrder::getAnfme, purQty).eq(WkOrder::getId, order.getId()))) {
                    throw new CoolException("单据数量修改失败！！");
                }
            }
@@ -109,4 +115,77 @@

        return R.ok("操作成功！！");
    }

    /**
     * @param
     * @return
     * @author Ryan
     * @description 保存出库主单及明细
     * @time 2025/4/29 13:47
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R saveCheckOrder(AsnOrderAndItemsParams params, Long loginUserId) {
        if (Objects.isNull(params.getOrders())) {
            throw new CoolException("主单信息不能为空");
        }
        WkOrder orders = params.getOrders();
        if (StringUtils.isBlank(orders.getWkType())) {
            throw new CoolException("业务类型不能为空！！");
        }

        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_CHECK_RULE_CODE, orders);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("编码规则错误：请检查「SYS_CHECK_RULE_CODE」是否设置正确！！");
        }
        orders.setCode(ruleCode)
                .setType(OrderType.ORDER_CHECK.type)
                .setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_UN_EXCE.val)
                .setUpdateBy(loginUserId)
                .setCreateBy(loginUserId);
        if (!this.save(orders)) {
            throw new CoolException("主单保存失败！！");
        }
        if (params.getItems().isEmpty()) {
            throw new CoolException("盘点单明细不能为空！！");
        }
        params.setOrders(orders);
        try {
            svaeOrUpdateOrderItem(params, loginUserId);
        } catch (Exception e) {
            throw new CoolException(e.getMessage());
        }
        return R.ok();
    }

    /**
     * @param
     * @return
     * @author Ryan
     * @description 更新或保存明细
     * @time 2025/4/7 13:28
     */
    @Transactional(rollbackFor = Exception.class)
    public void svaeOrUpdateOrderItem(AsnOrderAndItemsParams params, Long loginUserId) throws Exception {
        WkOrder 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, loginUserId)) {
                throw new CoolException("明细保存失败！！");
            }
        });
        List<WkOrderItem> orderItems = checkOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>()
                .eq(WkOrderItem::getAsnId, params.getOrders().getId()));
        Double sum = orderItems.stream().mapToDouble(WkOrderItem::getAnfme).sum();
        orders.setAnfme(sum);
        if (!this.updateById(orders)) {
            throw new CoolException("计划收货数量修改失败！！");
        }
    }


}