#

luxiaotao1123

2022-03-30 2d9665253e34da384fde299e2bc152a99f0c8ece

#

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

@@ -1,10 +1,13 @@
package com.zy.asrs.entity.param;

import lombok.Data;

import java.util.List;

/**
 * Created by vincent on 2020/6/11
 */
@Data
public class FullStoreParam {

    // 托盘条码
@@ -16,52 +19,18 @@
    // 物料列表数据
    private List<MatCodeStore> list;

    @Data
    public static class MatCodeStore {

        // 物料编号
        private String matNo;

        // 批号
        private String batch;

        // 物料数量
        private Double count;
        private Double anfme;

        public String getMatNo() {
            return matNo;
        }

        public void setMatNo(String matNo) {
            this.matNo = matNo;
        }

        public Double getCount() {
            return count;
        }

        public void setCount(Double count) {
            this.count = count;
        }
    }

    public String getBarcode() {
        return barcode;
    }

    public void setBarcode(String barcode) {
        this.barcode = barcode;
    }

    public Integer getDevpNo() {
        return devpNo;
    }

    public void setDevpNo(Integer devpNo) {
        this.devpNo = devpNo;
    }

    public List<MatCodeStore> getList() {
        return list;
    }

    public void setList(List<MatCodeStore> list) {
        this.list = list;
    }
}

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

@@ -112,7 +112,7 @@
        // 生成工作档明细
        List<DetlDto> detlDtos = new ArrayList<>();
        param.getList().forEach(elem -> {
            detlDtos.add(new DetlDto(elem.getMatNo(), elem.getCount()));
            detlDtos.add(new DetlDto(elem.getMatNo(), elem.getBatch(), elem.getAnfme()));
        });
        wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId);
        // 更新源站点信息

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

@@ -29,6 +29,7 @@
        if (detlDtos.isEmpty()){
            return;
        }
        Date now = new Date();
        for (DetlDto dto : detlDtos) {
            MatCode matCode = matCodeService.selectById(dto.getMatnr());
            if (Cools.isEmpty(matCode)){
@@ -37,14 +38,15 @@
            // 保持工作档明细
            WrkDetl wrkDetl = new WrkDetl();
            wrkDetl.setWrkNo(workNo);
            wrkDetl.setIoTime(new Date());
            wrkDetl.setIoTime(now);
            wrkDetl.setBatch(dto.getBatch());
            wrkDetl.setAnfme(dto.getAnfme()); // 数量
            VersionUtils.setWrkDetl(wrkDetl, matCode); // 版本控制
            wrkDetl.setZpallet(barcode); // 托盘条码
            wrkDetl.setAppeUser(userId);
            wrkDetl.setAppeTime(new Date());
            wrkDetl.setAppeTime(now);
            wrkDetl.setModiUser(userId);
            wrkDetl.setModiTime(new Date());
            wrkDetl.setModiTime(now);
            if (!this.insert(wrkDetl)) {
                throw new CoolException("保存工作明细失败");
            }

 src/main/webapp/static/js/pakStore/pakStore.js

@@ -65,17 +65,17 @@
            case 'comb':
                // 判断是否存在物料
                if (matCodeData.length === 0) {
                    layer.msg("请先添加物料");
                    layer.msg("请先提取商品", {icon: 2});
                    return;
                }
                // 判断物料数量是否存在异常
                for (var i=0;i<matCodeData.length;i++){
                    if (isNaN(matCodeData[i].anfme)) {
                        layer.msg("请输入数字");
                        layer.msg("请输入数字", {icon: 2});
                        return;
                    }
                    if (matCodeData[i].anfme === 0){
                        layer.msg("数量不能为零");
                    if (matCodeData[i].anfme <= 0){
                        layer.msg("数量必须大于零", {icon: 2});
                        return;
                    }
                }
@@ -91,7 +91,7 @@
                    async: false,
                    success: function (res) {
                        if (res.code === 200){
                            layer.msg("入库启动成功，目标库位：" + res.data);
                            layer.msg("入库启动成功，目标库位：" + res.data, {icon: 1});
                            matCodeData = [];
                            $('#focusMatByMat').val("");
                            tableIns.reload({data: matCodeData,done:function (res) { limit(); getInBound();}});
@@ -99,7 +99,7 @@
                        } else if (res.code === 403){
                            top.location.href = baseUrl+"/";
                        }else {
                            layer.msg(res.msg)
                            layer.msg(res.msg, {icon: 2})
                        }
                    }
                })