1.发货通知-平仓出库支持生产单号的搜索过滤

王佳豪

2021-06-25 754bc2945aa5c91a510780d8e2c451c3bae576fb

 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 {
@@ -241,6 +255,20 @@
                        if (baseMapper.pdaLocNormalIn(addList) > 0) {
                            // 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());
@@ -485,12 +513,12 @@
    }

    @Override
    public List<LocNormal> queryLocNorlMatnr(String fbillNo) {
    public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic) {
        List<OutStockBillEntry> matList = outStockMapper.queryMatnrWithBillNo(fbillNo);
        List<LocNormal> locNormal = new ArrayList<>();
        List<LocNormal> locNormalResult = new ArrayList<>();
        for (Integer i = 0; i < matList.size(); i++) {
            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber()) ;
            locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
            if (locNormal.size() > 0) {
                for (LocNormal e:locNormal) {
                    LocNormal obj = new LocNormal();