wms功能完善

pjb

昨天 2ded9514aa9a93ee440af0b1437d788fb052028b

 src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java

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

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

import java.util.ArrayList;
import java.util.List;

/**
@@ -30,33 +28,43 @@
        // 变更数量
        private Double count;

        public LocDetlAdjust(String matnr, String batch, Double count) {
            this.matnr = matnr;
            this.batch = batch;
            this.count = count;
        }
        private String zpallet;

        private String model;

        private String manuDate;

        private Double weight;
        private Double manLength;
        private Double volume;

//        public LocDetlAdjust(String matnr, String batch, Double count) {
//            this.matnr = matnr;
//            this.batch = batch;
//            this.count = count;
//        }
    }

    public void integrate() {
        if (Cools.isEmpty(list)) {
            return;
        }
        List<LocDetlAdjust> copyList = new ArrayList<>();
        for (LocDetlAdjust adjust : list) {
            boolean exit = false;
            for (LocDetlAdjust copy : copyList) {
                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
                    copy.setCount(copy.getCount() + adjust.getCount());
                    exit = true;
                    break;
                }
            }
            if (!exit) {
                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
            }
        }
        list = copyList;
    }
//    public void integrate() {
//        if (Cools.isEmpty(list)) {
//            return;
//        }
//        List<LocDetlAdjust> copyList = new ArrayList<>();
//        for (LocDetlAdjust adjust : list) {
//            boolean exit = false;
//            for (LocDetlAdjust copy : copyList) {
//                if (adjust.getMatnr().equals(copy.getMatnr()) && Cools.eq(adjust.getBatch(), copy.getBatch())) {
//                    copy.setCount(copy.getCount() + adjust.getCount());
//                    exit = true;
//                    break;
//                }
//            }
//            if (!exit) {
//                copyList.add(new LocDetlAdjustParam.LocDetlAdjust(adjust.getMatnr(), adjust.getBatch(), adjust.getCount()));
//            }
//        }
//        list = copyList;
//    }


}