Showing
2 changed files
with
11 additions
and
1 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/controller/order/OrderChangeRecordController.java
| @@ -443,9 +443,17 @@ public class OrderChangeRecordController extends DefaultBaseController { | @@ -443,9 +443,17 @@ public class OrderChangeRecordController extends DefaultBaseController { | ||
| 443 | return true; | 443 | return true; |
| 444 | } | 444 | } |
| 445 | return "UPDATE".equals(line.getType()) && (line.getBrandChange() | 445 | return "UPDATE".equals(line.getType()) && (line.getBrandChange() |
| 446 | + || line.getIndustryChange() | ||
| 447 | + || line.getQualityChange() | ||
| 446 | || line.getLengthChange() | 448 | || line.getLengthChange() |
| 449 | + || line.getLengthTolNegChange() | ||
| 450 | + || line.getLengthTolPosChange() | ||
| 447 | || line.getWidthChange() | 451 | || line.getWidthChange() |
| 452 | + || line.getWidthTolNegChange() | ||
| 453 | + || line.getWidthTolPosChange() | ||
| 448 | || line.getThicknessChange() | 454 | || line.getThicknessChange() |
| 455 | + || line.getThicknessTolNegChange() | ||
| 456 | + || line.getThicknessTolPosChange() | ||
| 449 | || line.getStatusChange() | 457 | || line.getStatusChange() |
| 450 | || line.getQuantityChange() | 458 | || line.getQuantityChange() |
| 451 | || line.getSalesPriceChange() | 459 | || line.getSalesPriceChange() |
| @@ -409,6 +409,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -409,6 +409,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 409 | List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList(); | 409 | List<PurchaseOrderLine> afterChangeSpecList = record.getAfterChangeSpecList(); |
| 410 | if (CollectionUtils.isNotEmpty(afterChangeSpecList)) { | 410 | if (CollectionUtils.isNotEmpty(afterChangeSpecList)) { |
| 411 | orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName()); | 411 | orderInfo.setStockUpCompanyName(purchaseOrderInfo.getStockUpCompanyName()); |
| 412 | + orderInfo.setType(purchaseOrderInfo.getType()); | ||
| 412 | for (PurchaseOrderLine line : afterChangeSpecList) { | 413 | for (PurchaseOrderLine line : afterChangeSpecList) { |
| 413 | createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null | 414 | createOrderDetailReport(line, orderDetailReport, orderInfo, standard, null |
| 414 | , purchaseOrderInfo.getContractCreateById()); | 415 | , purchaseOrderInfo.getContractCreateById()); |
| @@ -514,6 +515,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -514,6 +515,7 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 514 | PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1, | 515 | PurchaseOrderInfo orderInfo, ContractDistributorStandard standard, String type1, |
| 515 | String contractCreateById) { | 516 | String contractCreateById) { |
| 516 | CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo(); | 517 | CreateOrderDetailReportVo vo = new CreateOrderDetailReportVo(); |
| 518 | + vo.setOrderingUnitName(orderDetailReport.getOrderingUnitName()); | ||
| 517 | if ("offset".equals(type1)) { | 519 | if ("offset".equals(type1)) { |
| 518 | vo.setPurchaseOrderLineId(line.getId()); | 520 | vo.setPurchaseOrderLineId(line.getId()); |
| 519 | vo.setQuantity(line.getQuantity().negate()); | 521 | vo.setQuantity(line.getQuantity().negate()); |
| @@ -524,13 +526,13 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | @@ -524,13 +526,13 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR | ||
| 524 | vo.setPurchaseOrderLineId(line.getId()); | 526 | vo.setPurchaseOrderLineId(line.getId()); |
| 525 | } | 527 | } |
| 526 | vo.setQuantity(line.getQuantity()); | 528 | vo.setQuantity(line.getQuantity()); |
| 529 | + vo.setOrderingUnitName(orderInfo.getOrderingUnitName()); | ||
| 527 | } | 530 | } |
| 528 | vo.setOrderNo(orderDetailReport.getOrderNo()); | 531 | vo.setOrderNo(orderDetailReport.getOrderNo()); |
| 529 | vo.setOrderDate(orderDetailReport.getOrderDate()); | 532 | vo.setOrderDate(orderDetailReport.getOrderDate()); |
| 530 | vo.setWorkshopId(orderDetailReport.getWorkshopId()); | 533 | vo.setWorkshopId(orderDetailReport.getWorkshopId()); |
| 531 | vo.setDeptName(orderDetailReport.getDeptName()); | 534 | vo.setDeptName(orderDetailReport.getDeptName()); |
| 532 | vo.setRegionName(orderDetailReport.getRegionName()); | 535 | vo.setRegionName(orderDetailReport.getRegionName()); |
| 533 | - vo.setOrderingUnitName(orderDetailReport.getOrderingUnitName()); | ||
| 534 | vo.setIndustry(line.getIndustry()); | 536 | vo.setIndustry(line.getIndustry()); |
| 535 | vo.setBrand(line.getBrand()); | 537 | vo.setBrand(line.getBrand()); |
| 536 | vo.setThickness(line.getThickness()); | 538 | vo.setThickness(line.getThickness()); |