| | |
|---|
| | | param.setCreateTime(formatDate(resolveCreateTime(wrkMast))); |
|---|
| | | param.setBizNo(resolveBizNo(wrkDetls, waitPakin)); |
|---|
| | | param.setStartTime(formatDate(resolveStartTime(wrkMast, waitPakin))); |
|---|
| | | param.setPhotos(wrkDetls.get(0).getPic()); |
|---|
| | | return param; |
|---|
| | | } |
|---|
| | | |
|---|
| | | /** 上报 ERP 重量：称重减固定值，负则按 0 */ |
|---|
| | | /** 上报 ERP 重量：≤20 传 0，>20 减 10 */ |
|---|
| | | private static BigDecimal adjustErpReportWeight(BigDecimal scWeight) { |
|---|
| | | BigDecimal base = scWeight == null ? BigDecimal.ZERO : scWeight; |
|---|
| | | BigDecimal v = base.subtract(new BigDecimal("10")); |
|---|
| | | return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v; |
|---|
| | | if (base.compareTo(new BigDecimal("20")) <= 0) { |
|---|
| | | return BigDecimal.ZERO; |
|---|
| | | } |
|---|
| | | return base.subtract(new BigDecimal("20.8")); |
|---|
| | | // BigDecimal v = base.subtract(new BigDecimal("10")); |
|---|
| | | // return v.compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : v; |
|---|
| | | } |
|---|
| | | private String resolvePalletId(WrkMast wrkMast, List<WrkDetl> wrkDetls) { |
|---|
| | | if (!Cools.isEmpty(wrkMast.getBarcode())) { |
|---|
| | |
|---|
| | | // } |
|---|
| | | |
|---|
| | | private Date resolveCreateTime(WrkMast wrkMast) { |
|---|
| | | if (!Cools.isEmpty(wrkMast.getCrnEndTime())) { |
|---|
| | | return wrkMast.getCrnEndTime(); |
|---|
| | | } |
|---|
| | | if (!Cools.isEmpty(wrkMast.getModiTime())) { |
|---|
| | | return wrkMast.getModiTime(); |
|---|
| | | } |
|---|
