添加换绑功能

skyouc

2 天以前 ced0680ba99bb04287aa0ce1f31c6fbfed0553d3

添加换绑功能

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

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

import java.util.List;
import java.util.Map;
import java.util.Objects;

@Api(tags = "PDA出库操作接口")
@RequestMapping("/pda")
@@ -77,6 +78,16 @@
        return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId());
    }

    @PreAuthorize("hasAuthority('manager:task:list')")
    @PostMapping("/task/items")
    @ApiOperation("查询出库任务拣货明细")
    public R getTaskItem(@RequestBody Map<String, String> params) {
        if (Objects.isNull(params.get("barcode"))) {
            return R.error("托盘码不能为空");
        }
        return pdaOutStockService.getTaskItems(params);
    }



}

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

@@ -34,4 +34,12 @@
     * @version 1.0
     */
    R wavePickItems(WavePickItemsParams items);

    /**
     * @author Ryan
     * @date 2025/11/19
     * @description: 获取拣货明细
     * @version 1.0
     */
    R getTaskItems(Map<String, String> params);
}

 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,33 @@
        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("拖盘码不能为空！！");
        }
        Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
                .eq(Task::getTaskType, TaskType.TASK_TYPE_OUT.type)
                .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

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WaitPakinController.java

@@ -123,7 +123,6 @@
                throw new CoolException("该条码已被"+isBarcodeSta.getStationName()+"站绑定");
            }
        }

        return waitPakinService.removePakin(Arrays.asList(ids));
    }


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

@@ -514,7 +514,6 @@
                    throw new CoolException(e.getMessage());
                }


                Double workQty = Math.round((orderItem.getWorkQty() + locItem.getOutQty()) * 100) / 100.0;

                orderItem.setUpdateBy(loginUserId).setUpdateTime(new Date()).setWorkQty(workQty);