Merge branch 'integrationWms' into mdqzasrs

pang.jiabao

2025-03-26 5dac37cde0205be965c2b74dd1bddefc7f9cceda

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

@@ -1,7 +1,9 @@
package com.zy.asrs.entity.result;

import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.param.FullStoreParam;

public class FindLocNoAttributeVo {
    private String matnr = "";
@@ -67,6 +69,48 @@
        this.standby3 = standby3;
    }

    public FindLocNoAttributeVo(WaitPakin waitPakin) {
        this.matnr = waitPakin.getMatnr();
        this.specs = waitPakin.getSpecs();
        this.batch = waitPakin.getBatch();
//        this.grade = waitPakin.g;
        this.brand = waitPakin.getBrand();
        this.standby1 = waitPakin.getStandby1();
        this.standby2 = waitPakin.getStandby2();
        this.standby3 = waitPakin.getStandby3();
        this.boxType1 = waitPakin.getBoxType1();
        this.boxType2 = waitPakin.getBoxType2();
        this.boxType3 = waitPakin.getBoxType3();
    }

    public FindLocNoAttributeVo(FullStoreParam.MatCodeStore matCodeStore) {
        this.matnr = matCodeStore.getMatnr();
        this.specs = matCodeStore.getSpecs();
        this.batch = matCodeStore.getBatch();
//        this.grade = waitPakin.g;
        this.brand = matCodeStore.getBrand();
        this.standby1 = matCodeStore.getStandby1();
        this.standby2 = matCodeStore.getStandby2();
        this.standby3 = matCodeStore.getStandby3();
        this.boxType1 = matCodeStore.getBoxType1();
        this.boxType2 = matCodeStore.getBoxType2();
        this.boxType3 = matCodeStore.getBoxType3();
    }

    public FindLocNoAttributeVo(LocDetl locDetl) {
        this.matnr = locDetl.getMatnr();
        this.specs = locDetl.getSpecs();
        this.batch = locDetl.getBatch();
//        this.grade = waitPakin.g;
        this.brand = locDetl.getBrand();
        this.standby1 = locDetl.getStandby1();
        this.standby2 = locDetl.getStandby2();
        this.standby3 = locDetl.getStandby3();
        this.boxType1 = locDetl.getBoxType1();
        this.boxType2 = locDetl.getBoxType2();
        this.boxType3 = locDetl.getBoxType3();
    }

    public String getBoxType1() {
        return boxType1;
    }