聚乳酸-出库作业，可以多牌号一起出，冻结状态从后台查

pang.jiabao

2025-02-25 6b218973dcf03a3601373ebe13fddd7a8896d68f

聚乳酸-出库作业，可以多牌号一起出，冻结状态从后台查

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -162,7 +162,11 @@
        OrderDetl orderDetl = orderDetlService.selectByOrderNoAndMaktx(orderNo, maktx);

        for (Pla pla : plas) {

            // 获取最新冻结状态
            Pla pla1 = plaService.selectOne(new EntityWrapper<Pla>().setSqlSelect("stock_freeze as stockFreeze").eq("id", pla.getId()));
            pla.setStockFreeze(pla1.getStockFreeze());
            pla.setStockFreezeBy(pla1.getStockFreezeBy());
            pla.setStockFreezeDate(pla1.getStockFreezeDate());
            if (pla.getStockFreeze() == 0) {
//                throw new CoolException("库存已被冻结，请重新选择库存");
                log.info("该库存已被其他用户冻结，请重新选择;{},{}", pla.getStockFreezeBy(), getUser().getUsername());

 src/main/webapp/static/js/cool.js

@@ -122,6 +122,14 @@

        if(selectOptionDom[0].type === "orderDetl"){
            $('#weight').val(selectOptionDom[0].weight);
            // 根据牌号选择进行过滤
            checkData = firstData.filter(item => item.brand === $('#maktxV').val())
            var allWeight = 0;
            for (var i in checkData){
                allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
            }
            // 根据牌号重新渲染
            $('#qtyWeight').val(allWeight);
        }
    }
    inputDom.val("");

 src/main/webapp/static/js/pla/stockOut.js

@@ -135,7 +135,7 @@
                    layer.msg('请先提取商品库存', {icon: 2});
                } else {
                    var data = locDetlData;
                    var brand;
                    // var brand;

                    for(var i=0; i<data.length; i++){
                        if(data[i].status === "暂入库" || data[i].status === "待入库" || data[i].status === "全部出库"|| data[i].weightAnfme < data[i].qtyAnfme){
@@ -143,12 +143,11 @@
                            return;
                        }

                        brand = brand ? brand : data[i].brand;

                        if(brand != data[i].brand){
                            layer.msg("选中的明细中含有多种牌号，请重新选择");
                            return;
                        }
                        // brand = brand ? brand : data[i].brand;
                        // if(brand != data[i].brand){
                        //     layer.msg("选中的明细中含有多种牌号，请重新选择");
                        //     return;
                        // }
                        // if(data[i].stockFreeze === 0){
                        //     layer.msg("选中的明细中含有冻结的库存，请解冻后操作");
                        //     return;
@@ -251,8 +250,9 @@
    layer.close(locDetlLayerIdx);
}

function clearTable(){
    locDetlData = [];
function clearTable(res){
    locDetlData = locDetlData.filter(item => item.brand !== res);
    tableIns.reload({data: locDetlData});
    parent.location.reload();
    // parent.location.reload();
    // console.log(locDetlData)
}

 src/main/webapp/views/pla/sellout.html

@@ -127,16 +127,18 @@
        }
    });

    var firstData = [];
    var checkData = [];
    var detailData = [];
    var deliveryTime;
    function child(data){
        checkData = data;
        var allWeight = 0;
        for (var i in checkData){
            allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
        }
        $('#qtyWeight').val(allWeight);
        firstData = data;
        // var allWeight = 0;
        // for (var i in checkData){
        //     allWeight += (checkData[i].weightAnfme - checkData[i].qtyAnfme)
        // }
        // $('#qtyWeight').val(allWeight);
        delivery();

    }
@@ -236,8 +238,12 @@
        // 数据提交动作
        form.on('submit(save)', function () {

            if($('#maktxV').val() != checkData[0].brand){
                layer.msg("选中的库存牌号与订单牌号不一致，请重新选择订单");
            // if($('#maktxV').val() != checkData[0].brand){
            //     layer.msg("选中的库存牌号与订单牌号不一致，请重新选择订单");
            //     return;
            // }
            if ($('#qtyWeight').val() === '0') {
                layer.msg("发货重量不能为0");
                return;
            }

@@ -267,8 +273,8 @@
                success: function (res) {
                    if (res.code === 200){
                        layer.msg("修改成功");
                        tableReload(true);
                        parent.clearTable();
                        // tableReload(true);
                        parent.clearTable($('#maktxV').val());
                    } else if (res.code === 403){
                        layer.msg(res.msg, {icon: 2})
                        return;