#订单出库可输入单次出库数量

zjj

2024-12-16 7b898c33e27b967eae013573538fb36b432d927a

#订单出库可输入单次出库数量

 license.lic

Binary files differ

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

@@ -1,5 +1,7 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
@@ -55,6 +57,96 @@
        return R.ok().add(orderDetlService.selectByOrderId(orderId).stream().map(OrderDetl::getId).distinct().collect(Collectors.toList()));
    }

    @PostMapping("/out/pakout/previewCustomQuantity/auth")
    @ManagerAuth
    public R pakoutPreviewCustomQuantity(@RequestBody JSONObject jsonObject) {
        List<Long> ids = JSON.parseObject(jsonObject.get("ids").toString(), ArrayList.class);
        Double amount = JSON.parseObject(jsonObject.get("amount").toString(), Double.class);
        if (Cools.isEmpty(ids)) {
            return R.parse(BaseRes.PARAM);
        }
        List<OrderDetl> orderDetls = orderDetlService.selectBatchIds(ids);
        List<LocDto> locDtos = new ArrayList<>();

        Set<String> exist = new HashSet<>();

        for (OrderDetl orderDetl : orderDetls) {
            double issued = Optional.of(orderDetl.getAnfme() - orderDetl.getWorkQty()).orElse(0.0D);
            if (!Cools.isEmpty(amount)) {
                if (amount > issued) {
                    return R.error("数量高于可出库数量");
                }
                issued = amount;
            }

            if (issued <= 0.0D) { continue; }
            List<LocDetl> locDetls = new ArrayList<>();
            locDetls = locDetlService.queryStockFour(orderDetl.getMatnr(), orderDetl.getBatch(), null, exist);
            for (LocDetl locDetl : locDetls) {
                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
                List<LocMast> locMasts = new ArrayList<>();
                if (locMast.getBay1() >=1 && locMast.getBay1()<=2){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMast.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locMast.getLocType1())
                            .orderBy("bay1", false));
                }else if (locMast.getBay1() >=4 && locMast.getBay1()<=12){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMast.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locMast.getLocType1())
                            .orderBy("bay1", true));
                }else {
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>()
                            .eq("gro1", locMast.getGro1())
                            .eq("crn_no", 7)
                            .eq("loc_type1",locMast.getLocType1())
                            .orderBy("bay1", false));
                }
                for (LocMast locMast1 : locMasts){
                    if (locMast1.getLocSts().equals("F")){
                        LocDetl locDetl1 = locDetlService.selectOne(new EntityWrapper<LocDetl>()
                                .eq("loc_No", locMast1.getLocNo())
                                .eq("matnr", locDetl.getMatnr()).eq("batch", locDetl.getBatch()));
                        if (!Cools.isEmpty(locDetl1)) {
                            if (issued > 0) {
                                LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
                                        issued >= locDetl.getAnfme() ? locDetl.getAnfme() : issued);
                                List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
                                List<LocDto.staListDto> maps = new ArrayList<>();
                                for (Integer staNo : staNos) {
                                    LocDto.staListDto staListDto = new LocDto.staListDto();
                                    staListDto.setStaNo(staNo);
                                    staListDto.setStaName(Utils.getStaName(staNo));
                                    maps.add(staListDto);
                                }
                                locDto.setStaNos(maps);
                                locDtos.add(locDto);
                                // 剩余待出数量递减
                                issued = issued - locDetl.getAnfme();
                            }else {
                                break;
                            }


                        }
                    }
                }




            }
            if (issued > 0) {
                LocDto locDto = new LocDto(null, orderDetl.getMatnr(), orderDetl.getMaktx(), orderDetl.getBatch(), orderDetl.getOrderNo(), issued);
                locDto.setLack(Boolean.TRUE);
                locDtos.add(locDto);
            }
        }
        return R.ok().add(locDtos);
    }

    @PostMapping("/out/pakout/preview/auth")
    @ManagerAuth
    public R pakoutPreview(@RequestBody List<Long> ids) {

 src/main/webapp/static/js/inventoryCheckOrder/inventoryCheckOrder.js

@@ -124,33 +124,7 @@
                    var warehouseArea = $('#warehouseArea').val();


                    // 发送 Ajax 请求到后端
                    $.ajax({
                        url: baseUrl+"/inventoryCheckOrder/add/auth", // 替换为你的后端接口地址
                        headers: {'token': localStorage.getItem('token')},
                        contentType: 'application/json;charset=UTF-8',
                        method: 'POST',
                        data: JSON.stringify({ orderNo: billNumber,area: warehouseArea }),
                        success: function (res) {
                            if (res.code === 200){
                                layer.msg(res.msg, {icon: 1});
                                // 清空输入框
                                $('#billNumber').val('');
                                $('#warehouseArea').val('堆垛机'); // 重置为默认选项
                                form.render('select'); // 重新渲染 select

                                // 关闭弹框
                                layer.close(index);
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        },
                        error: function () {
                            layer.msg('请求失败');
                        }
                    });
                });
            }
        });

 src/main/webapp/static/js/order/out.js

@@ -118,12 +118,50 @@
        switch (obj.event) {
            // 出库
            case 'pakoutPreview':
                pakoutPreview([data.id])
                pakoutPreviewCustomQuantity([data.id])
                break;
        }
    });

    function pakoutPreview(ids) {
    function pakoutPreviewCustomQuantity(ids){
        // 弹框内容
        var content = `
                <form class="layui-form" id="billForm" style="padding: 20px;">                    
                    <div class="layui-form-item" style="margin-bottom: 20px;">
                        <label class="layui-form-label" style="width: 80px; font-size: 14px;">数量：</label>
                        <div class="layui-input-block" style="margin-left: 110px;">
                           <input class="layui-input" type="number" id="amount" placeholder="请输入出库数量">
                        </div>
                    </div>
                    <div class="layui-form-item" style="text-align: right;">
                        <button type="button" class="layui-btn" id="saveBtn" style="display: inline-block; padding: 0px 20px; font-size: 16px; background-color: #5FB878; border-color: #5FB878; text-align: center;">保存</button>
                    </div>
                </form>
            `;

        // 弹框
        layer.open({
            type: 1,  // 使用 HTML 内容
            title: '输入出库数量',
            content: content,
            area: ['400px', '200px'],  // 弹框大小
            shadeClose: true,  // 点击遮罩关闭
            offset: '100px',
            success: function (layero, index) {
                form.render();
                // 点击保存按钮事件
                $('#saveBtn').on('click', function () {
                    var amount = $('#amount').val();
                    console.log(amount)
                    pakoutPreview2(ids,amount);


                });
            }
        });
    }

    function pakoutPreview(ids,amount) {
        let loadIndex = layer.load(2);
        $.ajax({
            url: baseUrl + "/out/pakout/preview/auth",
@@ -277,6 +315,163 @@
        })
    }

    function pakoutPreview2(ids,amount) {
        let loadIndex = layer.load(2);
        var json = {}
        json.ids = ids
        json.amount = amount
        $.ajax({
            url: baseUrl + "/out/pakout/previewCustomQuantity/auth",
            headers: {'token': localStorage.getItem('token')},
            contentType: 'application/json;charset=UTF-8',
            data: JSON.stringify(json),
            method: 'POST',
            success: function (res) {
                layer.close(loadIndex);
                var tableCache;
                if (res.code === 200){
                    layer.open({
                        type: 1
                        ,title: false
                        ,closeBtn: false
                        ,offset: '50px'
                        ,area: ['1200px', '700px']
                        ,shade: 0.5
                        ,shadeClose: false
                        ,btn: ['立即出库', '稍后处理']
                        ,btnAlign: 'c'
                        ,moveType: 1 //拖拽模式，0或者1
                        ,content: $('#pakoutPreviewBox').html()
                        ,success: function(layero, index){
                            stoPreTabIdx = table.render({
                                elem: '#stoPreTab',
                                data: res.data,
                                height: 520,
                                page: false,
                                limit: Number.MAX_VALUE,
                                cellMinWidth: 100,
                                cols: [[
                                    // {type: 'checkbox', merge: ['orderNo']},
                                    {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                                    {field: 'title', title: '商品', merge: true, align: 'center', width: 350},
                                    {field: 'batch', title: '序列码', align: 'center'},
                                    {field: 'anfme', title: '数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'locNo', title: '货位', align: 'center', width: 100, templet: '#locNoTpl'},
                                    {field: 'staNos', align: 'center', title: '出库站', merge: ['locNo'], templet: '#tbBasicTbStaNos'},
                                    {type: 'checkbox', merge: ['locNo']},
                                ]],
                                done: function (res) {
                                    tableMerge.render(this);
                                    $('.layui-table-body.layui-table-main').css("overflow", "auto");
                                    tableCache = tableData = table.cache.stoPreTab;
                                }
                            });
                            // 修改出库站
                            form.on('select(tbBasicTbStaNos)', function (obj) {
                                let index  = obj.othis.parents('tr').attr("data-index");
                                let data = tableCache[index];
                                for (let i = 0; i<tableCache.length; i++) {
                                    if (tableCache[i].locNo === data.locNo) {
                                        tableCache[i]['staNo'] = Number(obj.elem.value);
                                    }
                                }
                                obj.othis.children().find("input").css("color", "blue");
                                return false;
                            });
                            // 批量修改出库站
                            form.on('submit(batchModifySta)', function () {
                                let stoPreTabData = layui.table.checkStatus('stoPreTab').data;
                                if (stoPreTabData.length < 1) {
                                    layer.msg("请至少选择一条以上合并数据", {icon: 7});
                                    return false;
                                }
                                modifySta(stoPreTabData);
                            });
                            // 批量修改出库站 - 站点选择
                            function modifySta(stoPreTabData) {
                                // 出库站取交集
                                let staBatchSelectVal = [];
                                for(let i = 0; i<stoPreTabData.length; i++) {
                                    let staNos = stoPreTabData[i].staNos;
                                    if (staNos !== null) {
                                        if (staBatchSelectVal.length === 0) {
                                            staBatchSelectVal = staNos;
                                        } else {
                                            staBatchSelectVal = staBatchSelectVal.filter(val =>
                                                {
                                                    return new Set(staNos).has(val)
                                                }
                                            )
                                        }
                                    }
                                }
                                if (staBatchSelectVal.length === 0) {
                                    layer.msg("出库站没有交集，无法批量修改", {icon: 2});
                                    return;
                                }
                                admin.open({
                                    type: 1,
                                    area: '300px',
                                    offset: 'auto',
                                    title: '请选择站点',
                                    content: $('#staBatchSelectDialog').html(),
                                    success: function (layero, ddIndex) {
                                        // 渲染下拉框
                                        let template = Handlebars.compile($('#batchStaSelectTpl').html());
                                        $('#batchSelectStaBox').html(template({list: staBatchSelectVal}));
                                        // 确认
                                        form.on('submit(staBatchSelectConfirm)', function (obj) {
                                            let loadIdx = layer.load(2);
                                            let batchSta = Number(obj.field.batchSta);
                                            let arr = [];
                                            for (let j = 0; j<stoPreTabData.length; j++) {
                                                for (let i = 0; i<tableCache.length; i++) {
                                                    if (tableCache[i].orderNo === stoPreTabData[j].orderNo
                                                        && tableCache[i].matnr === stoPreTabData[j].matnr
                                                        && tableCache[i].locNo === stoPreTabData[j].locNo) {
                                                        tableCache[i]['staNo'] = batchSta;
                                                        arr.push(i);
                                                    }
                                                }
                                            }
                                            stoPreTabIdx.reload({data: tableCache});
                                            arr.forEach(item => {
                                                $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .order-sta-select').val(batchSta);
                                            });
                                            layui.form.render('select');
                                            arr.forEach(item => {
                                                $('div[lay-id=stoPreTab] tr[data-index="' + item + '"] .layui-select-title').find("input").css("color", "blue");
                                            });
                                            layer.close(loadIdx); layer.close(ddIndex);
                                            return false;
                                        });
                                        // 弹窗不出现滚动条
                                        $(layero).children('.layui-layer-content').css('overflow', 'visible');
                                        layui.form.render('select');
                                    },
                                })
                            }

                        }
                        ,yes: function(index, layero){
                            //按钮【立即出库】的回调
                            pakout(tableCache, index);
                        }
                        ,btn2: function(index, layero){
                            //按钮【稍后处理】的回调
                            layer.close(index)
                            //return false 开启该代码可禁止点击该按钮关闭
                        }
                    });
                } else if (res.code === 403){
                    top.location.href = baseUrl+"/";
                } else {
                    layer.msg(res.msg, {icon: 2})
                }
            }
        })
    }

    function pakout(tableCache, layerIndex) {
        // let loadIndex = layer.load(2);
        notice.msg('正在生成出库任务......', {icon: 4});