Merge branch 'integrationWms' into mdqzasrs

pang.jiabao

2025-03-26 5dac37cde0205be965c2b74dd1bddefc7f9cceda

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

@@ -1,5 +1,10 @@
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 = "";
    private String specs = "";
@@ -9,6 +14,9 @@
    private String standby1 = "";
    private String standby2 = "";
    private String standby3 = "";
    private String boxType1 = "1";
    private String boxType2 = "1";
    private String boxType3 = "1";

    public FindLocNoAttributeVo() {
    }
@@ -20,6 +28,20 @@
    public FindLocNoAttributeVo(String matnr, String batch) {
        this.matnr = matnr;
        this.batch = batch;
    }

    public FindLocNoAttributeVo(String matnr, String specs, String batch, String grade, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3) {
        this.matnr = matnr;
        this.specs = specs;
        this.batch = batch;
        this.grade = grade;
        this.brand = brand;
        this.standby1 = standby1;
        this.standby2 = standby2;
        this.standby3 = standby3;
        this.boxType1 = boxType1;
        this.boxType2 = boxType2;
        this.boxType3 = boxType3;
    }

    public FindLocNoAttributeVo(String matnr, String batch, String brand) {
@@ -45,6 +67,72 @@
        this.standby1 = standby1;
        this.standby2 = standby2;
        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;
    }

    public void setBoxType1(String boxType1) {
        this.boxType1 = boxType1;
    }

    public String getBoxType2() {
        return boxType2;
    }

    public void setBoxType2(String boxType2) {
        this.boxType2 = boxType2;
    }

    public String getBoxType3() {
        return boxType3;
    }

    public void setBoxType3(String boxType3) {
        this.boxType3 = boxType3;
    }

    public String getMatnr() {
@@ -110,4 +198,31 @@
    public void setStandby3(String standby3) {
        this.standby3 = standby3;
    }


    public boolean beSimilar(LocDetl locDetl){
        return (this.matnr.equals(locDetl.getMatnr())
                        && this.batch.equals(locDetl.getBatch())
                        && this.brand.equals(locDetl.getBrand())
                        && this.standby1.equals(locDetl.getStandby1())
                        && this.standby2.equals(locDetl.getStandby2())
                        && this.standby3.equals(locDetl.getStandby3())
                        && this.boxType1.equals(locDetl.getBoxType1())
                        && this.boxType2.equals(locDetl.getBoxType2())
                        && this.boxType3.equals(locDetl.getBoxType3())
        );
    }

    public boolean beSimilar(WrkDetl wrkDetl){
        return (this.matnr.equals(wrkDetl.getMatnr())
                && this.batch.equals(wrkDetl.getBatch())
                && this.brand.equals(wrkDetl.getBrand())
                && this.standby1.equals(wrkDetl.getStandby1())
                && this.standby2.equals(wrkDetl.getStandby2())
                && this.standby3.equals(wrkDetl.getStandby3())
                && this.boxType1.equals(wrkDetl.getBoxType1())
                && this.boxType2.equals(wrkDetl.getBoxType2())
                && this.boxType3.equals(wrkDetl.getBoxType3())
        );
    }
}