1.0.3 pda关联嘱托-隐藏物料名称，显示生成单号，并传入生成单号，组托根据（物料编号+生成单号+通知单号）判断唯一性

王佳豪

2021-03-13 3f9b7886fa35a79db3ff2a5f47bd44214f5202e0

1.0.3
pda关联嘱托-隐藏物料名称，显示生成单号，并传入生成单号，组托根据（物料编号+生成单号+通知单号）判断唯一性

 src/main/java/com/zy/asrs/entity/param/CombParam.java

@@ -15,8 +15,19 @@
    // 成品码
    private String productCode;

    // 生成单号
    private String warehouse;

    private String billNo;

    public String getWarehouse() {
        return warehouse;
    }

    public void setWarehouse(String warehouse) {
        this.warehouse = warehouse;
    }

    public static class CombMat {

        // 物料编号

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

@@ -123,11 +123,13 @@
                    waitPakinService.delete(new EntityWrapper<WaitPakin>()
                            .eq("supplier", param.getBillNo())
                            .eq("matnr", combMat.getMatNo())
                            .eq("warehouse", param.getWarehouse())
                            .isNull("zpallet"));
                } else {
                    Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
                            .eq("supplier", param.getBillNo())
                            .eq("matnr", combMat.getMatNo())
                            .eq("warehouse", param.getWarehouse())
                            .isNull("zpallet");
                    WaitPakin pakin = new WaitPakin();
                    pakin.setAnfme(one.getAnfme() - waitPakin.getAnfme());

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

@@ -89,6 +89,10 @@
        <span>名称</span>
        <input id="matName" 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>
    <div class="form-item" style="margin-top: 5px">
        <span style="vertical-align: middle">数量</span>
        <div class="number-tool" style="vertical-align: middle">
@@ -97,23 +101,6 @@
    </div>
    <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>
@@ -134,7 +121,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: '物料编码', event: 'warehouse', style: 'cursor: pointer;color: blue'},
                {field: 'matNo', align: 'center', title: '物料编码'},
                {field: 'warehouse', align: 'center', title: '生成单号'}
//                {field: 'matName', align: 'center', title: '物料名称'}
            ]],
@@ -152,40 +139,21 @@
                        offset: '20px',
                        title: '修改数量',
                        shadeClose: true,
                        area: ['80%', '200px'],
                        area: ['80%', '220px'],
                        content: $("#modify"),
                        success: function (layero, index) {
                            $('#matNo').val(data.matNo);
                            $('#matName').val(data.matName);
                            $('#count').val(data.count);
                            $('#warehouse').val(data.warehouse);
                            maxCount = data.count;
                        }
                    });
                    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) {
@@ -267,8 +235,9 @@
    function confirm(){
        var matNo = $('#matNo').val();
        var count = $('#count').val();
        var warehouse = $("#warehouse").val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo) {
            if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                if (count > maxCount || count < minCount) {
                    tips("数量不能超过范围", true);
                    return;
@@ -284,8 +253,9 @@
    // 移除物料
    function remove() {
        var matNo = $('#matNo').val();
        var warehouse = $("#warehouse").val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo) {
            if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                matData.splice(j, 1);
            }
        }
@@ -337,13 +307,15 @@
            return;
        }
        var billNo = $('#billNo').val();
        var warehouse = $('#warehouse').val();
        $.ajax({
            url: baseUrl+"/mobile/comb/auth",
            headers: {'token': localStorage.getItem('token')},
            data: JSON.stringify({
                barcode: barcode,
                combMats: matData,
                billNo: billNo
                billNo: billNo,
                warehouse: warehouse,
            }),
            contentType:'application/json;charset=UTF-8',
            method: 'POST',