vince
2023-07-20 852a9ee80fe79ac87854b8b46ad67ac857a56fc6
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java
@@ -84,6 +84,14 @@
        if ("5322".equals(data.getCompanyId())) {
            htmlStr = InoutBill.IN_WEIGHT_5322;
        }
        // 眉山市库使用
        if ("5005".equals(data.getCompanyId())) {
            htmlStr = InoutBill.IN_WEIGHT_5005;
        }
        // 丹棱库使用
        if ("5012".equals(data.getCompanyId())) {
            htmlStr = InoutBill.IN_WEIGHT_5012;
        }
        htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
@@ -104,6 +112,7 @@
        htmlStr = htmlStr.replace("foodVariety", bill.getFoodVariety());
        htmlStr = htmlStr.replace("depotName", bill.getDepotName());
        htmlStr = htmlStr.replace("foodLocation", bill.getFoodLocation());
        htmlStr = htmlStr.replace("plateNum", bill.getPlateNum());
        htmlStr = htmlStr.replace("fullWeight",
@@ -135,8 +144,12 @@
        htmlStr = htmlStr.replace("remark", bill.getRemark());
        htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());
        htmlStr = htmlStr.replace("handleUser", bill.getHandleUser());
        htmlStr = htmlStr.replaceAll("weightUser",
                bill.getWeightUser() == null ? "" : bill.getWeightUser());
        htmlStr = htmlStr.replaceAll("handleUser",
                bill.getHandleUser() == null ? "" : bill.getHandleUser());
        htmlStr = htmlStr.replaceAll("keeperName",
                bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
        return htmlStr;
    }
@@ -182,7 +195,14 @@
        if ("5322".equals(data.getCompanyId())) {
            htmlStr = InoutBill.OUT_WEIGHT_5322;
        }
        // 眉山市库使用
        if ("5005".equals(data.getCompanyId())) {
            htmlStr = InoutBill.OUT_WEIGHT_5005;
        }
        // 丹棱库使用
        if ("5012".equals(data.getCompanyId())) {
            htmlStr = InoutBill.OUT_WEIGHT_5012;
        }
        htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());
        htmlStr = htmlStr.replace("registerTime", bill.getRegisterTime());
@@ -224,6 +244,12 @@
        htmlStr = htmlStr.replace("wet", bill.getWet() + "");
        htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");
        htmlStr = htmlStr.replaceAll("weightUser",
                bill.getWeightUser() == null ? "" : bill.getWeightUser());
        htmlStr = htmlStr.replaceAll("handleUser",
                bill.getHandleUser() == null ? "" : bill.getHandleUser());
        htmlStr = htmlStr.replaceAll("keeperName",
                bill.getKeeperUser() == null ? "" : bill.getKeeperUser());
        return htmlStr;
    }
@@ -322,6 +348,15 @@
        bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
        bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());
        if(InoutConstant.TYPE_IN.equals(data.getType())){
            bill.setWeightUser(data.getFullWeightUser());
        }
        if(InoutConstant.TYPE_OUT.equals(data.getType())){
            bill.setWeightUser(data.getEmptyWeightUser());
        }
        bill.setHandleUser(data.getHandleUser());
        bill.setKeeperUser(depot.getStoreKeeperName());
        return bill;
    }