cl
9 天以前 8645387c6c7850d71bd2ac87407da9440d518cc8
空板满板交换一下状态
3个文件已修改
11 ■■■■ 已修改文件
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
rsf-open-api/src/main/java/com/vincent/rsf/openApi/entity/params/LocationAllocateParams.java
@@ -20,7 +20,7 @@
    @ApiModelProperty(value = "入库站点", required = true)
    private String staNo;
    @ApiModelProperty(value = "是否空板:true=空板入库,空/false=普通入库(需组托)")
    @ApiModelProperty(value = "是否满板:true=满板入库,false/空=空板入库")
    private Boolean full;
    @ApiModelProperty(value = "入库类型", required = true)
rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -1596,20 +1596,21 @@
    @Transactional(rollbackFor = Exception.class)
    public R allocateLocation(String barcode, String staNo, Integer type, Boolean full, BigDecimal weight) {
        log.info("========== 开始申请入库任务,分配库位 ==========");
        log.info("料箱码:{},入库站点:{},入库类型:{},空板:{},重量:{}", barcode, staNo, type, full, weight);
        log.info("料箱码:{},入库站点:{},入库类型:{},满板信号:{},重量:{}", barcode, staNo, type, full, weight);
        BigDecimal weightScaled = null;
        if (weight != null) {
            weightScaled = weight.setScale(4, RoundingMode.HALF_UP);
        }
        // 统一走 createInTask:空板(full=true)仅不校验组托,仍校验站点、分配库位、建任务;非空板需组托
        // 统一走 createInTask:满板(full=true)走普通入库;空/false 走空板入库
        TaskInParam param = new TaskInParam();
        param.setBarcode(barcode);
        param.setSourceStaNo(staNo);
        param.setLocType1(type != null ? type : 1);
        param.setUser(1L);
        param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_EMPITY_IN.type : TaskType.TASK_TYPE_IN.type);
//        param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_EMPITY_IN.type : TaskType.TASK_TYPE_IN.type);
        param.setIoType(Boolean.TRUE.equals(full) ? TaskType.TASK_TYPE_IN.type : TaskType.TASK_TYPE_EMPITY_IN.type);
        param.setWeight(weightScaled);
        InTaskMsgDto msgDto = createInTask(param);
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/RcsTestServiceImpl.java
@@ -221,7 +221,7 @@
                }
                
                if ("location_allocate".equals(params.getInboundApiType())) {
                    // 使用 location_allocate 接口(内部调用createInTask);full=null 表示普通入库
                    // 使用 location_allocate 接口(内部调用createInTask);full=null 表示空板入库
                    R allocateResult = wcsService.allocateLocation(barcode, inboundStation, 1, null, null);
                    if (allocateResult != null) {
                        Object dataObj = allocateResult.get("data");