#

qlsxk

2025-09-26 32e151c9022eb8b00a76bfff8ac66bbccee9b6b9

#

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

@@ -64,7 +64,6 @@
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.orderBy("loc_attribute",false);
        return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/common/service/CommonService.java

@@ -175,6 +175,10 @@
            for (Integer row : locRowGroupDesc) {
                String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                LocMast deepLoc = locMastService.selectById(deepLocNo);
                if (deepLoc == null) {
                    continue;
                }

                if (deepLoc.getLocSts().equals("F")) {
                    continue;
                } else if (deepLoc.getLocSts().equals("O")) {
@@ -208,6 +212,10 @@
                    for (Integer row : locRowGroupDesc) {
                        String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        if (deepLoc == null) {
                            continue;
                        }

                        if (!deepLoc.getLocSts().equals("O")) {
                            flag = false;
                            break;
@@ -215,10 +223,16 @@
                    }

                    if (flag) {
                        Integer firstRow = locRowGroupDesc.get(0);
                        String deepLocNo = Utils.getLocNo(firstRow, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        targetLocMast = deepLoc;
                        for (Integer row : locRowGroupDesc) {
                            String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                            LocMast deepLoc = locMastService.selectById(deepLocNo);
                            if (deepLoc == null) {
                                continue;
                            }

                            targetLocMast = deepLoc;
                            break;
                        }
                        break;
                    }
                }
@@ -245,6 +259,10 @@
            for (Integer row : locRowGroupDesc) {
                String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                LocMast deepLoc = locMastService.selectById(deepLocNo);
                if (deepLoc == null) {
                    continue;
                }

                if (deepLoc.getLocSts().equals("F")) {
                    continue;
                } else if (deepLoc.getLocSts().equals("O")) {
@@ -278,6 +296,10 @@
                    for (Integer row : locRowGroupDesc) {
                        String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                        LocMast deepLoc = locMastService.selectById(deepLocNo);
                        if (deepLoc == null) {
                            continue;
                        }

                        if (!deepLoc.getLocSts().equals("O")) {
                            flag = false;
                            break;
@@ -285,7 +307,16 @@
                    }

                    if (flag) {
                        targetLocMast = locMast;
                        for (Integer row : locRowGroupDesc) {
                            String deepLocNo = Utils.getLocNo(row, Utils.getBay(locNo), Utils.getLev(locNo));
                            LocMast deepLoc = locMastService.selectById(deepLocNo);
                            if (deepLoc == null) {
                                continue;
                            }

                            targetLocMast = deepLoc;
                            break;
                        }
                        break;
                    }
                }

 src/main/resources/mapper/LocMastMapper.xml

@@ -81,8 +81,6 @@
    and l.loc_no = d.loc_no
    and d.matnr = #{matnr}
    and l.lev1 = #{lev1}
    and l.loc_attribute = 1
    and l.loc_type1 = 1
    and l.loc_sts = 'F'
    </select>


 src/main/webapp/views/locMast/locMast.html

@@ -65,11 +65,6 @@
            <input class="layui-input" type="text" name="group1" placeholder="组" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="loc_attribute" placeholder="深浅库位号" autocomplete="off">
        </div>
    </div>
    <!-- 待添加 -->
    <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button>

 src/main/webapp/views/stoMan/stoQue.html

@@ -58,11 +58,6 @@
            <input class="layui-input" type="text" name="group1" placeholder="组" autocomplete="off">
        </div>
    </div>
    <div class="layui-inline">
        <div class="layui-input-inline">
            <input class="layui-input" type="text" name="loc_attribute" placeholder="深浅库位" autocomplete="off">
        </div>
    </div>
    <!-- 日期范围 -->
    <div class="layui-inline" style="width: 300px">
        <div class="layui-input-inline">