Merge branch 'xgmasrs' of https://gitee.com/luxiaotao1123/zy-asrs into xgmasrs

luxiaotao1123

2021-08-26 37286cd9b177e9a1b8f28bfbc054c8cfedec6a5e

 src/main/webapp/static/js/matStore/matStore.js

@@ -105,7 +105,7 @@
        switch (obj.event) {
            case 'remove':
                for (var i = matCodeData.length - 1; i >= 0; i--) {
                    if (matCodeData[i].matNo === data.matNo) {
                    if (matCodeData[i].billNo === data.billNo && matCodeData[i].seqNo === data.seqNo) {
                        matCodeData.splice(i, 1);
                    }
                }
@@ -160,6 +160,7 @@
            layer.msg("请输入数字");
        } else {
            if(count > (qty-inQty) ){
                count.html(59)
                layer.msg("入库数量不能超过可入库量");
            }
            if (count > 0) {