Commit aab223c5a4cecf10fdc1f6f8815b698285614933

Authored by 房远帅
1 parent 6681aa15

规格变更:相关问题修改

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