Showing
1 changed file
with
3 additions
and
1 deletions
| @@ -405,6 +405,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -405,6 +405,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 405 | } | 405 | } |
| 406 | List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList(); | 406 | List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList(); |
| 407 | if (CollectionUtils.isNotEmpty(afterChangeSpecList)) { | 407 | if (CollectionUtils.isNotEmpty(afterChangeSpecList)) { |
| 408 | + orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName()); | ||
| 408 | for (PurchaseOrderLine line : afterChangeSpecList) { | 409 | for (PurchaseOrderLine line : afterChangeSpecList) { |
| 409 | createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null); | 410 | createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null); |
| 410 | } | 411 | } |
| @@ -509,12 +510,14 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -509,12 +510,14 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 509 | CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo(); | 510 | CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo(); |
| 510 | if ("offset".equals(type1)) { | 511 | if ("offset".equals(type1)) { |
| 511 | vo.setPurchaseOrderLineId(line.getId()); | 512 | vo.setPurchaseOrderLineId(line.getId()); |
| 513 | + vo.setQuantity(line.getQuantity().negate()); | ||
| 512 | } else { | 514 | } else { |
| 513 | if (StringUtils.isNotEmpty(line.getAfterId())) { | 515 | if (StringUtils.isNotEmpty(line.getAfterId())) { |
| 514 | vo.setPurchaseOrderLineId(line.getAfterId()); | 516 | vo.setPurchaseOrderLineId(line.getAfterId()); |
| 515 | } else { | 517 | } else { |
| 516 | vo.setPurchaseOrderLineId(line.getId()); | 518 | vo.setPurchaseOrderLineId(line.getId()); |
| 517 | } | 519 | } |
| 520 | + vo.setQuantity(line.getQuantity()); | ||
| 518 | } | 521 | } |
| 519 | vo.setOrderNo(orderDetailReport.getOrderNo()); | 522 | vo.setOrderNo(orderDetailReport.getOrderNo()); |
| 520 | vo.setOrderDate(orderDetailReport.getOrderDate()); | 523 | vo.setOrderDate(orderDetailReport.getOrderDate()); |
| @@ -534,7 +537,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -534,7 +537,6 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 534 | vo.setLengthTolPos(line.getLengthTolPos()); | 537 | vo.setLengthTolPos(line.getLengthTolPos()); |
| 535 | vo.setLengthTolNeg(line.getLengthTolNeg()); | 538 | vo.setLengthTolNeg(line.getLengthTolNeg()); |
| 536 | vo.setStatus(line.getStatus()); | 539 | vo.setStatus(line.getStatus()); |
| 537 | - vo.setQuantity(line.getQuantity()); | ||
| 538 | String assessmentExceedsAgreement; | 540 | String assessmentExceedsAgreement; |
| 539 | BigDecimal salesPrice = line.getSalesPrice(); | 541 | BigDecimal salesPrice = line.getSalesPrice(); |
| 540 | if (line.getSalesPrice() != null && StringUtils.isNotEmpty(line.getAssessmentExceedsAgreement())) { | 542 | if (line.getSalesPrice() != null && StringUtils.isNotEmpty(line.getAssessmentExceedsAgreement())) { |