1.0.3 1.优化关联组托

王佳豪

2021-03-15 dc9ca11c3f992a3caf8257892e7c620cdcacdffa

1.0.3
1.优化关联组托

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

@@ -99,10 +99,10 @@
                        .eq("matnr", combMat.getMatNo())
                        .isNull("zpallet"));
                if (one == null) {
                    throw new CoolException("通知单不存在"+combMat.getMatNo()+"数据！");
                    throw new CoolException("通知单不存在" + combMat.getMatNo() + "数据！");
                }
                if (combMat.getCount() > one.getAnfme()) {
                    throw new CoolException(combMat.getMatNo()+"物料数量不足！");
                    throw new CoolException(combMat.getMatNo() + "物料数量不足！");
                }
                MatCode matCode = matCodeService.selectById(combMat.getMatNo());
                if (Cools.isEmpty(matCode)) {
@@ -126,11 +126,17 @@
                            .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");
                    Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>();
                    if ("".equals(param.getWarehouse())) {
                        wrapper.eq("supplier", param.getBillNo())
                                .eq("matnr", combMat.getMatNo())
                                .isNull("zpallet");
                    } else {
                        wrapper.eq("supplier", param.getBillNo())
                                .eq("matnr", combMat.getMatNo())
                                .eq("warehouse", param.getWarehouse())
                                .isNull("zpallet");
                    }
                    WaitPakin pakin = new WaitPakin();
                    pakin.setAnfme(one.getAnfme() - waitPakin.getAnfme());
                    if (!waitPakinService.update(pakin, wrapper)) {
@@ -143,8 +149,6 @@


        }




    }

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

@@ -61,7 +61,7 @@
    </div>
    <div class="layui-input-inline" style="margin-top: 5px">
        <label class="layui-form-label">单号</label>
        <input class="layui-input" id="billNo" onkeyup="find(this)" placeholder="扫码 / 输入" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
        <input class="layui-input" id="billNo" oninput="find(this)" placeholder="扫码 / 输入" autocomplete="off" style="width: 75%; height: 40px; margin-right: 0;">
    </div>
</header>

@@ -193,6 +193,10 @@
        if (isEmpty(billNo)) {
            return;
        }
        // 赋值前清空表格
        matData = [];
        tableIns.reload({data: matData});

        $.ajax({
            url: baseUrl + "/mobile/bill/query/auth",
            headers: {'token': localStorage.getItem('token')},
@@ -235,7 +239,7 @@
    function confirm(){
        var matNo = $('#matNo').val();
        var count = $('#count').val();
        var warehouse = $("#warehouse").val();
        var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                if (count > maxCount || count < minCount) {
@@ -253,7 +257,7 @@
    // 移除物料
    function remove() {
        var matNo = $('#matNo').val();
        var warehouse = $("#warehouse").val();
        var warehouse = $("#warehouse").val() === '' ? null : $("#warehouse").val();
        for (var j=0;j<matData.length;j++){
            if (matNo === matData[j].matNo && warehouse === matData[j].warehouse) {
                matData.splice(j, 1);