rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -114,7 +114,7 @@ rowClick={(id, resource, record) => false} expand={false} expandSingle={false} omit={['id', 'createTime', 'matnrId', 'waveId', 'batch', 'orderItemId', 'fieldsIndex', 'createBy', 'memo']} omit={['id', 'createTime', 'matnrId', 'waveId', 'batch', 'orderItemId', 'fieldsIndex', 'createBy']} > <NumberField source="id" /> <NumberField source="waveId" label="table.field.waveItem.waveId" /> @@ -132,8 +132,8 @@ <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> <DateField source="createTime" label="common.field.createTime" showTime /> <TextField source="memo" label="common.field.memo" sortable={false} /> <TextField source="exceStatus$" label="table.field.waveItem.exceStatus" /> <TextField source="memo" label="common.field.memo" sortable={false} /> </StyledDatagrid> </List> <WaveItemEdit rsf-admin/src/page/orders/wave/WaveList.jsx
@@ -166,8 +166,8 @@ <DateField source="updateTime" label="common.field.updateTime" showTime /> <TextField source="createBy$" label="common.field.createBy" /> <CustomProcess source="progress" label="table.field.wave.progress" /> <TextField source="memo" label="common.field.memo" sortable={false} /> <TextField source="exceStatus$" label="table.field.wave.exceStatus" sortable={false} /> <TextField source="memo" label="common.field.memo" sortable={false} /> <WrapperField cellClassName="opt" label="common.field.opt"> <PauseButton /> <ContinueButton /> rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/CallBackEvent.java
@@ -9,7 +9,7 @@ public enum CallBackEvent { /**任务回调事件*/ CALL_BACK_EVENT_START("START", "取箱完成"), CALL_BACK_EVENT_OBIT("OBIT", "搬运中"), CALL_BACK_EVENT_OBIT("OTBIN", "搬运中"), CALL_BACK_EVENT_END("END", "放箱完成"), ;
@@ -469,19 +469,15 @@ if (Objects.isNull(task)) { throw new CoolException("任务不存在可已结束！！"); } /**取箱完成*/ if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_END.event)) { /**料箱搬运中， 修改站点状态*/ if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_OBIT.event)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) .set(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id))) { throw new CoolException("任务状态修改失败！！"); } if (!task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>().eq(BasStation::getStationName, task.getOrgSite())); if (Objects.isNull(station)) { @@ -499,10 +495,6 @@ || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) .set(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id))) { throw new CoolException("任务状态修改失败！！"); } /**修改出库站点状态*/ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>() .eq(BasStation::getStationName, task.getTargSite())); @@ -516,8 +508,29 @@ } } } /**取箱完成， 修改任务状态*/ } else if (params.getEventType().equals(CallBackEvent.CALL_BACK_EVENT_END.event)) { if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) .set(Task::getTaskStatus, TaskStsType.COMPLETE_IN.id))) { throw new CoolException("任务状态修改失败！！"); } } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) { if (!taskService.update(new LambdaUpdateWrapper<Task>().eq(Task::getTaskCode, task.getTaskCode()) .set(Task::getTaskStatus, TaskStsType.COMPLETE_OUT.id))) { throw new CoolException("任务状态修改失败！！"); } } } log.info(JSONObject.toJSONString(params)); return R.ok(JSONObject.toJSONString(params)); } rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
@@ -1,7 +1,6 @@ package com.vincent.rsf.server.manager.enums; public enum TaskStsType { //任务状态 GENERATE_IN("1", "创建入库任务"), WCS_EXECUTE_IN("2", "RCS任务已下发"), rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/WaveSchedules.java
@@ -80,7 +80,6 @@ Map<String, Object> params = new HashMap<>(); params.put("ids", longs); waveService.waveToTask(params, loginUserId); } } rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/WaveServiceImpl.java
@@ -129,7 +129,7 @@ throw new CoolException("数据错误： 波次不存在！！"); } for (Wave wave : waves) { if (wave.getExceStatus() >= WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) { if (wave.getExceStatus() > WaveExceStatus.WAVE_EXCE_STATUS_EXCING.val) { throw new CoolException("当前状态无法下发执行！！"); } @@ -207,6 +207,7 @@ .set(Wave::getExceStatus, WaveExceStatus.WAVE_EXCE_STATUS_TASK.val) .set(Wave::getWorkQty, taskItems.stream().mapToDouble(TaskItem::getAnfme).sum()) .set(Wave::getUpdateBy, loginUserId) .set(Wave::getMemo, null) .set(Wave::getUpdateTime, new Date()) .eq(Wave::getId, wave.getId()))) { throw new CoolException("波次状态修改失败！！"); rsf-server/src/main/java/com/vincent/rsf/server/manager/utils/LocManageUtil.java
@@ -96,7 +96,7 @@ public static List<LocItem> getFirstInFirstOutItemList(String matnrCode, String splrBatch, Double anfme) { LambdaQueryWrapper<LocItem> locItemQueryWrapper = new LambdaQueryWrapper<>(); locItemQueryWrapper.eq(LocItem::getMatnrCode, matnrCode); locItemQueryWrapper.eq(LocItem::getBatch, splrBatch); locItemQueryWrapper.eq(StringUtils.isNotEmpty(splrBatch), LocItem::getBatch, splrBatch); locItemQueryWrapper.orderByAsc(LocItem::getCreateTime); String applySql = String.format( "EXISTS (SELECT 1 FROM man_loc ml " + @@ -175,7 +175,8 @@ orderOutItemDto.setSiteNo(deviceSite.getSite()); } orderOutItemDto.setSource(item.getItemId()).setSourceId(item.getWaveId()); orderOutItemDto.setSource(item.getItemId()) .setSourceId(item.getWaveId()); list.add(orderOutItemDto);
