出入库详单，导入，时间格式兼容yy/mm/dd

sgj

2026-03-10 fbddf74600d036ba46b311147847be978904e002

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java

@@ -687,10 +687,10 @@
    public String inWeightBill(InoutRecord data) {

        // 获取表单数据
        InoutPrintBill bill = this.createBillData(data, "-入库单");
        InoutPrintBill bill = this.createBillData(data, "入库单");

        // 调整模版数据并返回
        String htmlStr = InoutBill.IN_WEIGHT_DEFAULT;
        String htmlStr = InoutBill.IN_WEIGHT_DEFAULT_NEW;

        htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());

@@ -748,7 +748,7 @@
        htmlStr = htmlStr.replace("handleEnd", "");
        htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId());
        htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + "");
        htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm"));
        htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        htmlStr = htmlStr.replaceAll("weightUser",
                bill.getWeightUser() == null ? "" : bill.getWeightUser());
@@ -756,7 +756,7 @@
                bill.getHandleUser() == null ? "" : bill.getHandleUser());
        htmlStr = htmlStr.replaceAll("keeperName",
                bill.getKeeperUser() == null ? "" : bill.getKeeperUser());

        htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName());

        return htmlStr;
    }
@@ -769,10 +769,10 @@
     */
    public String outWeightBill(InoutRecord data) {
        // 获取表单数据
        InoutPrintBill bill = this.createBillData(data, "-出库单");
        InoutPrintBill bill = this.createBillData(data, "出库单");

        //默认模版
        String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT;
        String htmlStr = InoutBill.OUT_WEIGHT_DEFAULT_NEW;

        htmlStr = htmlStr.replace("billTitle", bill.getBillTitle());

@@ -821,11 +821,13 @@
        htmlStr = htmlStr.replace("handleEnd", "");
        htmlStr = htmlStr.replace("noticeId", bill.getNoticeId() == null ? "" : bill.getNoticeId());
        htmlStr = htmlStr.replace("phone", data.getUserContact() == null ? "" : data.getUserContact() + "");
        htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm"));
        htmlStr = htmlStr.replace("printTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss"));

        htmlStr = htmlStr.replaceAll("weightUser", getValue(bill.getWeightUser()));
        htmlStr = htmlStr.replace("handleUser", getValue(bill.getHandleUser()));
        htmlStr = htmlStr.replaceAll("keeperName", getValue(bill.getKeeperUser()));
        htmlStr = htmlStr.replaceAll("createUser",ContextUtil.getLoginUserName());

        return htmlStr;
    }

@@ -861,13 +863,13 @@
            data.setRegisterTime(new Date());
        }
        bill.setRegisterTime(DateFormatUtils.format(data.getRegisterTime(),
                "yyyy-MM-dd HH:mm"));
                "yyyy-MM-dd HH:mm:ss"));

        if (null == data.getCompleteTime()) {
            data.setCompleteTime(new Date());
        }
        bill.setCompleteTime(DateFormatUtils.format(data.getCompleteTime(),
                "yyyy-MM-dd HH:mm"));
                "yyyy-MM-dd HH:mm:ss"));

        bill.setEmptyTime(DateFormatUtils.format(data.getEmptyWeightTime(),
                "yyyy-MM-dd HH:mm:ss"));
@@ -921,7 +923,7 @@
                data.setSettleMoney(NumberUtil.keepPrecision(data.getPrice() * data.getRecordWeight(), 2));
            }
        }
        bill.setSettleMoney(data.getSettleMoney() == null ? "" : data.getSettleMoney() + "");
        bill.setSettleMoney(data.getSettleMoney() == null ? "" : String.format("%.2f", data.getSettleMoney()));
        bill.setRemark(data.getRemarks() == null ? "" : data.getRemarks());

        if (Constant.TYPE_IN.equals(data.getType())) {