添加全盘出库 修改任务列表，完成按钮显示逻辑

skyouc

2 天以前 e5d2c6f2eb8cc33675308d7d33fd4029d5fd2e34

添加全盘出库
修改任务列表，完成按钮显示逻辑

 rsf-admin/.env

@@ -1,3 +1,3 @@
VITE_BASE_IP=192.168.4.56
VITE_BASE_IP=127.0.0.1
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080

 rsf-admin/src/page/task/TaskList.jsx

@@ -138,7 +138,7 @@
                    <TextField source="taskCode" label="table.field.task.taskCode" />
                    <NumberField source="taskStatus$" label="table.field.task.taskStatus" />
                    <NumberField source="taskType$" label="table.field.task.taskType" />
                    <NumberField source="warehType$" label="table.field.task.taskType" />
                    <NumberField source="warehType$" label="table.field.task.warehType" />
                    <TextField source="orgLoc" label="table.field.task.orgLoc" />
                    <TextField source="orgSite" label="table.field.task.orgSite" />
                    <TextField source="targLoc" label="table.field.task.targLoc" />
@@ -183,8 +183,7 @@
    const record = useRecordContext();
    const notify = useNotify();
    const refresh = useRefresh();
    const clickComplete = (event) => {
        event.stopPropagation();
    const clickComplete = () => {
        completeTask(record)
    };
    //完成任务
@@ -198,7 +197,7 @@
        }
    }
    return (
        <ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />
        record?.taskStatus < 98 ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>)
    )
}


 rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderWorkType.java

@@ -17,6 +17,7 @@
    ORDER_WORK_TYPE_SUPPLIER("11", "销售出库单"),
    ORDER_WORK_TYPE_RETURN_ORDER("12", "领料出库单"),
    ORDER_WORK_TYPE_PURCHASE_RETURN("13", "采购退回出库单"),
    ORDER_WORK_TYPE_STOCK_OUT("15", "库存出库"),
    ORDER_WORK_TYPE_OTHER("14", "其它出库单");


@@ -47,6 +48,8 @@
            return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.type;
        } else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER.type;
        }else if (desc.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type;
        }
        return null;
    }
@@ -70,6 +73,8 @@
            return OrderWorkType.ORDER_WORK_TYPE_PURCHASE_RETURN.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_OTHER.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_OTHER.desc;
        } else if (type.equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type)) {
            return OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.desc;
        }
        return null;
    }

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

@@ -22,10 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;

@Service("taskService")
@@ -57,13 +54,16 @@
    private DeviceBindService deviceBindService;
    @Autowired
    private WarehouseAreasService warehouseAreasService;

    @Autowired
    private WarehouseAreasItemService warehouseAreasItemService;
    @Autowired
    private WaveItemService waveItemService;
    @Autowired
    private WaveService waveService;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public synchronized R generateAGVTasks(WaitPakin pakins,String locCode,String orgSta, Long loginUserId) {
    public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {
        if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
            throw new CoolException("参数不能为空！！");
        }
@@ -128,7 +128,7 @@
                throw new CoolException("任务明细保存失败！！");
            }
            waitPakinItems.forEach(item -> {
                if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                        .set(WaitPakinItem::getWorkQty, item.getAnfme())
                        .eq(WaitPakinItem::getId, item.getId()))) {
                    throw new CoolException("组托明细修执行数量修改失败！！");
@@ -149,7 +149,7 @@

    @Override
    @Transactional(rollbackFor = Exception.class)
    public synchronized R generateFlatWarehouseTasks(WaitPakin pakins,String locCode, Long loginUserId) {
    public synchronized R generateFlatWarehouseTasks(WaitPakin pakins, String locCode, Long loginUserId) {
        if (Cools.isEmpty(pakins) || Cools.isEmpty(locCode)) {
            throw new CoolException("参数不能为空！！");
        }
@@ -213,7 +213,7 @@
                throw new CoolException("任务明细保存失败！！");
            }
            waitPakinItems.forEach(item -> {
                if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                        .set(WaitPakinItem::getWorkQty, item.getAnfme())
                        .eq(WaitPakinItem::getId, item.getId()))) {
                    throw new CoolException("组托明细修执行数量修改失败！！");
@@ -345,11 +345,11 @@
                throw new CoolException("任务明细保存失败！！");
            }
            waitPakinItems.forEach(item -> {
               if (! waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                       .set(WaitPakinItem::getWorkQty, item.getAnfme())
                       .eq(WaitPakinItem::getId, item.getId()))) {
                   throw new CoolException("组托明细修执行数量修改失败！！");
               }
                if (!waitPakinItemService.update(new LambdaUpdateWrapper<WaitPakinItem>()
                        .set(WaitPakinItem::getWorkQty, item.getAnfme())
                        .eq(WaitPakinItem::getId, item.getId()))) {
                    throw new CoolException("组托明细修执行数量修改失败！！");
                }
            });
        });

@@ -365,6 +365,7 @@

    /**
     * 完成任务 更新库位明细信息，将单据库存更新到单据库存表
     *
     * @param tasks
     * @throws Exception
     */
@@ -381,15 +382,150 @@
            }
        }
    }

    /**
     * @author Ryan
     * @date 2025/5/20
     * @description: 完成出库任务，更新出库库存信息
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void complateOutStock(Task task) {
        if (Objects.isNull(task)) {
            return;
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细不存在！！");
        }
        try {
            //更新库位明细
            subtractLocItem(taskItems, task.getId());
        } catch (Exception e) {
            throw new RuntimeException(e.getMessage());
        }

        //添加出入库记录信息
        Map<Short, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getWkType));
        /***获取库存出库值，如果为空表示正常单据出库，非空表明是库存出库
         * 1. 库存出库没有单据信息，单据信息默认为空
         * 2. 单据库存需通过波次查询原始单据信息，将单据信息填入stock中
         * */
        List<TaskItem> list = listMap.get(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type));
        if (Objects.isNull(list) || list.isEmpty()) {
            Map<Long, List<TaskItem>> maps = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
            maps.keySet().forEach(key -> {
                WaveItem waveItem = waveItemService.getById(key);
                if (Objects.isNull(waveItem)) {
                    throw new CoolException("波次明细不存在！！");
                }
                try {
                    saveOutStockItem(maps.get(key), waveItem);
                } catch (Exception e) {
                    throw new CoolException(e.getMessage());
                }
            });
        } else {
            try {
                saveOutStockItem(taskItems, null);
            } catch (Exception e) {
                throw new CoolException(e.getMessage());
            }
        }

        /**修改库位状态为F.在库*/
        List<Loc> locs = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
        if (locs.isEmpty()) {
            //如单据明细为空，修改为库位状态为O.空库
            if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getTargLoc()))) {
                throw new CoolException("库位状态修改失败！！");
            }
        }
        if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_OUT.id))) {
            throw new CoolException("任务状态修改失败！！");
        }
    }

    /**
     * @author Ryan
     * @date 2025/5/20
     * @description: 出库信息保存至库存明细表
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void saveOutStockItem(List<TaskItem> taskItems, WaveItem waveItem) throws Exception {
        Stock stock = new Stock();
        String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_STOCK_CODE, null);
        if (StringUtils.isBlank(ruleCode)) {
            throw new CoolException("当前业务：" + SerialRuleCode.SYS_STOCK_CODE + "，编码规则不存在！！");
        }
        Double sum = taskItems.stream().mapToDouble(TaskItem::getAnfme).sum();
        stock.setCode(ruleCode)
                .setAnfme(sum);
        if (Objects.isNull(waveItem)) {
            stock.setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))
                    .setMemo("出库单出库，无单据信息！！")
                    .setType(OrderType.ORDER_OUT.type);
        } else {
            //TODO 生成波次时需要将波次号写入单据，通过物料，批次，动态字段等唯一值反查单据信息
            stock.setSourceId(waveItem.getId()).setType(OrderType.ORDER_OUT.type);
        }
        if (!stockService.save(stock)) {
            throw new CoolException("库存保存失败！！");
        }
        List<StockItem> stockItems = new ArrayList<>();
        for (TaskItem item : taskItems) {
            /**通过任务明细中的taskId查询,获取TASK的目标库位信息*/
            StockItem stockItem = new StockItem();
            BeanUtils.copyProperties(item, stockItem);
            stockItem.setSourceItemId(item.getOrderItemId())
                    .setStockCode(stock.getCode())
                    .setId(null)
                    .setStockId(stock.getId());
            stockItems.add(stockItem);
        }
        if (!stockItemService.saveBatch(stockItems)) {
            throw new CoolException("库存修改架失败！！");
        }

    }

    /**
     * @author Ryan
     * @date 2025/5/20
     * @description: 扣减库存明细
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void subtractLocItem(List<TaskItem> items, Long taskId) throws Exception {
        Task task = this.getById(taskId);
        if (Objects.isNull(task)) {
            throw new CoolException("任务不存在!!");
        }
        for (TaskItem item : items) {
            LocItem locItem = locItemService.getOne(new LambdaQueryWrapper<LocItem>()
                    .eq(LocItem::getBatch, item.getBatch())
                    .eq(LocItem::getFieldsIndex, item.getFieldsIndex())
                    .eq(LocItem::getMatnrId, item.getMatnrId())
                    .eq(LocItem::getLocCode, task.getTargLoc()));
            if (Objects.isNull(locItem)) {
                throw new CoolException("库存明细不存在！！");
            }
            //剩余库存
            Double minuValue = (Math.round((locItem.getAnfme() - locItem.getWorkQty() - locItem.getQty()) * 10000.0) / 10000.0);
            if (minuValue.compareTo(item.getAnfme()) <= 0) {
                //剩余库存小于出库库存，移除当前库存信息
                if (!locItemService.removeById(locItem.getId())) {
                    throw new CoolException("库存删除失败！！");
                }
            } else {
                locItem.setWorkQty((Math.round((locItem.getWorkQty() - minuValue) * 10000.0) / 10000.0));
                locItem.setQty((Math.round((minuValue + locItem.getQty()) * 10000.0) / 10000.0));
                if (!locItemService.updateById(locItem)) {
                    throw new CoolException("库存信息更新失败！！");
                }
            }
        }
    }

    /**
@@ -398,27 +534,23 @@
     * @description: 完成入库任务
     * @version 1.0
     */
    @Transactional(rollbackFor = Exception.class)
    public void complateInstock(Task task) {
        if (Objects.isNull(task)) {
            return;
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, task.getId()));
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        if (taskItems.isEmpty()) {
            throw new CoolException("任务明细不存在！！");
        }
        Map<Long, List<TaskItem>> listMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getTaskId));
        /**对任务明细按任务主单进行分组*/
        listMap.keySet().forEach(key -> {
            List<TaskItem> items = listMap.get(key);
            try {
                //更新库位明细
                saveLocItem(items, key);
            } catch (Exception e) {
                throw new CoolException("库位明细更新失败！！");
            }
        });
        try {
            //更新库位明细
            saveLocItem(taskItems, task.getId());
        } catch (Exception e) {
            throw new CoolException("库位明细更新失败！！");
        }

        /**对任务明细按订单进行分组*/
        /**对任务明细按组拖明细进行分组*/
        Map<Long, List<TaskItem>> orderMap = taskItems.stream().collect(Collectors.groupingBy(TaskItem::getSource));
        orderMap.keySet().forEach(key -> {
            WaitPakinItem pakinItem = waitPakinItemService.getById(key);
@@ -445,10 +577,10 @@
    }

    /**
     * @author Ryan
     * @description 移除收货区库存
     * @param
     * @return
     * @author Ryan
     * @description 移除收货区库存
     * @time 2025/4/30 16:32
     */
    @Transactional(rollbackFor = Exception.class)
@@ -480,10 +612,10 @@
    }

    /**
     * @author Ryan
     * @description 更新库位明细
     * @param
     * @return
     * @author Ryan
     * @description 更新库位明细
     * @time 2025/4/15 15:28
     */
    @Transactional(rollbackFor = Exception.class)
@@ -510,6 +642,7 @@

    /**
     * 生成入库库存明细
     *
     * @param items
     * @return
     */