#

wang..123

2022-02-16 14942ae273530a952c2a8b0186702d26d37ec588

#

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

@@ -35,6 +35,26 @@
        private String supplier;
        // 变更数量
        private Double count;
        //变更供应商
        private String vendor;
        //变更来源
        private String source;

        public String getSource() {
            return source;
        }

        public void setSource(String source) {
            this.source = source;
        }

        public String getVendor() {
            return vendor;
        }

        public void setVendor(String vendor) {
            this.vendor = vendor;
        }

        public String getMatNo() {
            return matNo;

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

@@ -678,6 +678,12 @@
                locDetl.setAppeUser(userId);
                locDetl.setAppeTime(new Date());
                locDetl.setZpallet(param.getZpallet());//托盘号
                locDetl.setVendor(adjust.getVendor());
                locDetl.setSource(adjust.getSource());
                locDetl.setSupplier(adjust.getSupplier());
                locDetl.setQtyBox(matCode.getStr6());
                locDetl.setAllQty(matCode.getStr6()*adjust.getCount());
                locDetl.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                if (!locDetlService.insert(locDetl)) {
                    throw new CoolException("保存库存明细失败");
                }
@@ -698,11 +704,18 @@
                            throw new CoolException("清除库存明细失败");
                        }
                    } else {
                        MatCode matCode = matCodeService.selectById(adjust.getMatNo());
                        LocDetl sqlParam1 = new LocDetl();
                        sqlParam1.setQty(adjust.getCount());
                        sqlParam1.setSupplier(adjust.getSupplier());
                        sqlParam1.setModiTime(new Date());
                        sqlParam1.setModiUser(userId);
                        sqlParam1.setVendor(adjust.getVendor());
                        sqlParam1.setSource(adjust.getSource());
                        sqlParam1.setSupplier(adjust.getSupplier());
                        sqlParam1.setQtyBox(matCode.getStr6());
                        sqlParam1.setAllQty(matCode.getStr6()*adjust.getCount());
                        sqlParam1.setAllWeight(matCode.getWeight()*adjust.getCount()+30);
                        if (!locDetlService.update(sqlParam1, new EntityWrapper<LocDetl>()
                                .eq("loc_no", locMast.getLocNo())
                                .eq("mat_no", adjust.getMatNo())

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

@@ -3,8 +3,18 @@
var matCodeData = [];
var currLocNo;
function getCol() {
    arrRemove(detlCols, "field", "str3");
    arrRemove(detlCols, "field", "str4")
    arrRemove(detlCols, "field", "str5$")
    arrRemove(detlCols, "field", "str6")
    var cols = [
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'}
        {fixed: 'left', field: 'count', title: '实际数量', align: 'center', edit:'text', width: 120,  style:'color: blue;font-weight: bold'},
        // {field: 'supplier', title: '批号', align: 'center', edit:'text', width: 120},
        {field: 'source', title: '来源', align: 'center', edit:'text', width: 120},
        {field: 'vendor', title: '供应商', align: 'center', edit:'text', width: 120}
        ,{field: 'qtyBox', align: 'center', title: '每箱数量(PCS)'}
        // {field: 'allqty', title: '总数量', align: 'center'},
        // {field: 'allweight', title: '总重量', align: 'center'}
        // ,{field: 'anfme', align: 'center',title: '数量'}
    ];
    arrRemove(detlCols, "field", "anfme")
@@ -35,7 +45,34 @@

    // 页面修改
    table.on('edit(chooseData)', function (obj) {
        if(obj.field === 'count'){
        updateMatCodeData(obj.data.matNo,obj.data.supplier, Number(obj.value));
        }

        if (obj.field === 'supplier'){
            for (var i=0;i<matCodeData.length;i++){
                if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["count"] === obj.data.count && matCodeData[i]["qty"] === obj.data.qty){
                    matCodeData[i]["supplier"] = obj.data.supplier;
                }
            }
        }
        if (obj.field === 'source'){
            for (var i=0;i<matCodeData.length;i++){
                if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["supplier"] === obj.data.supplier){
                    matCodeData[i]["source"] = obj.data.source;
                }
            }
        }
        if (obj.field === 'vendor'){
            for (var i=0;i<matCodeData.length;i++){
                if (matCodeData[i]["matNo"] === obj.data.matNo && matCodeData[i]["supplier"] === obj.data.supplier){
                    matCodeData[i]["vendor"] = obj.data.vendor;
                }
            }
        }
        tableIns.reload({data: matCodeData,done:function (res) {
                limit();
            }});
    });

    // 监听头工具栏事件
@@ -51,6 +88,7 @@
                    layer.msg("请先添加产品");
                    return;
                }
               // debugger
                for (var i=0;i<matCodeData.length;i++){

                    if (isNaN(matCodeData[i].count)) {
@@ -283,6 +321,8 @@
                unit: data[i].unit,
                zpallet:zpa,
                supplier:'',
                qtyBox:data[i].str6,
                weight:data[i].weight,
                qty:0
            })
        }