质检管理

YYC

2023-06-30 e7cfae909181ab9e7ffacd0370b0ad9d4ad50123

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutReportManager.java

@@ -335,15 +335,26 @@
        // 获取化验数据
        List<CheckItemData> checkLst = data.getCheckItems();
        if (null == checkLst)
            checkStandardService.getCheckItemById(data.getCheckId(),
                    data.getCompanyId());
            checkStandardService.getCheckItemById(data.getCheckId(), data.getCompanyId());

        if (checkLst == null || checkLst.size() < 1) {
            return "无化验数据，不打印！";
        }

        String mark = data.getFoodVariety().substring(0, 3);
        // 调整模版数据并返回
        String htmlStr = InoutBill.IN_CHECK_DEFAULT;
        String htmlStr = "";
        if (mark == FoodVariety.FOOD_VARIETY_WHEAT) {
            htmlStr = InoutBill.IN_CHECK_WHEAT;
        } else if (mark == FoodVariety.FOOD_VARIETY_PADDY) {
            htmlStr = InoutBill.IN_CHECK_PADDY;
        } else if (mark == FoodVariety.FOOD_VARIETY_CORN) {
            htmlStr = InoutBill.IN_CHECK_CORN;
        } else if (data.getFoodVariety() == FoodVariety.FOOD_VARIETY_SOYBEAN) {
            htmlStr = InoutBill.IN_CHECK_SOYBEAN;
        } else {
            return "模板暂未确定！！";
        }


        DefaultDept dept = sysDeptService.getCacheDept(data.getCompanyId(),
                data.getDeptId());
@@ -354,24 +365,30 @@
        // 替换基础数据
        String time = DateFormatUtils.format(data.getRegisterTime(),
                "yyyy-MM-dd");
        htmlStr = htmlStr.replace("time", time);
//        htmlStr = htmlStr.replace("time", time);
        htmlStr = htmlStr.replace("customerName", data.getCustomerName());
        htmlStr = htmlStr.replace("serId", data.getId());
        htmlStr = htmlStr.replace("deptName", dept.getName());
        htmlStr = htmlStr.replace("foodVariety", FoodVariety.getMsg(data.getFoodVariety()));
        htmlStr = htmlStr.replace("plateNum", data.getPlateNum());
        htmlStr = htmlStr.replace("userName", data.getUserName());
        htmlStr = htmlStr.replace("foodYear", data.getFoodYear() == null ? "/" : data.getFoodYear());
        Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
        htmlStr = htmlStr.replace("storeKeeperName", depot == null ? "" : (depot.getStoreKeeperName() == null ? "" : depot.getStoreKeeperName()));
        htmlStr = htmlStr.replace("depotName", depot == null ? "/" : depot.getName());
        htmlStr = htmlStr.replace("checkUser", data.getCheckUser() == null ? "/" : data.getCheckUser());

        htmlStr = htmlStr.replace("foodType", data.getFoodType() == null ? "/" : data.getFoodType());
        htmlStr = htmlStr.replace("foodNumber", data.getSettleWeight() + "");
        htmlStr = htmlStr.replace("checkNum", data.getDeCheck() + "");
        htmlStr = htmlStr.replace("foodLocation", data.getFoodLocation() == null ? "/" : data.getFoodLocation());
        htmlStr = htmlStr.replace("foodLevel", data.getFoodLevel() == null ? "/" : data.getFoodLevel());
        Map<String, String> checkBillItems = getCheckBillItems();
        // 遍历化验结果，存入map集合中
        String key;
        for (CheckItemData item : checkLst) {
            key = item.getStandardId() + "_ST";
            // checkBillItems.put(key, item.getStandardValue());
            key = item.getStandardId() + "_VAL";
//            key = item.getStandardId() + "_VAL";
            checkBillItems.put(key, item.getValue());
        }