#

zhou zhou

3 天以前 480d4f9f5c31d8169d449241b1efea9936eb238f

#

 rsf-design/src/api/warehouse-areas.js

@@ -160,7 +160,7 @@

export function fetchWarehouseList() {
  return request.post({
    url: '/warehouse/list',
    url: '/warehouse/list2',
    data: {}
  })
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WarehouseController.java

@@ -12,6 +12,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Warehouse;
import com.vincent.rsf.server.manager.entity.WarehouseAreas;
import com.vincent.rsf.server.manager.entity.vo.WarehouseVO;
import com.vincent.rsf.server.manager.service.WarehouseAreasItemService;
import com.vincent.rsf.server.manager.service.WarehouseAreasService;
import com.vincent.rsf.server.manager.service.WarehouseService;
@@ -24,6 +25,7 @@

import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@Api(tags = "仓库")
@RestController
@@ -53,6 +55,20 @@
    }

    @PreAuthorize("hasAuthority('manager:warehouse:list')")
    @PostMapping("/warehouse/list2")
    public R list2(@RequestBody Map<String, Object> map) {
        List<Warehouse> warehouseList = warehouseService.list(new LambdaQueryWrapper<Warehouse>().select(Warehouse::getId,Warehouse::getName));

        List<WarehouseVO> warehouseList2 = warehouseList.stream().map(warehouse -> {
            WarehouseVO vo = new WarehouseVO();
            vo.setId(warehouse.getId());
            vo.setName(warehouse.getName());
            return vo;
        }).collect(Collectors.toList());
        return R.ok().add(warehouseList2);
    }

    @PreAuthorize("hasAuthority('manager:warehouse:list')")
    @PostMapping({"/warehouse/many/{ids}", "/warehouses/many/{ids}"})
    public R many(@PathVariable Long[] ids) {
        return R.ok().add(warehouseService.listByIds(Arrays.asList(ids)));

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/vo/WarehouseVO.java

New file
@@ -0,0 +1,9 @@
package com.vincent.rsf.server.manager.entity.vo;

import lombok.Data;

@Data
public class WarehouseVO {
    private Long id;
    private String name;
}

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderLogSchedule.java

@@ -63,7 +63,7 @@
     * @description 删除已完成订单加入Log表
     * @time 2025/3/19 19:09
     */
    @Scheduled(cron = "0/35 * * * * ?  ")
//    @Scheduled(cron = "0/35 * * * * ?  ")
    @Transactional(rollbackFor = Exception.class)
    public void InStockToLog() {
        List<WkOrder> wkOrders = asnOrderService.list(new LambdaQueryWrapper<WkOrder>()

 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AsnOrderPressureSchedules.java

@@ -23,6 +23,7 @@
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

/**
 * ASN 单据压测数据定时生成器。
@@ -37,6 +38,7 @@
    private static final Integer TENANT_ID = 1;
    private static final Long USER_ID = 51L;
    private static final String MEMO = "ASN_PRESSURE_TEST";
    private final AtomicBoolean running = new AtomicBoolean(false);

    @Autowired
    private AsnOrderService asnOrderService;
@@ -59,48 +61,56 @@

    @Scheduled(cron = "${pressure.asn-order.cron:0/10 * * * * ?}")
    @Transactional(rollbackFor = Exception.class)
    public synchronized void insertPressureOrders() {
    public void insertPressureOrders() {
        if (!enabled) {
            return;
        }
        if (orderCountPerRun <= 0 || itemCountPerOrder <= 0 || itemQty <= 0) {
            log.warn("ASN压测任务配置无效，跳过执行: orderCountPerRun={}, itemCountPerOrder={}, itemQty={}",
                    orderCountPerRun, itemCountPerOrder, itemQty);
        if (!running.compareAndSet(false, true)) {
            log.warn("ASN压测任务仍在执行中，本轮跳过");
            return;
        }

        List<Matnr> matnrs = loadMatnrs();
        if (matnrs.isEmpty()) {
            log.warn("ASN压测任务未获取到可用物料，跳过执行");
            return;
        }
        Collections.shuffle(matnrs);

        Date now = new Date();
        LocalDateTime nowTime = LocalDateTime.now();
        double totalQty = itemCountPerOrder * itemQty;

        List<WkOrder> orders = new ArrayList<>(orderCountPerRun);
        for (int i = 0; i < orderCountPerRun; i++) {
            orders.add(buildOrder(now, nowTime, totalQty, i));
        }
        if (!asnOrderService.saveBatch(orders, 200)) {
            throw new CoolException("ASN压测主单插入失败");
        }

        List<WkOrderItem> items = new ArrayList<>(orderCountPerRun * itemCountPerOrder);
        for (int orderIndex = 0; orderIndex < orders.size(); orderIndex++) {
            WkOrder order = orders.get(orderIndex);
            for (int itemIndex = 0; itemIndex < itemCountPerOrder; itemIndex++) {
                Matnr matnr = matnrs.get((orderIndex * itemCountPerOrder + itemIndex) % matnrs.size());
                items.add(buildOrderItem(order, matnr, now, orderIndex, itemIndex));
        try {
            if (orderCountPerRun <= 0 || itemCountPerOrder <= 0 || itemQty <= 0) {
                log.warn("ASN压测任务配置无效，跳过执行: orderCountPerRun={}, itemCountPerOrder={}, itemQty={}",
                        orderCountPerRun, itemCountPerOrder, itemQty);
                return;
            }
        }
        if (!asnOrderItemService.saveBatch(items, 500)) {
            throw new CoolException("ASN压测明细插入失败");
        }

        log.info("ASN压测任务执行完成，本次插入主单 {} 条，明细 {} 条", orders.size(), items.size());
            List<Matnr> matnrs = loadMatnrs();
            if (matnrs.isEmpty()) {
                log.warn("ASN压测任务未获取到可用物料，跳过执行");
                return;
            }
            Collections.shuffle(matnrs);

            Date now = new Date();
            LocalDateTime nowTime = LocalDateTime.now();
            double totalQty = itemCountPerOrder * itemQty;

            List<WkOrder> orders = new ArrayList<>(orderCountPerRun);
            for (int i = 0; i < orderCountPerRun; i++) {
                orders.add(buildOrder(now, nowTime, totalQty, i));
            }
            if (!asnOrderService.saveBatch(orders, 200)) {
                throw new CoolException("ASN压测主单插入失败");
            }

            List<WkOrderItem> items = new ArrayList<>(orderCountPerRun * itemCountPerOrder);
            for (int orderIndex = 0; orderIndex < orders.size(); orderIndex++) {
                WkOrder order = orders.get(orderIndex);
                for (int itemIndex = 0; itemIndex < itemCountPerOrder; itemIndex++) {
                    Matnr matnr = matnrs.get((orderIndex * itemCountPerOrder + itemIndex) % matnrs.size());
                    items.add(buildOrderItem(order, matnr, now, orderIndex, itemIndex));
                }
            }
            if (!asnOrderItemService.saveBatch(items, 500)) {
                throw new CoolException("ASN压测明细插入失败");
            }

            log.info("ASN压测任务执行完成，本次插入主单 {} 条，明细 {} 条", orders.size(), items.size());
        } finally {
            running.set(false);
        }
    }

    private List<Matnr> loadMatnrs() {