1.0.6 pda关联嘱托，支持点击物料编号查看物料的生成单号功能

王佳豪

2021-03-10 17ff4e0c0ede8f6cacd88525d1ac7a1cf44eb0af

1.0.6
pda关联嘱托，支持点击物料编号查看物料的生成单号功能

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

@@ -119,6 +119,7 @@
                vo.setMatNo(waitPakin.getMatnr());
                vo.setMatName(waitPakin.getMaktx());
                vo.setCount(waitPakin.getAnfme());
                vo.setWarehouse(waitPakin.getWarehouse());
                vos.add(vo);
            }
        }

 src/main/java/com/zy/asrs/entity/CombBillQueryVo.java

@@ -14,4 +14,6 @@

    private Double count;

    private String warehouse;

}

 src/main/webapp/static/js/locMatStatus/locMatStatus.js

@@ -560,7 +560,7 @@
            }
            // 更新物料状态
            $.ajax({
                url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&matStatusFlag=" + param.matStatusFlag,
                url: baseUrl+"/locDetl/getAllLocDetlData?loc_no=" + param.loc_no + "&matnr=" + param.matnr + "&mat_status=" + param.matStatusFlag,
                headers: {'token': localStorage.getItem('token')},
                // data: JSON.stringify(param),
                dataType:'json',

 src/main/webapp/views/pda/combPro.html

@@ -98,6 +98,24 @@
    <button id="remove" onclick="remove()">移除</button>
    <button id="confirm" onclick="confirm()">保存</button>
</div>

<!-- 显示生成单号弹窗 -->
<div id="warehouseModal" style="display: none; text-align: center; padding-top: 10px">
    <div class="form-item">
        <span>物料</span>
        <input id="matNo2" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>名称</span>
        <input id="matName2" type="text" disabled="disabled" style="width: 70%">
    </div>
    <div class="form-item">
        <span>生成单号</span>
        <input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
    </div>
    <button onclick="closeWarehouse()" style="margin-top: 8px">关闭</button>
</div>

</body>
<script>
    window.onload = function(){document.getElementById("code").focus();}
@@ -116,7 +134,7 @@
            cellMinWidth: 50,
            cols: [[
                {fixed: 'left', align: 'center', field: 'count', title: '数量', event: 'modify', style:'cursor: pointer;color: blue', width:50},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'matNo', align: 'center', title: '物料编码', event: 'warehouse', style: 'cursor: pointer;color: blue'},
                {field: 'matName', align: 'center', title: '物料名称'}
            ]],
            done: function (res, curr, count) {
@@ -143,11 +161,31 @@
                        }
                    });
                    break;
                case 'warehouse':
                    layer.open({
                        type: 1,
                        offset: '20px',
                        title: '生成单号明细',
                        shadeClose: true,
                        area: ['80%', '180px'],
                        content: $("#warehouseModal"),
                        success: function (layero, index) {
                            $('#matNo2').val(data.matNo);
                            $('#matName2').val(data.matName);
                            $('#warehouse').val(data.warehouse);
                        }
                    });
                    break;
            }
        });

    });

    /* 关闭生成单号明细 */
    function closeWarehouse() {
        layer.closeAll();
    }

    function findCode(el) {
        if (el.value.length === 7) {
            $('#billNo').focus();