parent: ecdc2cad | 补丁 | 提交 | ignore whitespace
skyouc
2025-06-24 1a02691b9aeacd00299e817888c07d6db43d7097 
no message
4个文件已修改
20 ■■■■■ 已修改文件
rsf-admin/src/i18n/zh.js 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-admin/src/page/orders/wave/WaveItemList.jsx 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 rsf-admin/src/i18n/zh.js


@@ -1176,6 +1176,7 @@


        orderPrint: '打印单据',


        createTask: "下发任务",


        publicWorking: '下发执行',


        continuePub: '继续下发',


        createWave: "生成波次",


        recover: "继续收货",


        modiftySite: '修改库口',




 rsf-admin/src/page/orders/wave/WaveItemList.jsx


@@ -143,13 +143,12 @@


                    <TextField source="fieldsIndex" label="table.field.waveItem.fieldsIndex" />


                    <NumberField source="workQty" label="table.field.waveItem.workQty" />


                    <TextField source="unit" label="table.field.waveItem.unit" />


                    <TextField source="exceStatus" label="table.field.waveItem.exceStatus" />


                    <TextField source="updateBy$" label="common.field.updateBy" />


                    <DateField source="updateTime" label="common.field.updateTime" showTime />


                    <TextField source="createBy$" label="common.field.createBy" />


                    <DateField source="createTime" label="common.field.createTime" showTime />


                    <BooleanField source="statusBool" label="common.field.status" sortable={false} />


                    <TextField source="memo" label="common.field.memo" sortable={false} />


                    <TextField source="exceStatus$" label="table.field.waveItem.exceStatus" />


                    <WrapperField cellClassName="opt" label="common.field.opt">


                        <BulkPauseButton />


                        <ContinueButton />




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


@@ -16,6 +16,7 @@


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.scheduling.annotation.Scheduled;


import org.springframework.stereotype.Component;


import org.springframework.transaction.annotation.Transactional;




import java.util.HashMap;


import java.util.List;


@@ -53,6 +54,7 @@


    * @time 2025/6/23 13:52


    */


    @Scheduled(cron = "0/15 * * * * ?")


    @Transactional(rollbackFor = Exception.class)


    public void autoGenerateTask() {


        Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.WAVE_AUTO_EXCE_TASK));


        if (Objects.isNull(config) || !Boolean.parseBoolean(config.getVal())) {


@@ -60,24 +62,24 @@


        }


        List<Wave> list = waveService.list(new LambdaQueryWrapper<Wave>()


                        .select(Wave::getId)


                .eq(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_INIT.val));


                        .eq(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_INIT.val));


        if (list.isEmpty()) {


            return;


        }


        List<Long> longs = list.stream().map(Wave::getId).collect(Collectors.toList());




        List<WaveItem> waveItems = waveItemService.list(new LambdaQueryWrapper<WaveItem>()


                .in(WaveItem::getId, longs)


                .eq(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_ITEM_EXCE_STATUS_UN.val)


        );


                .in(WaveItem::getWaveId, longs)


                .eq(WaveItem::getExceStatus, WaveItemExceStatus.WAVE_ITEM_EXCE_STATUS_UN.val));


        if (waveItems.isEmpty()) {


            return;


        }


        Map<Long, List<WaveItem>> listMap = waveItems.stream().collect(Collectors.groupingBy(WaveItem::getWaveId));


        listMap.keySet().forEach(waveId -> {


            List<Long> itemIds = listMap.get(waveId).stream().map(WaveItem::getId).collect(Collectors.toList());


            Map<String, Object> params = new HashMap<>();


            params.put("wave", waveId);


            params.put("waveItems", waveItems);


            params.put("waveItem", itemIds);


            waveService.waveToTask(params, waveId);


        });


    }




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


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


import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;


import com.vincent.rsf.framework.common.R;


import com.vincent.rsf.framework.exception.CoolException;


import com.vincent.rsf.server.common.constant.Constants;


import com.vincent.rsf.server.manager.enums.*;


import com.vincent.rsf.server.manager.entity.*;


import com.vincent.rsf.server.manager.mapper.WaveMapper;


@@ -58,7 +59,7 @@


    @Override


    @Transactional(rollbackFor = Exception.class)


    public R publicTask(Map<String, Object> map, Long loginUserId) {


        List<WaveItem> itemParams = (List<WaveItem>) map.get("waveItem");


        List<WaveItem> itemParams =  JSONArray.parseArray(JSON.toJSONString(map.get("waveItem")), WaveItem.class);


        if (Objects.isNull(itemParams) || itemParams.isEmpty()) {


            throw new CoolException("参数不能为空！！");


        }


@@ -211,6 +212,7 @@


                    .setResource(TaskResouceType.TASK_RESOUCE_WAVE_TYPE.val)


                    .setBarcode(loc.getBarcode())


                    .setOrgLoc(loc.getCode())


                    .setSort(Constants.TASK_SORT_DEFAULT_VALUE)


                    .setCreateBy(loginUserId)


                    .setUpdateBy(loginUserId)


                    .setTargSite(wave.getTargSite());