From 1a02691b9aeacd00299e817888c07d6db43d7097 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期二, 24 六月 2025 13:07:43 +0800 Subject: [PATCH] no message --- rsf-admin/src/page/orders/wave/WaveItemList.jsx | 3 +-- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java | 4 +++- rsf-admin/src/i18n/zh.js | 1 + rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java | 12 +++++++----- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rsf-admin/src/i18n/zh.js b/rsf-admin/src/i18n/zh.js index 9c8251e..9a56047 100644 --- a/rsf-admin/src/i18n/zh.js +++ b/rsf-admin/src/i18n/zh.js @@ -1176,6 +1176,7 @@ orderPrint: '鎵撳嵃鍗曟嵁', createTask: "涓嬪彂浠诲姟", publicWorking: '涓嬪彂鎵ц', + continuePub: '缁х画涓嬪彂', createWave: "鐢熸垚娉㈡", recover: "缁х画鏀惰揣", modiftySite: '淇敼搴撳彛', diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx index c37db35..7dfda50 100644 --- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx +++ b/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 /> diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java index 418a8fa..765055c 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java +++ b/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); }); } diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java index c4890eb..53d92c7 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java +++ b/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()); -- Gitblit v1.9.1