朱园亮 / xingyun-erp · Commits

Commit a0d2b9b73858a5b9e2396e1f8a4c02b2f730ee94

Authored by yeqianyong
1 parent f65c67ba

楚江ERP-订货单变更审核通过后数据同步bug修复

Inline Side-by-side
Showing 3 changed files with 10 additions and 2 deletions
@@ -336,7 +336,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR @@ -336,7 +336,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
336 // 更新状态 336 // 更新状态
337 updateStatus(id, "PASS"); 337 updateStatus(id, "PASS");
338 // 更新订货单数据 338 // 更新订货单数据
339 - purchaseOrderInfoService.update(JsonUtil.parseObject(JsonUtil.toJsonString(record), PurchaseOrderInfo.class)); 339 + PurchaseOrderInfo orderInfo = JsonUtil.parseObject(JsonUtil.toJsonString(record), PurchaseOrderInfo.class);
  340 + orderInfo.setId(record.getOrderId());
  341 + if (record.getAfterTotalQuantity() != null) {
  342 + orderInfo.setTotalQuantity(new BigDecimal(record.getAfterTotalQuantity()));
  343 + }
  344 + purchaseOrderInfoService.update(orderInfo);
340 // 更新订货单物料行数据 345 // 更新订货单物料行数据
341 purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList()); 346 purchaseOrderLineService.update(record.getOrderId(), record.getAfterChangeSpecList());
342 } 347 }
@@ -439,6 +439,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -439,6 +439,7 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
439 .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(orderInfo.getDeliveryMethod()) ? null : orderInfo.getDeliveryMethod()) 439 .set(PurchaseOrderInfo::getDeliveryMethod, StringUtil.isBlank(orderInfo.getDeliveryMethod()) ? null : orderInfo.getDeliveryMethod())
440 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(orderInfo.getPriceListNo()) ? null : orderInfo.getPriceListNo()) 440 .set(PurchaseOrderInfo::getPriceListNo, StringUtil.isBlank(orderInfo.getPriceListNo()) ? null : orderInfo.getPriceListNo())
441 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(orderInfo.getExecutionStandard()) ? null : orderInfo.getExecutionStandard()) 441 .set(PurchaseOrderInfo::getExecutionStandard, StringUtil.isBlank(orderInfo.getExecutionStandard()) ? null : orderInfo.getExecutionStandard())
  442 + .set(PurchaseOrderInfo::getExecutionStandardRemarks, StringUtil.isBlank(orderInfo.getExecutionStandardRemarks()) ? null : orderInfo.getExecutionStandardRemarks())
442 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(orderInfo.getInvoicingStatus()) ? null : orderInfo.getInvoicingStatus()) 443 .set(PurchaseOrderInfo::getInvoicingStatus, StringUtil.isBlank(orderInfo.getInvoicingStatus()) ? null : orderInfo.getInvoicingStatus())
443 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(orderInfo.getShippingCost()) ? null : orderInfo.getShippingCost()) 444 .set(PurchaseOrderInfo::getShippingCost, StringUtil.isBlank(orderInfo.getShippingCost()) ? null : orderInfo.getShippingCost())
444 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(orderInfo.getPieceWeightHeader()) ? null : orderInfo.getPieceWeightHeader()) 445 .set(PurchaseOrderInfo::getPieceWeightHeader, StringUtil.isBlank(orderInfo.getPieceWeightHeader()) ? null : orderInfo.getPieceWeightHeader())
@@ -447,11 +448,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde @@ -447,11 +448,13 @@ public class PurchaseOrderInfoServiceImpl extends BaseMpServiceImpl<PurchaseOrde
447 .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(orderInfo.getPerformance()) ? null : orderInfo.getPerformance()) 448 .set(PurchaseOrderInfo::getPerformance, StringUtil.isBlank(orderInfo.getPerformance()) ? null : orderInfo.getPerformance())
448 .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(orderInfo.getElement()) ? null : orderInfo.getElement()) 449 .set(PurchaseOrderInfo::getElement, StringUtil.isBlank(orderInfo.getElement()) ? null : orderInfo.getElement())
449 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(orderInfo.getPackaging()) ? null : orderInfo.getPackaging()) 450 .set(PurchaseOrderInfo::getPackaging, StringUtil.isBlank(orderInfo.getPackaging()) ? null : orderInfo.getPackaging())
  451 + .set(PurchaseOrderInfo::getPackagingFee, orderInfo.getPackagingFee() == null ? null : orderInfo.getPackagingFee())
450 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(orderInfo.getRemarks()) ? null : orderInfo.getRemarks()) 452 .set(PurchaseOrderInfo::getRemarks, StringUtil.isBlank(orderInfo.getRemarks()) ? null : orderInfo.getRemarks())
451 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(orderInfo.getProductionProcess()) ? null : orderInfo.getProductionProcess()) 453 .set(PurchaseOrderInfo::getProductionProcess, StringUtil.isBlank(orderInfo.getProductionProcess()) ? null : orderInfo.getProductionProcess())
452 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId()) 454 .set(PurchaseOrderInfo::getDeptId, StringUtil.isBlank(orderInfo.getDeptId()) ? null : orderInfo.getDeptId())
453 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId()) 455 .set(PurchaseOrderInfo::getWorkshopId, StringUtil.isBlank(orderInfo.getWorkshopId()) ? null : orderInfo.getWorkshopId())
454 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId()) 456 .set(PurchaseOrderInfo::getCustomerCreditId, StringUtil.isBlank(orderInfo.getCustomerCreditId()) ? null : orderInfo.getCustomerCreditId())
  457 + .set(PurchaseOrderInfo::getTotalQuantity, orderInfo.getTotalQuantity() == null ? null : orderInfo.getTotalQuantity())
455 .set(PurchaseOrderInfo::getSpecChangeStatus, OrderSpecChangeStatus.COMPLETED.getCode()) 458 .set(PurchaseOrderInfo::getSpecChangeStatus, OrderSpecChangeStatus.COMPLETED.getCode())
456 .eq(PurchaseOrderInfo::getId, orderInfo.getId()); 459 .eq(PurchaseOrderInfo::getId, orderInfo.getId());
457 getBaseMapper().update(updateWrapper); 460 getBaseMapper().update(updateWrapper);
@@ -86,7 +86,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr @@ -86,7 +86,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
86 String[] split = deptId.split(","); 86 String[] split = deptId.split(",");
87 if (split.length > 1) { 87 if (split.length > 1) {
88 StringBuilder builder = new StringBuilder(); 88 StringBuilder builder = new StringBuilder();
89 - for (int i = 1; i < split.length; i++) { 89 + for (int i = 0; i < split.length; i++) {
90 builder.append(split[i]); 90 builder.append(split[i]);
91 builder.append(","); 91 builder.append(",");
92 } 92 }