rsf-admin/src/page/task/TaskList.jsx
@@ -245,7 +245,7 @@ } } return ( ((record?.taskStatus < 98) || (record?.taskType > 101 && record?.taskStatus < 198)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) ((record?.taskStatus < 98) || (record?.taskType >= 101 && record?.taskStatus < 199)) ? (<ConfirmButton label={"toolbar.complete"} color="secondary" startIcon={<TaskAltIcon />} onConfirm={clickComplete} />) : (<></>) ) }
@@ -186,7 +186,7 @@ const redirect = useRedirect(); const refresh = useRefresh(); const { orgLoc, tarLoc } = props; const check = () => { const move = () => { console.log(orgLoc, tarLoc); if (orgLoc === "" || orgLoc === undefined || orgLoc === null) { notify("请选择站点"); @@ -196,21 +196,13 @@ notify("请选择站点"); return; } http(orgLoc, tarLoc?.id) } const http = async (sta, items) => { console.log(items); const filter = items.filter(item => (item.outQty + item.workQty) > item.anfme); if (filter.length > 0) { notify(translate('toolbar.request.error.out_stock_qty')) return } const { data: { code, data, msg } } = await request.post(`/locItem/generate/task`, { siteNo: sta, items: items }); const http = async (orgLoc, tarLoc) => { const { data: { code, data, msg } } = await request.post(`/locItem/move/task`, { orgLoc, tarLoc }); if (code === 200) { notify(msg); refresh() setTableData([]) redirect("/task") } else { notify(msg); @@ -220,7 +212,7 @@ <ConfirmButton variant="contained" color="primary" onConfirm={check} onConfirm={move} label={"table.field.outBound.createTask"} > </ConfirmButton> rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/LocItemController.java
@@ -15,6 +15,7 @@ import com.vincent.rsf.server.manager.service.LocItemService; import com.vincent.rsf.server.system.controller.BaseController; import com.vincent.rsf.server.manager.enums.LocStsType; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -82,6 +83,7 @@ * @return */ @PreAuthorize("hasAuthority('manager:locItem:list')") @ApiOperation("生成库存出库任务") @PostMapping("/locItem/generate/task") public R generateTask(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { @@ -96,7 +98,8 @@ * @return */ @PreAuthorize("hasAuthority('manager:locItem:list')") @PostMapping("/locItem/generate/move/task") @ApiOperation("生成移库任务") @PostMapping("/locItem/move/task") public R genMoveTask(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { return R.error("参数不能为空！！"); @@ -110,6 +113,7 @@ * @return */ @PreAuthorize("hasAuthority('manager:locItem:list')") @ApiOperation("生成盘点出库任务") @PostMapping("/locItem/check/task") public R genStatisticalTask(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -97,12 +97,12 @@ Config config = configService.getOne(new LambdaQueryWrapper<Config>().eq(Config::getFlag, GlobalConfigCode.ORDER_INOF_REPORT_PLAT)); if (!Objects.isNull(config)) { if (Boolean.parseBoolean(config.getVal())) { queryWrapper.eq(Task::getTaskStatus, TaskStsType.REPORT_IN.id); queryWrapper.in(Task::getTaskStatus, TaskStsType.REPORT_IN.id); } else { queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id); queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id); } } else { queryWrapper.eq(Task::getTaskStatus, TaskStsType.UPDATED_IN.id); queryWrapper.in(Task::getTaskStatus, TaskStsType.UPDATED_IN.id, TaskStsType.UPDATED_OUT.id); } List<Task> tasks = taskService.list(queryWrapper); if (tasks.isEmpty()) { rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -165,10 +165,10 @@ @Override @Transactional(rollbackFor = Exception.class) public R genMoveTask(Map<String, Object> map) { if (Objects.isNull(map.get("targetLoc")) && StringUtils.isNotBlank(map.get("targetLoc").toString())) { throw new CoolException("目标库位不能为空！1"); if (Objects.isNull(map.get("tarLoc")) || StringUtils.isBlank(map.get("tarLoc").toString())) { throw new CoolException("目标库位不能为空！"); } if (Objects.isNull(map.get("orgLoc")) && StringUtils.isNotBlank(map.get("orgLoc").toString())) { if (Objects.isNull(map.get("orgLoc")) || StringUtils.isBlank(map.get("orgLoc").toString())) { throw new CoolException("源库位不能为空！"); } @@ -177,12 +177,19 @@ throw new CoolException("源库位不存在！！"); } Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("targetLoc").toString())); orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type); if (!locService.updateById(orgLoc)) { throw new CoolException("目标库位预约失败！！"); } Loc targetLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, map.get("tarLoc").toString())); if (Objects.isNull(targetLoc)) { throw new CoolException("目标库位不存在！！"); } targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type); targetLoc.setUseStatus(LocStsType.LOC_STS_TYPE_S.type); if (!locService.updateById(targetLoc)) { throw new CoolException("目标库位预约失败！！"); @@ -197,6 +204,10 @@ .setTaskStatus(TaskStsType.GENERATE_IN.id) .setBarcode(orgLoc.getBarcode()); if (!taskService.save(task)) { throw new CoolException("新建移库任务失败！！"); } List<LocItem> locItems = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, orgLoc.getId())); if (locItems.isEmpty()) { throw new CoolException("库位明细不存在！！"); rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -390,14 +390,72 @@ if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) { //1.入库 complateInstock(task); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) { } else if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { //53.拣料再入库 pickComplateInStock(task); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) { //57.盘点再入库 pickComplateInStock(task); } else if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { //移库 moveInStock(task); } } } @Transactional(rollbackFor = Exception.class) public void moveInStock(Task task) { if (Objects.isNull(task)) { return; } Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc())); if (Objects.isNull(loc)) { throw new CoolException("目标库位不存在！"); } Loc orgLoc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc())); if (Objects.isNull(orgLoc)) { throw new CoolException("目标库位不存在！"); } if (!loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)) { throw new CoolException("当前库位状态不处于S.入库预约，不可执行入库操作！"); } if (!orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)) { throw new CoolException("当前库位状态不处于R.出库预约，不可执行入库操作！"); } List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId())); if (taskItems.isEmpty()) { throw new CoolException("任务明细不存在！！"); } try { //更新库位明细 saveLocItem(taskItems, task.getId()); } catch (Exception e) { throw new CoolException("库位明细更新失败！！"); } // /**对任务明细按组拖明细进行分组*/ // try { // //保存库存明细 // saveStockItems(taskItems, null, null, pakinItem.getWkType(), pakinItem.getType()); // } catch (Exception e) { // log.error("<UNK>", e); // throw new CoolException(e.getMessage()); // } /**修改库位状态为F.在库*/ if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type).eq(Loc::getCode, task.getTargLoc()))) { throw new CoolException("库位状态修改失败！！"); } if (!locService.update(new LambdaUpdateWrapper<Loc>().set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type).eq(Loc::getCode, task.getOrgLoc()))) { throw new CoolException("库位状态修改失败！！"); } if (!this.update(new LambdaUpdateWrapper<Task>().eq(Task::getId, task.getId()).set(Task::getTaskStatus, TaskStsType.UPDATED_IN.id))) { throw new CoolException("任务状态修改失败！！"); } } @@ -906,6 +964,7 @@ if (Objects.isNull(task)) { throw new CoolException("任务不存在!!"); } List<LocItem> locItems = new ArrayList<>(); items.forEach(taskItem -> { Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()), false);
