#

18516761980

2022-08-02 33cc8de8a39b88d619cce6e80f13564a85e5dce0

#

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

@@ -73,13 +73,13 @@
            if (tempLocList.size() > 0) {
                for (Integer j = 0; j < tempLocList.size(); j ++) {
                    locNum = locNum.add(new BigDecimal(tempLocList.get(j).getAnfme()));
                    /* 计算需要的数量，符合数量后结束循环 */
                    if (needNum.compareTo(locNum) == 1) {
//                    /* 计算需要的数量，符合数量后结束循环 */
//                    if (needNum.compareTo(locNum) == 1) {
                        locList.add(tempLocList.get(j));
                    } else {
                        locList.add(tempLocList.get(j));
                        break;
                    }
//                    } else {
//                        locList.add(tempLocList.get(j));
//                        break;
//                    }
                }
            }
        }
@@ -166,7 +166,8 @@
        // 获取库位明细
        List<LocDetlDto> locDetlDtos = new ArrayList<>();
        for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
            if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())
                && paramLocDetl.getCount() > 0) {
                LocDetl sqlParam = new LocDetl();
                sqlParam.setLocNo(paramLocDetl.getLocNo());
                sqlParam.setMatnr(paramLocDetl.getMatnr());
@@ -209,6 +210,10 @@
//            }
            // 获取库位
            LocMast locMast = locMastService.selectById(dto.getLocNo());
            //如果托盘条码为空，就不能进行拣料，无法再入库
            if(ioType==103 && null!=locMast && Cools.isEmpty(locMast.getBarcode())){
                throw new CoolException("库位没有托盘码，无法拣料作业===>>" + locMast.getLocNo());
            }
            // 获取路径
            Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                    .eq("type_no", ioType)

 src/main/resources/application.yml

@@ -45,7 +45,7 @@
erp:
  db:
    driver_class_name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    ur: jdbc:sqlserver://192.168.0.253:1433;databasename=xtyasrs_dual
    ur: jdbc:sqlserver://localhost:1433;databasename=xtyasrs_dual
    #    ur: jdbc:sqlserver://192.168.4.208:1433;databasename=xtyasrs_dual
    username: sa
    password: sa@123

 src/main/webapp/views/pakStore/outStockDetail.html

@@ -21,12 +21,18 @@
                <option value="">请选择站点</option>
            </select>
        </div>
        <button class="layui-btn layui-btn-sm" style="display: inline-block" id="btn-outbound" lay-event="outbound"
                onclick="outbound()">启动出库
        </button>
<!--        <button class="layui-btn layui-btn-sm" style="display: inline-block" id="btn-outbound" lay-event="outbound"-->
<!--                onclick="outbound()">启动出库-->
<!--        </button>-->
    </div>
    <table class="layui-hide" id="stockOut" lay-filter="stockOut"></table>
</div>

<script type="text/html" id="toolbar">
    <div class="layui-btn-container">
        <button class="layui-btn" id="btn-confirm" lay-event="outbound" style="">启动出库</button>
    </div>
</script>

<script type="text/template" id="takeSiteSelectTemplate">
    {{#each data}}
@@ -48,9 +54,10 @@

    function getCol() {
        var cols = [
            {field: '', align: 'center', title: '', width: 50, type: 'numbers'}
            , {field: 'locNo$', align: 'center', title: '库位号'}
            , {field: 'matnr', align: 'center',title: '物料编码'}
            {type: 'checkbox'}
            ,{field: '', align: 'center', title: '', width: 50, type: 'numbers'}
            ,{field: 'locNo$', align: 'center', title: '库位号'}
            ,{field: 'matnr', align: 'center',title: '物料编码'}
            ,{field: 'maktx', align: 'center',title: '物料名称', width: 500}
            ,{field: 'lgnum', align: 'center',title: '规格'}
            ,{field: 'type', align: 'center',title: '物料类别'}
@@ -80,6 +87,7 @@
            limit: 9999,
            limits: [9999],
            even: true,
            toolbar: '#toolbar',
//            cellMinWidth: 50,
            cols: [getCol()],
            request: {
@@ -99,7 +107,7 @@
                if (res.code === 403) {
                    top.location.href = baseUrl + "/";
                }
                locData = res.data;
                // locData = res.data;
            }
        });

@@ -122,6 +130,56 @@
                }
            }
        });

        // 监听头工具栏事件
        table.on('toolbar(stockOut)', function (obj) {
            var checkStatus = table.checkStatus(obj.config.id);
            locData = checkStatus.data;
            switch(obj.event) {
                case 'outbound':
                    if (locData.length === 0){
                        layer.msg("请选择数据");
                        return;
                    }
                    debugger;
                    var staNo = $("#staNoSelect").val();
                    if (staNo === "" || staNo === null){
                        layer.msg("请选择出库口");
                        return;
                    }
                    var locDetls = [];
                    locData.forEach(function(elem) {
                        if (elem.anfme > 0) {
                            locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.anfme});
                        }
                    });
                    let param = {
                        outSite: staNo,
                        locDetls: locDetls,
                        fbillNo: orderData.fbillNo,
                    }
                    // 调用出库接口
                    $.ajax({
                        url: baseUrl+"/plate/outStock/start",
                        headers: {'token': localStorage.getItem('token')},
                        data: JSON.stringify(param),
                        contentType:'application/json;charset=UTF-8',
                        method: 'POST',
                        success: function (res) {
                            if (res.code === 200){
                                parent.closeDetail(res.msg);
                                parent.tableReload();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            } else {
                                layer.msg(res.msg)
                            }
                        }
                    });
                    break;
            }
        });

    });

    /* 启动出库 */