canrd-outside / order-erp · Commits

Commit c2082068da8fc761443654eb884a9d09c92e57e3

Authored by 谢茂盛
2 parents f924d5a8 194f0484
build: skipped

Merge remote-tracking branch 'origin/dev_finance_20240830' into test

Inline Side-by-side
Showing 3 changed files with 17 additions and 6 deletions
src/main/java/com/order/erp/domain/vo/order/OrderLockFieldVO.java
  View file @c208206
1 1 package com.order.erp.domain.vo.order;
2 2  
  3 +import com.order.erp.domain.dto.order.InvoiceBillOrderDO;
3 4 import lombok.*;
4 5 import lombok.experimental.SuperBuilder;
5 6  
... ... @@ -44,6 +45,11 @@ public class OrderLockFieldVO implements Serializable {
44 45 private OrderInspectionStageFieldVO inspectionStageFields;
45 46  
46 47 /**
  48 + * 应收款账单字段
  49 + */
  50 + private InvoiceBillOrderDO invoiceBillOrderDO;
  51 +
  52 + /**
47 53 * 导出指定订单id集合
48 54 */
49 55 private List<Long> orderIds;
... ...
src/main/java/com/order/erp/service/order/impl/InvoiceBillOrderServiceImpl.java
  View file @c208206
... ... @@ -681,7 +681,7 @@ public class InvoiceBillOrderServiceImpl extends ServiceImpl&lt;InvoiceBillOrderMap
681 681 */
682 682 private OrderFieldLockApplyDO initOrderFieldLockApplyDO(InvoiceBillOrderDO invoiceBillOrderDO, Long userId) {
683 683 OrderLockFieldVO lockFieldVO = new OrderLockFieldVO();
684   - BeanUtils.copyProperties(invoiceBillOrderDO, lockFieldVO);
  684 + lockFieldVO.setInvoiceBillOrderDO(invoiceBillOrderDO);
685 685 return OrderFieldLockApplyDO.builder()
686 686 .applyUserId(userId)
687 687 .auditUserId(null)
... ...
src/main/java/com/order/erp/service/order/impl/OrderFieldLockApplyServiceImpl.java
  View file @c208206
... ... @@ -119,19 +119,22 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
119 119 BeanUtils.copyProperties(x, resultVO);
120 120 String fields = x.getFields();
121 121 if (StringUtils.isNotBlank(fields)) {
122   - if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType() == x.getType()) {
  122 + if (ApplyTypeEnum.FIELD_EDIT_APPLY.getType().equals(x.getType())) {
123 123 resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
124 124 }
125   - if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType() == x.getType()) {
  125 + if (ApplyTypeEnum.ORDER_REPORT_APPLY.getType().equals(x.getType())) {
126 126 OrderLockFieldVO fieldVO = new OrderLockFieldVO();
127 127 fieldVO.setReportFields(JSONObject.parseObject(fields, OrderCompletionReportFieldVO.class));
128 128 resultVO.setFieldInfos(fieldVO);
129 129 }
130   - if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType() == x.getType()) {
  130 + if (ApplyTypeEnum.ORDER_PROFIT_APPLY.getType().equals(x.getType())) {
131 131 OrderLockFieldVO fieldVO = new OrderLockFieldVO();
132 132 fieldVO.setProfitAnalysisFields(JSONObject.parseObject(fields, OrderProfitAnalysisFieldVO.class));
133 133 resultVO.setFieldInfos(fieldVO);
134 134 }
  135 + if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(x.getType())) {
  136 + resultVO.setFieldInfos(JSONObject.parseObject(fields, OrderLockFieldVO.class));
  137 + }
135 138 }
136 139 return resultVO;
137 140 }).collect(Collectors.toList());
... ... @@ -399,7 +402,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
399 402 orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_REFUSE.getStatus());
400 403 orderBaseInfoService.updateById(orderBaseInfoDO);
401 404 } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
402   - InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
  405 + OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
  406 + InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
403 407 invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_REFUSE.getStatus());
404 408 invoiceBillOrderService.updateById(invoiceBillOrderDO);
405 409 }
... ... @@ -525,7 +529,8 @@ public class OrderFieldLockApplyServiceImpl extends ServiceImpl&lt;OrderFieldLockAp
525 529 orderBaseInfoDO.setOrderStatus(OrderStatusEnum.PROFIT_AUDIT_PASS.getStatus());
526 530 orderBaseInfoService.updateById(orderBaseInfoDO);
527 531 } else if (ApplyTypeEnum.INVOICE_BILL_APPLY.getType().equals(applyDO.getType())) {
528   - InvoiceBillOrderDO invoiceBillOrderDO = JSONObject.parseObject(applyDO.getFields(), InvoiceBillOrderDO.class);
  532 + OrderLockFieldVO lockFieldVO = JSONObject.parseObject(applyDO.getFields(), OrderLockFieldVO.class);
  533 + InvoiceBillOrderDO invoiceBillOrderDO = lockFieldVO.getInvoiceBillOrderDO();
529 534 invoiceBillOrderDO.setStatus(ApplyStatusEnum.AUDIT_PASS.getStatus());
530 535 invoiceBillOrderService.updateById(invoiceBillOrderDO);
531 536 }
... ...