修复拣料功能

zwl

2025-04-01 8785249f17d3f05035ef4a81452963c957253df9

修复拣料功能

 src/main/java/com/zy/asrs/controller/TVController.java

@@ -282,7 +282,6 @@
            wrkDetls.forEach(wrkDetl -> ledCommand.getMatDtos().add(new MatDto(wrkDetl.getMatnr(), wrkDetl.getMaktx(), wrkDetl.getAnfme(),wrkDetl.getWeight(),wrkDetl.getSpecs(),wrkDetl.getModel())));
        }
        commands.add(ledCommand);

        return R.ok().add(commands);
    }


 src/main/java/com/zy/asrs/entity/result/MatDto.java

@@ -1,5 +1,6 @@
package com.zy.asrs.entity.result;

import com.core.common.Cools;
import lombok.Data;

/**
@@ -25,6 +26,7 @@

    //图号
    private String model;

    public MatDto() {
    }

@@ -33,12 +35,14 @@
        this.maknx = maknx;
        this.count = count;
    }

    public MatDto(String matNo, String maknx, Double count, String specs) {
        this.specs = specs;
        this.matnr = matNo;
        this.maknx = maknx;
        this.count = count;
    }

    public MatDto(String matNo, String maknx, Double count, Double total, String specs) {
        this.specs = specs;
        this.matnr = matNo;
@@ -46,7 +50,8 @@
        this.count = count;
        this.total = total;
    }
    public MatDto(String matNo, String maknx, Double count, Double total, String specs,String model) {

    public MatDto(String matNo, String maknx, Double count, Double total, String specs, String model) {
        this.specs = specs;
        this.matnr = matNo;
        this.maknx = maknx;

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -260,6 +260,8 @@
                wrkDetl.setIoTime(now);
                Double anfme = ioType==101?detlDto.getLocDetl().getAnfme():detlDto.getCount();
                wrkDetl.setAnfme(anfme); // 数量
                wrkDetl.setPrice(detlDto.getLocDetl().getAnfme());//总数
                wrkDetl.setWeight(detlDto.getLocDetl().getAnfme());//总数
                wrkDetl.setAppeTime(now);
                wrkDetl.setAppeUser(userId);
                wrkDetl.setModiTime(now);
@@ -344,6 +346,7 @@
            wrkDetl.setModel(mat.getModel());
            wrkDetl.setPrice(locDetl.getAnfme());//库存数量
            wrkDetl.setAnfme(locDto.getAnfme()); // 数量
            wrkDetl.setWeight(locDetl.getAnfme());//总数
            wrkDetl.setAppeTime(now);
            wrkDetl.setAppeUser(userId);
            wrkDetl.setModiTime(now);

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -263,8 +263,8 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return FAIL.setMsg("盘点入库 ===>> 工作明细档为空; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                    }
                    // 修改库位状态 Q ====>> F
                    if (locMast.getLocSts().equals("Q")) {
                    // 修改库位状态 S ====>> F
                    if (locMast.getLocSts().equals("S")) {
                        locMast.setLocSts(wrkMast.getFullPlt().equals("Y")?"F":"D");
                        locMast.setBarcode(wrkMast.getBarcode());
                        locMast.setIoTime(now);

 src/main/java/com/zy/common/web/WcsController.java

@@ -58,15 +58,19 @@
        WrkMast wrkMast =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("wrk_no",param.getTaskNo())
                .in("io_type",103,107));
        if (Cools.isEmpty(wrkMast)){
        WrkMast wrkMast537 =wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                .eq("wrk_no",param.getTaskNo())
                .in("io_type",53,57));
        if (Cools.isEmpty(wrkMast)&&Cools.isEmpty(wrkMast537)){
            storageResult.setReturnStatus(1);
            storageResult.setErrorMessage("没有找到盘点拣料任务---------"+param.getTaskNo());
            return storageResult;
        }

        SearchLocParam searchLocParam = new SearchLocParam();
        searchLocParam.setBoxNo(wrkMast.getBarcode());
        searchLocParam.setBoxNo(Cools.isEmpty(wrkMast)?wrkMast537.getBarcode() : wrkMast.getBarcode());
        searchLocParam.setWcsIoType(1);//满板
        searchLocParam.setWcsSourceStaNo(wrkMast.getStaNo());
        searchLocParam.setWcsSourceStaNo(Cools.isEmpty(wrkMast)?wrkMast537.getSourceStaNo() : wrkMast.getStaNo());
        searchLocParam.setWcsStatus(0);
        return getLocNo(searchLocParam);
    }