#

luxiaotao1123

2022-04-02 429082daa99524dde4dcfbd80d1d0f6d027b117f

#

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

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

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

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

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

        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;
    }



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

@@ -580,6 +580,7 @@
    @Override
    @Transactional
    public void adjustLocDetl(LocDetlAdjustParam param, Long userId) {
        param.integrate();
        LocMast locMast = locMastService.selectById(param.getLocNo());
        if (Cools.isEmpty(locMast)) {
            throw new CoolException("库位不存在");
@@ -654,6 +655,7 @@
            Mat mat = matService.selectByMatnr(adjust.getMatnr());
            LocDetl locDetl = new LocDetl();
            locDetl.sync(mat);
            locDetl.setBatch(adjust.getBatch());
            locDetl.setLocNo(locMast.getLocNo());
            locDetl.setAnfme(adjust.getCount()); // 数量
            locDetl.setModiUser(userId); // 操作人员信息