入库上报erp照片

zwl

5 天以前 38501f5760daefd634e00099ebe7019fd7247731

 src/main/java/com/zy/asrs/task/handler/WorkErpReportHandler.java

@@ -163,6 +163,7 @@
        param.setCreateTime(formatDate(resolveCreateTime(wrkMast)));
        param.setBizNo(resolveBizNo(wrkDetls, waitPakin));
        param.setStartTime(formatDate(resolveStartTime(wrkMast, waitPakin)));
        param.setPhotos(wrkDetls.get(0).getPic());
        return param;
    }

@@ -172,7 +173,7 @@
        if (base.compareTo(new BigDecimal("20")) <= 0) {
            return BigDecimal.ZERO;
        }
        return base.subtract(new BigDecimal("10"));
        return base.subtract(new BigDecimal("20.8"));
        // BigDecimal v = base.subtract(new BigDecimal("10"));
        // return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v;
    }
@@ -211,9 +212,6 @@
//    }

    private Date resolveCreateTime(WrkMast wrkMast) {
        if (!Cools.isEmpty(wrkMast.getCrnEndTime())) {
            return wrkMast.getCrnEndTime();
        }
        if (!Cools.isEmpty(wrkMast.getModiTime())) {
            return wrkMast.getModiTime();
        }