Merge remote-tracking branch 'origin/master'

jiazx0107@163.com

2023-06-29 651dfb24aa82ea28e6348907bc02dc8c84a6e13f

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

@@ -116,6 +116,11 @@

        htmlStr = htmlStr.replace("deImpurity", bill.getDeImpurity() + "");
        htmlStr = htmlStr.replace("deWet", bill.getDeWet() + "");

        htmlStr = htmlStr.replace("recordWeight", bill.getRecordWeight() + "");
        htmlStr = htmlStr.replace("deCheck", bill.getDeCheck() + "");
        htmlStr = htmlStr.replace("addCheck", bill.getAddCheck() + "");

        htmlStr = htmlStr.replace("deSum", bill.getDeSum() + "");
        htmlStr = htmlStr.replace("settleWeight",
                new DecimalFormat("0").format(bill.getSettleWeight()));
@@ -127,6 +132,7 @@
        htmlStr = htmlStr.replace("wet", bill.getWet() + "");
        htmlStr = htmlStr.replace("impurity", bill.getImpurity() + "");

        htmlStr = htmlStr.replace("checkStatus", bill.getCheckStatus());
        htmlStr = htmlStr.replace("remark", bill.getRemark());
        htmlStr = htmlStr.replace("moneyName", bill.getMoneyName());

@@ -300,11 +306,15 @@
        bill.setFullWeight(data.getFullWeight());
        bill.setEmptyWeight(data.getEmptyWeight());
        bill.setNetWeight(data.getNetWeight());
        bill.setDeCheck(data.getDeCheck());
        bill.setAddCheck(data.getAddCheck());
        bill.setRecordWeight(data.getRecordWeight());
        bill.setCheckStatus(data.getCheckStatus().equals(InoutConstant.STATUS_PASS) ? "合格" : "不合格");

//        bill.setDeWet(data.getDeWet());
//        bill.setDeImpurity(data.getDeImpurity());
//        bill.setDeHandle(data.getDeHandle());
//        bill.setDeOther(data.getDeOther());
        bill.setDeHandle(data.getDeHandle());
        bill.setDeOther(data.getDeOther());
//        bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());

        bill.setSettleWeight(data.getSettleWeight());