| | |
|---|
| | | } |
|---|
| | | salesLedger.setInvoiceTotal(invoiceTotal); |
|---|
| | | // 判断是否是生产完成 |
|---|
| | | salesLedger.setProductionStatus(salesLedgerProductCountMap.get(salesLedger.getId()) == null ? "未开始" : salesLedgerProductCountMap.get(salesLedger.getId()).compareTo(salesLedgerWorkCountMap.get(salesLedger.getId())) > 0 ? "生产中" : "已完成"); |
|---|
| | | String productionStatus = ""; |
|---|
| | | BigDecimal productCount = salesLedgerProductCountMap.get(salesLedger.getId()); |
|---|
| | | BigDecimal workCount = salesLedgerWorkCountMap.get(salesLedger.getId()); |
|---|
| | | |
|---|
| | | if (productCount == null || workCount == null) { |
|---|
| | | productionStatus = "未开始"; |
|---|
| | | } else if (productCount.compareTo(workCount) > 0) { |
|---|
| | | productionStatus = "生产中"; |
|---|
| | | } else if(productCount.compareTo(workCount) <= 0){ |
|---|
| | | productionStatus = "已完成"; |
|---|
| | | } |
|---|
| | | salesLedger.setProductionStatus(productionStatus); |
|---|
| | | } |
|---|
| | | if (ObjectUtils.isNotEmpty(salesLedgerDto.getStatus())) { |
|---|
| | | if (salesLedgerDto.getStatus()) { |
|---|
