1.原材料出库扫单子默认显示平仓数量 2.平仓入库允许移除物料 3.平仓入库组托物料数量必须大于0

王佳豪

2021-06-22 7ec625f960e125c3975d84bf113788fe97b9ff6b

1.原材料出库扫单子默认显示平仓数量
2.平仓入库允许移除物料
3.平仓入库组托物料数量必须大于0

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

@@ -137,7 +137,7 @@
    @RequestMapping("/bill/query/auth")
    @ManagerAuth(memo = "根据通知单查询明细")
    public R billQuery(@RequestParam String billNo){
        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).isNull("zpallet"));
        List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet"));
        List<CombBillQueryVo> vos = new ArrayList<>();
        if (!Cools.isEmpty(waitPakins)) {
            for (WaitPakin waitPakin : waitPakins) {

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

@@ -233,6 +233,20 @@
                            // cust_wait_pakin转cust_wait_pakin_log，并更新数量
                            custWaitPakinToLog(list.get(i), updateAnfme);
                        }
                        // 生成平仓出入库记录
                        LocNormalLog locLog = new LocNormalLog();
                        VersionUtils.setLocNormalLog(locLog, list.get(i));
                        if (Cools.isEmpty(locLog.getMemo())) {
                            locLog.setMemo("原材料");
                        }
                        locLog.setAnfme(increaseAnfme.doubleValue());
                        locLog.setIoType(1);
                        locLog.setCreateTime(new Date());
                        locLog.setCreateUser(list.get(i).getAppeUser());
                        if (!locNormalLogService.insert(locLog)) {
                            String logStr = JSON.toJSONString(locLog);
                            log.info("平仓材料入库记录插入失败,数据:" + logStr);
                        }
                        // erp更新 InStockbill和InStockBillEntry
                        erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), increaseAnfme.doubleValue());
                    } else {
@@ -242,6 +256,20 @@
                            // cust_wait_pakin转cust_wait_pakin_log，并更新数量
                            custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
                        }
                        // 生成平仓出入库记录
                        LocNormalLog locLog = new LocNormalLog();
                        VersionUtils.setLocNormalLog(locLog, list.get(i));
                        locLog.setAnfme(list.get(i).getAnfme().doubleValue());
                        if (Cools.isEmpty(locLog.getMemo())) {
                            locLog.setMemo("原材料");
                        }
                        locLog.setIoType(1);
                        locLog.setCreateTime(new Date());
                        locLog.setCreateUser(list.get(i).getAppeUser());
                        if (!locNormalLogService.insert(locLog)) {
                            String logStr = JSON.toJSONString(locLog);
                            log.info("平仓材料入库记录插入失败,数据:" + logStr);
                        }
                        // erp更新 InStockbill和InStockBillEntry
                        erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), list.get(i).getAnfme().doubleValue());
                    }

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

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

@@ -273,12 +274,14 @@
        var count = $('#count').val();
        var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
        for (var j = 0; j < matData.length; j++) {
            if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
                if (count > maxCount || count < minCount) {
                    tips("数量不能超过范围", true);
                    return;
            if (mnemonic) {
                if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
                    matData[j].count = Number(count);
                }
                matData[j].count = Number(count);
            } else {
                if (matNo === matData[j].matNo) {
                    matData[j].count = Number(count);
                }
            }
        }
        tableIns.reload({data: matData});
@@ -286,6 +289,26 @@
        tips("修改成功");
    }

    function remove() {
        var matnr = $('#matNo').val();
        var index = $('#index').val();
        var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
        for (var j = 0; j < matData.length; j++) {
            if (mnemonic) {
                if (matnr === matData[j].matNo && mnemonic === matData[j].mnemonic) {
                    matData.splice(j, 1);
                }
            } else {
                if (matnr === matData[j].matNo) {
                    matData.splice(j, 1);
                }
            }
        }
        tableIns.reload({data: matData});
        layer.close(countLayer);
        tips("移除成功");
    }

    window.onload = function () {
        document.getElementById("uuid").focus();
    }

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

@@ -293,7 +293,7 @@
                    if (res.data && res.data.length > 0) {
                        res.data.map(function (item) {
                            // 默认赋值0开始
                            item.anfmeOut = 0;
                            item.anfmeOut = item.anfme;
                        });
                    }
                    tableIns.reload({