Merge remote-tracking branch 'origin/devlop_whxrwms' into devlop_whxrwms

zc

14 小时以前 ffa9d4d80998832aa036211fc4c7db2572c9b52e

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/PdaOutStockServiceImpl.java

@@ -8,6 +8,7 @@
import com.vincent.rsf.server.api.entity.params.ContainerWaveParam;
import com.vincent.rsf.server.api.entity.params.WavePickItemsParams;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.*;
import com.vincent.rsf.server.manager.enums.AsnExceStatus;
import com.vincent.rsf.server.manager.enums.TaskStsType;
@@ -335,6 +336,73 @@
        return R.ok();
    }

    /**
     * @author Ryan
     * @date 2025/11/19
     * @description: 获取出库任务拣货明细
     * @version 1.0
     */
    @Override
    public R getTaskItems(Map<String, String> params) {
        if (Objects.isNull(params.get("barcode"))) {
            throw new CoolException("拖盘码不能为空！！");
        }
        List<Integer> integers = Arrays.asList(TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_PICK_AGAIN_OUT.type, TaskType.TASK_TYPE_CHECK_OUT.type);
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
                .in(Task::getTaskType, integers)
                .eq(Task::getBarcode, params.get("barcode")), false);
        if (Objects.isNull(task)) {
            return R.error("托盘所在任务不存在！！");
        }
        List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
        taskItems.forEach(taskItem -> {
            if (!Objects.isNull(taskItem.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(taskItem.getFieldsIndex());
                taskItem.setExtendFields(fields);
            }
        });
        return R.ok().add(taskItems);
    }

    /**
     * @author Ryan
     * @date 2025/11/19
     * @description: 修改出库任务档明细票号
     * @version 1.0
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R modifyTaskItem(List<TaskItem> items) {
        if (Objects.isNull(items) || items.isEmpty()) {
            return R.error("参数不能为空！！");
        }
        for (TaskItem item : items) {
            if (Objects.isNull(item.getCrushNo())) {
                continue;
            }
            TaskItem byId = taskItemService.getById(item.getId());
            if (!Objects.isNull(byId.getFieldsIndex())) {
                Map<String, String> fields = FieldsUtils.getFields(byId.getFieldsIndex());
                byId.setExtendFields(fields);
            }
            if (byId.getExtendFields().get("crushNo").equals(item.getCrushNo())) {
                continue;
            }
            FieldsItem fieldsItem = fieldsItemService.getOne(new LambdaQueryWrapper<FieldsItem>()
                    .eq(FieldsItem::getValue, item.getCrushNo())
                    .last("limit 1"));
            if (Objects.isNull(fieldsItem)) {
                throw new CoolException("库存不存在!!");
            }
            String uuid = fieldsItem.getUuid();
            item.setFieldsIndex(uuid).setExtendFields(null);
            if (!taskItemService.updateById(item)) {
               throw new CoolException("任务明细修改失败");
            }
        }
        return R.ok();
    }


    /**
     * @author Ryan