qilincloud168/ERPTurbo_Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(order): 更新订单审核流程并添加审核返回值

Browse Source 
- 修改OrderController中的审核相关接口，统一返回AuditVO对象
- 更新OrderServiceI接口，将审核方法的返回值从void改为AuditVO
- 在订单相关命令类中添加auditId字段，用于关联审核记录
- 调整订单状态枚举，移除已驳回状态，重新定义状态码
- 更新成本和经销商实体，添加默认标识和初始车次号相关字段
- 修改订单审核流程的执行器，统一返回审核结果对象
- 修正订单发货实体中经销商ID字段为必填项
- 调整Order实体中的发货信息列表类型定义
This commit is contained in:
shenyifei 2025-12-28 09:24:57 +08:00
parent 6d5b4e001c
commit 3c2cb917c5
48 changed files with 561 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
erp-turbo-admin/src/main/java/com/xunhong/erp/turbo/admin/controller/OrderController.java
View File

@ -10,6 +10,7 @@ import com.alibaba.cola.dto.SingleResponse;
import com.xunhong.erp.turbo.api.biz.api.OrderServiceI;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.qry.*;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.api.biz.dto.vo.OrderVO;
import com.xunhong.erp.turbo.api.rbac.dto.constants.RoleConstant;
import com.xunhong.erp.turbo.api.user.api.AdminServiceI;
@ -86,49 +87,49 @@ public class OrderController {
@SaCheckLogin
@PostMapping("submitReviewOrder")
@Operation(summary = "采购订单提审（产地/市场采购员提审）", method = "POST")
public Response submitReviewOrder(@RequestBody @Validated OrderSubmitReviewCmd orderSubmitReviewCmd) {
orderService.submitReview(orderSubmitReviewCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> submitReviewOrder(@RequestBody @Validated OrderSubmitReviewCmd orderSubmitReviewCmd) {
AuditVO auditVO = orderService.submitReview(orderSubmitReviewCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin
@PostMapping("withdrawReviewOrder")
@Operation(summary = "采购订单撤回提审（产地/市场采购员撤回提审）", method = "POST")
public Response withdrawReviewOrder(@RequestBody @Validated OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
orderService.withdrawReview(orderWithdrawReviewCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> withdrawReviewOrder(@RequestBody @Validated OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
AuditVO auditVO = orderService.withdrawReview(orderWithdrawReviewCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin
@PostMapping("approveOrder")
@Operation(summary = "采购订单审核（审核员审核）", method = "POST")
public Response approveOrder(@RequestBody @Validated OrderApproveCmd orderApproveCmd) {
orderService.approve(orderApproveCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> approveOrder(@RequestBody @Validated OrderApproveCmd orderApproveCmd) {
AuditVO auditVO = orderService.approve(orderApproveCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin
@PostMapping("rejectApproveOrder")
@Operation(summary = "采购订单驳回审核（审核员驳回审核）", method = "POST")
public Response rejectApproveOrder(@RequestBody @Validated OrderRejectApproveCmd orderRejectApproveCmd) {
orderService.rejectApprove(orderRejectApproveCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> rejectApproveOrder(@RequestBody @Validated OrderRejectApproveCmd orderRejectApproveCmd) {
AuditVO auditVO = orderService.rejectApprove(orderRejectApproveCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin
@PostMapping("finalApproveOrder")
@Operation(summary = "采购订单审批（老板审批）", method = "POST")
public Response finalApproveOrder(@RequestBody @Validated OrderFinalApproveCmd orderFinalApproveCmd) {
orderService.finalApprove(orderFinalApproveCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> finalApproveOrder(@RequestBody @Validated OrderFinalApproveCmd orderFinalApproveCmd) {
AuditVO auditVO = orderService.finalApprove(orderFinalApproveCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin
@PostMapping("rejectFinalOrder")
@Operation(summary = "采购订单驳回审批（老板驳回审批）", method = "POST")
public Response rejectFinalOrder(@RequestBody @Validated OrderRejectFinalCmd orderRejectFinalCmd) {
orderService.rejectFinal(orderRejectFinalCmd);
return Response.buildSuccess();
public SingleResponse<AuditVO> rejectFinalOrder(@RequestBody @Validated OrderRejectFinalCmd orderRejectFinalCmd) {
AuditVO auditVO = orderService.rejectFinal(orderRejectFinalCmd);
return SingleResponse.of(auditVO);
}
@SaCheckLogin

14
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderApproveCmdExe.java
View File

@ -1,10 +1,15 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderApproveCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author shenyifei
@ -15,8 +20,15 @@ import org.springframework.stereotype.Component;
public class OrderApproveCmdExe {
private final OrderGateway orderGateway;
private final AuditGateway auditGateway;
public void execute(OrderApproveCmd orderApproveCmd) {
private final AuditAssembler auditAssembler;
@Transactional
public AuditVO execute(OrderApproveCmd orderApproveCmd) {
Audit audit = auditGateway.approve(orderApproveCmd);
orderGateway.approve(orderApproveCmd);
return auditAssembler.toAuditVO(audit);
}
}

12
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderFinalApproveCmdExe.java
View File

@ -1,6 +1,10 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderFinalApproveCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.ExpenseRecordGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
@ -20,11 +24,17 @@ public class OrderFinalApproveCmdExe {
private final ExpenseRecordGateway expenseRecordGateway;
private final AuditGateway auditGateway;
private final AuditAssembler auditAssembler;
@Transactional
public void execute(OrderFinalApproveCmd orderFinalApproveCmd) {
public AuditVO execute(OrderFinalApproveCmd orderFinalApproveCmd) {
Audit audit = auditGateway.finalApprove(orderFinalApproveCmd);
orderGateway.finalApprove(orderFinalApproveCmd);
// 计提费计入发货日期的花销
expenseRecordGateway.addProvision(orderFinalApproveCmd.getOrderId());
return auditAssembler.toAuditVO(audit);
}
}

12
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderRejectApproveCmdExe.java
View File

@ -1,10 +1,15 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderRejectApproveCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author shenyifei
@ -15,8 +20,13 @@ import org.springframework.stereotype.Component;
public class OrderRejectApproveCmdExe {
private final OrderGateway orderGateway;
private final AuditGateway auditGateway;
private final AuditAssembler auditAssembler;
public void execute(OrderRejectApproveCmd orderRejectApproveCmd) {
@Transactional
public AuditVO execute(OrderRejectApproveCmd orderRejectApproveCmd) {
Audit audit = auditGateway.rejectApprove(orderRejectApproveCmd);
orderGateway.rejectApprove(orderRejectApproveCmd);
return auditAssembler.toAuditVO(audit);
}
}

13
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderRejectFinalCmdExe.java
View File

@ -1,10 +1,15 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderRejectFinalCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author shenyifei
@ -15,8 +20,14 @@ import org.springframework.stereotype.Component;
public class OrderRejectFinalCmdExe {
private final OrderGateway orderGateway;
private final AuditGateway auditGateway;
public void execute(OrderRejectFinalCmd orderRejectFinalCmd) {
private final AuditAssembler auditAssembler;
@Transactional
public AuditVO execute(OrderRejectFinalCmd orderRejectFinalCmd) {
Audit audit = auditGateway.rejectFinal(orderRejectFinalCmd);
orderGateway.rejectFinal(orderRejectFinalCmd);
return auditAssembler.toAuditVO(audit);
}
}

14
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderSubmitReviewCmdExe.java
View File

@ -1,10 +1,15 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderSubmitReviewCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author shenyifei
@ -15,8 +20,15 @@ import org.springframework.stereotype.Component;
public class OrderSubmitReviewCmdExe {
private final OrderGateway orderGateway;
private final AuditAssembler auditAssembler;
public void execute(OrderSubmitReviewCmd orderSubmitReviewCmd) {
private final AuditGateway auditGateway;
@Transactional
public AuditVO execute(OrderSubmitReviewCmd orderSubmitReviewCmd) {
Audit audit = auditGateway.submitReview(orderSubmitReviewCmd);
orderGateway.submitReview(orderSubmitReviewCmd);
return auditAssembler.toAuditVO(audit);
}
}

13
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/executor/cmd/OrderWithdrawReviewCmdExe.java
View File

@ -1,10 +1,15 @@
package com.xunhong.erp.turbo.biz.app.executor.cmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderWithdrawReviewCmd;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.biz.app.assembler.AuditAssembler;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.domain.gateway.OrderGateway;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
/**
* @author shenyifei
@ -15,8 +20,14 @@ import org.springframework.stereotype.Component;
public class OrderWithdrawReviewCmdExe {
private final OrderGateway orderGateway;
private final AuditGateway auditGateway;
public void execute(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
private final AuditAssembler auditAssembler;
@Transactional
public AuditVO execute(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
Audit audit = auditGateway.withdrawReview(orderWithdrawReviewCmd);
orderGateway.withdrawReview(orderWithdrawReviewCmd);
return auditAssembler.toAuditVO(audit);
}
}

25
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/app/service/OrderServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.xunhong.erp.turbo.biz.app.service;
import com.xunhong.erp.turbo.api.biz.api.OrderServiceI;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.qry.*;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.api.biz.dto.vo.OrderVO;
import com.xunhong.erp.turbo.base.dto.PageDTO;
import com.xunhong.erp.turbo.biz.app.executor.cmd.*;
@ -75,33 +76,33 @@ public class OrderServiceImpl implements OrderServiceI {
}
@Override
public void approve(OrderApproveCmd orderApproveCmd) {
orderApproveCmdExe.execute(orderApproveCmd);
public AuditVO approve(OrderApproveCmd orderApproveCmd) {
return orderApproveCmdExe.execute(orderApproveCmd);
}
@Override
public void submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd) {
orderSubmitReviewCmdExe.execute(orderSubmitReviewCmd);
public AuditVO submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd) {
return orderSubmitReviewCmdExe.execute(orderSubmitReviewCmd);
}
@Override
public void withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
orderWithdrawReviewCmdExe.execute(orderWithdrawReviewCmd);
public AuditVO withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
return orderWithdrawReviewCmdExe.execute(orderWithdrawReviewCmd);
}
@Override
public void rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd) {
orderRejectApproveCmdExe.execute(orderRejectApproveCmd);
public AuditVO rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd) {
return orderRejectApproveCmdExe.execute(orderRejectApproveCmd);
}
@Override
public void finalApprove(OrderFinalApproveCmd orderFinalApproveCmd) {
orderFinalApproveCmdExe.execute(orderFinalApproveCmd);
public AuditVO finalApprove(OrderFinalApproveCmd orderFinalApproveCmd) {
return orderFinalApproveCmdExe.execute(orderFinalApproveCmd);
}
@Override
public void rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd) {
orderRejectFinalCmdExe.execute(orderRejectFinalCmd);
public AuditVO rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd) {
return orderRejectFinalCmdExe.execute(orderRejectFinalCmd);
}
@Override

5
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Cost.java
View File

@ -64,6 +64,11 @@ public class Cost extends DTO {
*/
private Boolean status;
/**
* 是否默认
*/
private Boolean isDefault;
private List<Long> costItemIds;
private List<CostItem> costItemList;

10
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Dealer.java
View File

@ -138,4 +138,14 @@ public class Dealer extends DTO {
*/
private BigDecimal lossAmount;
/**
* 是否启用初始车次号
*/
private Boolean enableInitialTrainNo;
/**
* 初始车次号
*/
private Integer initialTrainNo;
}

4
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Order.java
View File

@ -52,7 +52,7 @@ public class Order extends DTO {
private OrderPricingMethodEnum pricingMethod;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
private OrderStateEnum state;
@ -129,6 +129,6 @@ public class Order extends DTO {
/**
* 采购订单发货信息
*/
private List<OrderShip> orderShipList;
private List<com.xunhong.erp.turbo.api.biz.dto.common.OrderShip> orderShipList;
}

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderCost.java
View File

@ -92,7 +92,7 @@ public class OrderCost extends DTO {
private Order order;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
private OrderStateEnum poState;

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderRebate.java
View File

@ -75,7 +75,7 @@ public class OrderRebate extends DTO {
private Order order;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
private OrderStateEnum poState;

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/OrderSupplier.java
View File

@ -221,7 +221,7 @@ public class OrderSupplier extends DTO {
private Order order;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
private OrderStateEnum poState;

14
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/gateway/AuditGateway.java
View File

@ -1,7 +1,7 @@
package com.xunhong.erp.turbo.biz.domain.gateway;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.xunhong.erp.turbo.api.biz.dto.cmd.AuditUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.qry.AuditPageQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.AuditShowQry;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
@ -16,5 +16,17 @@ public interface AuditGateway {
Audit update(AuditUpdateCmd auditUpdateCmd);
Audit show(AuditShowQry auditShowQry);
Audit submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd);
Audit withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd);
Audit rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd);
Audit finalApprove(OrderFinalApproveCmd orderFinalApproveCmd);
Audit rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd);
Audit approve(OrderApproveCmd orderApproveCmd);
}

4
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/DealerConvert.java
View File

@ -29,6 +29,8 @@ public interface DealerConvert {
@Mapping(target = "enableAccrualTax", source = "setting.enableAccrualTax")
@Mapping(target = "companyRebateRatio", source = "setting.companyRebateRatio")
@Mapping(target = "accrualTaxRatio", source = "setting.accrualTaxRatio")
@Mapping(target = "enableInitialTrainNo", source = "setting.enableInitialTrainNo")
@Mapping(target = "initialTrainNo", source = "setting.initialTrainNo")
@Mapping(target = "dealerPaymentAccountList", source = "dealerPaymentAccountDOList")
Dealer toDealer(DealerDO dealerDO);
@ -57,6 +59,8 @@ public interface DealerConvert {
dealerSettingDO.setShareAdjusted(dealerCreateCmd.getShareAdjusted());
dealerSettingDO.setEnableLoss(dealerCreateCmd.getEnableLoss());
dealerSettingDO.setLossAmount(dealerCreateCmd.getLossAmount());
dealerSettingDO.setEnableInitialTrainNo(dealerCreateCmd.getEnableInitialTrainNo());
dealerSettingDO.setInitialTrainNo(dealerCreateCmd.getInitialTrainNo());
return dealerSettingDO;
}

39
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderConvert.java
View File

@ -1,14 +1,9 @@
package com.xunhong.erp.turbo.biz.infrastructure.convert;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.common.OrderCost;
import com.xunhong.erp.turbo.api.biz.dto.common.OrderRebate;
import com.xunhong.erp.turbo.api.biz.dto.common.OrderSupplier;
import com.xunhong.erp.turbo.api.biz.dto.common.*;
import com.xunhong.erp.turbo.biz.domain.entity.Order;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderCostDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderRebateDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderSupplierDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.*;
import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.MappingTarget;
@ -19,7 +14,7 @@ import java.util.List;
/**
* @author shenyifei
*/
@Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderVehicleConvert.class, OrderCostConvert.class, OrderPackageConvert.class, OrderDealerConvert.class, OrderRebateConvert.class, OrderCompanyConvert.class, OrderPackageConvert.class, OrderShipItemConvert.class})
@Mapper(componentModel = "spring", nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS, uses = {OrderVehicleConvert.class, OrderCostConvert.class, OrderPackageConvert.class, OrderDealerConvert.class, OrderRebateConvert.class, OrderCompanyConvert.class, OrderPackageConvert.class})
public interface OrderConvert {
@Mapping(target = "orderShipList", source = "orderShipDOList")
@ -187,5 +182,33 @@ public interface OrderConvert {
OrderRebateDO toOrderRebateDO(OrderRebate orderRebate);
OrderRebate toOrderRebate(OrderRebateDO orderRebateDO);
@Mapping(target = "file", ignore = true)
@Mapping(target = "orderDO", ignore = true)
@Mapping(target = "orderCostDOList", ignore = true)
@Mapping(target = "orderShipItemDOList", ignore = true)
@Mapping(target = "version", ignore = true)
@Mapping(target = "updatedAt", ignore = true)
@Mapping(target = "isDelete", ignore = true)
@Mapping(target = "createdAt", ignore = true)
@Mapping(target = "farmerInfo", ignore = true)
OrderShipDO toOrderShipDO(OrderShip orderShip);
List<OrderShip> toOrderShipList(List<OrderShipDO> orderShipDOList);
@Mapping(target = "picUrl", source = "file.picUrl")
@Mapping(target = "pdfUrl", source = "file.pdfUrl")
@Mapping(target = "orderShipItemList", source = "orderShipItemDOList")
OrderShip toOrderShip(OrderShipDO orderShipDO);
List<OrderShipItem> toOrderShipItemList(List<OrderShipItemDO> orderShipItemDOList);
OrderShipItem toOrderShipItem(OrderShipItemDO orderShipItemDO);
@Mapping(target = "version", ignore = true)
@Mapping(target = "updatedAt", ignore = true)
@Mapping(target = "isDelete", ignore = true)
@Mapping(target = "createdAt", ignore = true)
OrderShipItemDO toOrderShipItemDO(OrderShipItem orderShipItem);
}

15
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/convert/OrderShipConvert.java
View File

@ -3,7 +3,7 @@ package com.xunhong.erp.turbo.biz.infrastructure.convert;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderShipCreateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderShipGenerateDocumentCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.OrderShipUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.common.OrderShip;
import com.xunhong.erp.turbo.biz.domain.entity.OrderShip;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderShipDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.OrderShipFileDO;
import org.mapstruct.Mapper;
@ -22,7 +22,7 @@ public interface OrderShipConvert {
@Mapping(target = "order", source = "orderDO")
@Mapping(target = "orderCostList", source = "orderCostDOList")
@Mapping(target = "orderShipItemList", source = "orderShipItemDOList")
com.xunhong.erp.turbo.biz.domain.entity.OrderShip toOrderShip(OrderShipDO orderShipDO);
OrderShip toOrderShip(OrderShipDO orderShipDO);
@Mapping(target = "type", ignore = true)
@Mapping(target = "file", ignore = true)
@ -91,16 +91,5 @@ public interface OrderShipConvert {
orderShipFileDO.setPdfUrl(orderShipGenerateDocumentCmd.getPdfUrl());
return orderShipFileDO;
}
@Mapping(target = "file", ignore = true)
@Mapping(target = "orderDO", ignore = true)
@Mapping(target = "orderCostDOList", ignore = true)
@Mapping(target = "orderShipItemDOList", ignore = true)
@Mapping(target = "version", ignore = true)
@Mapping(target = "updatedAt", ignore = true)
@Mapping(target = "isDelete", ignore = true)
@Mapping(target = "createdAt", ignore = true)
@Mapping(target = "farmerInfo", ignore = true)
OrderShipDO toOrderShipDO(OrderShip orderShip);
}

6
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CostDO.java
View File

@ -82,6 +82,12 @@ public class CostDO extends BaseDO<CostDO> {
@TableField(value = "status")
private Boolean status;
/**
* 是否默认：1_是；0_否
*/
@TableField(value = "is_default")
private Boolean isDefault;
@TableField(exist = false)
private List<CostItemDO> costItemDOList;

31
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/DealerSettingDO.java
View File

@ -77,4 +77,35 @@ public class DealerSettingDO extends DTO {
* 损耗金额
*/
private BigDecimal lossAmount;
/**
* 是否启用初始车次号
*/
private Boolean enableInitialTrainNo;
/**
* 初始车次号
*/
private Integer initialTrainNo;
public static DealerSettingDO getDefaultSetting() {
DealerSettingDO setting = new DealerSettingDO();
setting.setEnableShare(false);
setting.setShareRatio(new BigDecimal(0));
setting.setFreightCostFlag(false);
setting.setStrawMatCostFlag(false);
setting.setIncludePackingFlag(false);
setting.setIncludeFreightFlag(false);
setting.setEnableAccrualTax(false);
setting.setAccrualTaxRatio(new BigDecimal(0));
setting.setEnableCompanyRebate(false);
setting.setCompanyRebateRatio(new BigDecimal(0));
setting.setShareAdjusted(false);
setting.setEnableLoss(false);
setting.setLossAmount(new BigDecimal(0));
setting.setEnableInitialTrainNo(false);
setting.setInitialTrainNo(0);
return setting;
}
}

2
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderDO.java
View File

@ -59,7 +59,7 @@ public class OrderDO extends BaseDO<OrderDO> {
private OrderPricingMethodEnum pricingMethod;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@TableField(value = "state")
private OrderStateEnum state;

175
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/AuditGatewayImpl.java
View File

@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xunhong.erp.turbo.api.biz.dto.cmd.AuditUpdateCmd;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.enums.AuditStateEnum;
import com.xunhong.erp.turbo.api.biz.dto.enums.AuditSubjectTypeEnum;
import com.xunhong.erp.turbo.api.biz.dto.enums.AuditTypeEnum;
import com.xunhong.erp.turbo.api.biz.dto.qry.AuditPageQry;
import com.xunhong.erp.turbo.api.biz.dto.qry.AuditShowQry;
import com.xunhong.erp.turbo.api.biz.exception.BizErrorCode;
import com.xunhong.erp.turbo.api.biz.exception.BizException;
import com.xunhong.erp.turbo.biz.domain.entity.Audit;
import com.xunhong.erp.turbo.biz.domain.gateway.AuditGateway;
import com.xunhong.erp.turbo.biz.infrastructure.convert.AuditConvert;
@ -19,6 +23,7 @@ import com.xunhong.erp.turbo.biz.infrastructure.mapper.OrderMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@ -84,7 +89,175 @@ public class AuditGatewayImpl implements AuditGateway {
queryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(queryWrapper);
if (Objects.nonNull(auditDO)) {
if (auditDO.getSubjectType().equals(AuditSubjectTypeEnum.PURCHASE_ORDER)) {
OrderDO orderDO = orderMapper.selectByOrderId(auditDO.getSubjectId());
auditDO.setOrderDO(orderDO);
}
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd) {
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderSubmitReviewCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
auditQueryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (Objects.isNull(auditDO)) {
auditDO = new AuditDO();
auditDO.setSubjectId(orderSubmitReviewCmd.getOrderId());
auditDO.setSubjectType(AuditSubjectTypeEnum.PURCHASE_ORDER);
auditDO.setType(AuditTypeEnum.REVIEWER_AUDIT);
auditDO.setState(AuditStateEnum.WAITING_AUDIT);
auditDO.setCreatedBy(orderSubmitReviewCmd.getCreatedBy());
auditDO.setCreatedByName(orderSubmitReviewCmd.getCreatedByName());
auditMapper.insert(auditDO);
} else {
auditDO.setState(AuditStateEnum.WAITING_AUDIT);
auditMapper.updateById(auditDO);
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
// 更新审核记录状态为草稿（撤回审核）
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderWithdrawReviewCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
auditQueryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_CANCEL);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderWithdrawReviewCmd.getCreatedBy());
auditDO.setAuditByName(orderWithdrawReviewCmd.getCreatedByName());
auditMapper.updateById(auditDO);
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd) {
// 更新审核记录
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getAuditId, orderRejectApproveCmd.getAuditId());
auditQueryWrapper.eq(AuditDO::getSubjectId, orderRejectApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
auditQueryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_REJECTED);
auditDO.setAuditReason(orderRejectApproveCmd.getRejectReason());
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderRejectApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderRejectApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit finalApprove(OrderFinalApproveCmd orderFinalApproveCmd) {
// 更新审核记录为审核成功
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderFinalApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.BOSS_AUDIT);
auditQueryWrapper.eq(AuditDO::getAuditId, orderFinalApproveCmd.getAuditId());
auditQueryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_SUCCESS);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderFinalApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderFinalApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd) {
// 更新审核记录
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderRejectFinalCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.BOSS_AUDIT);
auditQueryWrapper.eq(AuditDO::getAuditId, orderRejectFinalCmd.getAuditId());
auditQueryWrapper.last("limit 1");
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_REJECTED);
auditDO.setAuditReason(orderRejectFinalCmd.getRejectReason());
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderRejectFinalCmd.getCreatedBy());
auditDO.setAuditByName(orderRejectFinalCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
return auditConvert.toAudit(auditDO);
}
@Override
public Audit approve(OrderApproveCmd orderApproveCmd) {
// 更新审核记录状态为审核成功
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getSubjectType, AuditSubjectTypeEnum.PURCHASE_ORDER);
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (Objects.isNull(auditDO)) {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
if (orderApproveCmd.getDraft()) {
return auditConvert.toAudit(auditDO);
}
auditDO.setState(AuditStateEnum.AUDIT_SUCCESS);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
// 自动生成报老板待审核记录（每次都创建新记录）
AuditDO auditDO1 = new AuditDO();
auditDO1.setSubjectId(orderApproveCmd.getOrderId());
auditDO1.setSubjectType(AuditSubjectTypeEnum.PURCHASE_ORDER);
auditDO1.setType(AuditTypeEnum.BOSS_AUDIT);
auditDO1.setState(AuditStateEnum.WAITING_AUDIT);
auditDO1.setCreatedBy(orderApproveCmd.getCreatedBy());
auditDO1.setCreatedByName(orderApproveCmd.getCreatedByName());
auditMapper.insert(auditDO1);
return auditConvert.toAudit(auditDO1);
}
}

3
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/DealerGatewayImpl.java
View File

@ -19,6 +19,7 @@ import com.xunhong.erp.turbo.biz.domain.gateway.DealerGateway;
import com.xunhong.erp.turbo.biz.infrastructure.convert.DealerConvert;
import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerPaymentAccountDO;
import com.xunhong.erp.turbo.biz.infrastructure.entity.DealerSettingDO;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerMapper;
import com.xunhong.erp.turbo.biz.infrastructure.mapper.DealerPaymentAccountMapper;
import lombok.RequiredArgsConstructor;
@ -45,6 +46,8 @@ public class DealerGatewayImpl implements DealerGateway {
@Override
public Dealer save(DealerCreateCmd dealerCreateCmd) {
DealerDO dealerDO = dealerConvert.toDealerDO(dealerCreateCmd);
DealerSettingDO defaultSetting = DealerSettingDO.getDefaultSetting();
dealerDO.setSetting(defaultSetting);
dealerMapper.insert(dealerDO);
return dealerConvert.toDealer(dealerDO);

192
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/OrderGatewayImpl.java
View File

@ -22,7 +22,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -68,7 +68,7 @@ public class OrderGatewayImpl implements OrderGateway {
private final SupplierMapper supplierMapper;
private final SupplierConvert supplierConvert;
private final AuditMapper auditMapper;
private final DealerMapper dealerMapper;
@Override
@Transactional
@ -225,11 +225,10 @@ public class OrderGatewayImpl implements OrderGateway {
}
@Override
@Transactional
public void approve(OrderApproveCmd orderApproveCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderApproveCmd.getOrderId());
queryWrapper.eq(OrderDO::getState, OrderStateEnum.WAITING_AUDIT);
queryWrapper.eq(OrderDO::getState, OrderStateEnum.AUDITING);
queryWrapper.last("limit 1");
OrderDO orderDO = orderMapper.selectOne(queryWrapper);
@ -238,37 +237,8 @@ public class OrderGatewayImpl implements OrderGateway {
throw new BizException(BizErrorCode.B_BIZ_ORDER_NOT_WAITING_AUDIT);
}
orderDO.setPricingMethod(orderApproveCmd.getPricingMethod());
if (!orderApproveCmd.getDraft()) {
orderDO.setAuditState(OrderAuditStateEnum.PENDING_BOSS_APPROVAL);
// 更新审核记录状态为审核成功
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_SUCCESS);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
// 自动生成报老板待审核记录（每次都创建新记录）
AuditDO auditDO1 = new AuditDO();
auditDO1.setSubjectId(orderApproveCmd.getOrderId());
auditDO1.setType(AuditTypeEnum.BOSS_AUDIT);
auditDO1.setState(AuditStateEnum.WAITING_AUDIT);
auditDO1.setCreatedBy(orderApproveCmd.getCreatedBy());
auditDO1.setCreatedByName(orderApproveCmd.getCreatedByName());
auditMapper.insert(auditDO1);
}
orderMapper.updateById(orderDO);
@ -400,7 +370,7 @@ public class OrderGatewayImpl implements OrderGateway {
for (OrderShip updatedShip : orderShipList) {
updatedShip.setOrderId(orderId);
OrderShipDO orderShipDO = orderShipConvert.toOrderShipDO(updatedShip);
OrderShipDO orderShipDO = orderConvert.toOrderShipDO(updatedShip);
orderShipDO.setCreatedBy(orderApproveCmd.getCreatedBy());
orderShipDO.setCreatedByName(orderApproveCmd.getCreatedByName());
if (orderApproveCmd.getDraft()) {
@ -417,6 +387,7 @@ public class OrderGatewayImpl implements OrderGateway {
existingShipMap.remove(updatedShip.getOrderShipId());
} else {
// 新增发货单
orderShipDO.setOrderShipId(null);
// 生成发货单编号
if (StrUtil.isBlank(orderShipDO.getOrderSn())) {
orderShipDO.setOrderSn("FH" + generateOrderShipSn());
@ -435,6 +406,7 @@ public class OrderGatewayImpl implements OrderGateway {
.map(item -> {
OrderShipItemDO itemDO = orderShipItemConvert.toOrderShipItemDO(item);
itemDO.setOrderShipId(null); // 稍后设置
itemDO.setOrderShipItemId(null);
return itemDO;
})
.collect(Collectors.toList());
@ -469,6 +441,7 @@ public class OrderGatewayImpl implements OrderGateway {
/**
* 保存发货单明细
* 根据 orderShipId 和 unitPrice 两个字段判断是否新增、更新或删除
*/
private void saveOrderShipItems(OrderShipDO orderShipDO, List<OrderShipItem> orderShipItemList) {
if (CollUtil.isEmpty(orderShipItemList)) {
@ -480,34 +453,50 @@ public class OrderGatewayImpl implements OrderGateway {
itemQueryWrapper.eq(OrderShipItemDO::getOrderShipId, orderShipDO.getOrderShipId());
List<OrderShipItemDO> existingItems = orderShipItemMapper.selectList(itemQueryWrapper);
// 将现有明细映射到 itemId 字典中便于查找
Map<Long, OrderShipItemDO> existingItemMap = existingItems.stream()
.filter(item -> item.getOrderShipItemId() != null)
.collect(Collectors.toMap(OrderShipItemDO::getOrderShipItemId, Function.identity()));
// 将现有明细映射到 unitPrice 字典中便于查找
// 使用 BigDecimal 的 compareTo 作为比较器，确保精确匹配
Map<BigDecimal, OrderShipItemDO> existingItemMap = existingItems.stream()
.filter(item -> item.getUnitPrice() != null)
.collect(Collectors.toMap(
OrderShipItemDO::getUnitPrice,
Function.identity(),
(existing, replacement) -> existing // 如果有重复的unitPrice，保留第一个
));
// 收集需要更新和新增的明细
List<OrderShipItemDO> itemsToInsert = new ArrayList<>();
List<OrderShipItemDO> itemsToUpdate = new ArrayList<>();
for (OrderShipItem updatedItem : orderShipItemList) {
OrderShipItemDO itemDO = orderShipItemConvert.toOrderShipItemDO(updatedItem);
if (updatedItem.getUnitPrice() == null) {
continue; // 跳过单价为空的记录
}
if (existingItemMap.containsKey(updatedItem.getOrderShipItemId())) {
// 更新已存在的明细
itemDO.setOrderShipItemId(updatedItem.getOrderShipItemId());
// 查找是否存在相同 unitPrice 的记录
OrderShipItemDO existingItem = existingItemMap.entrySet().stream()
.filter(entry -> entry.getKey().compareTo(updatedItem.getUnitPrice()) == 0)
.map(Map.Entry::getValue)
.findFirst()
.orElse(null);
OrderShipItemDO itemDO = orderShipItemConvert.toOrderShipItemDO(updatedItem);
itemDO.setOrderShipId(orderShipDO.getOrderShipId());
if (existingItem != null) {
// 更新已存在的明细（基于 unitPrice 匹配）
itemDO.setOrderShipItemId(existingItem.getOrderShipItemId());
itemsToUpdate.add(itemDO);
// 从现有映射中移除，剩下的就是需要删除的
existingItemMap.remove(updatedItem.getOrderShipItemId());
existingItemMap.remove(existingItem.getUnitPrice());
} else {
itemDO.setOrderShipItemId(null);
// 新增明细
itemDO.setOrderShipId(orderShipDO.getOrderShipId());
itemsToInsert.add(itemDO);
}
}
// 删除不再需要的明细
existingItemMap.values().forEach(OrderShipItemDO::deleteById);
// 删除不再需要的明细（数据库中存在但新列表中没有的 unitPrice）
existingItemMap.values().forEach(item -> orderShipItemMapper.deleteById(item.getOrderShipItemId()));
// 执行更新操作
itemsToUpdate.forEach(orderShipItemMapper::updateById);
@ -517,7 +506,6 @@ public class OrderGatewayImpl implements OrderGateway {
}
@Override
@Transactional
public void submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderSubmitReviewCmd.getOrderId());
@ -530,27 +518,17 @@ public class OrderGatewayImpl implements OrderGateway {
throw new BizException(BizErrorCode.B_BIZ_ORDER_NOT_DRAFT);
}
orderDO.setState(OrderStateEnum.WAITING_AUDIT);
orderDO.setState(OrderStateEnum.AUDITING);
orderDO.setAuditState(OrderAuditStateEnum.PENDING_QUOTE_APPROVAL);
orderMapper.updateById(orderDO);
// 自动生成报价审核员待审核记录（每次都创建新记录）
AuditDO auditDO = new AuditDO();
auditDO.setSubjectId(orderSubmitReviewCmd.getOrderId());
auditDO.setType(AuditTypeEnum.REVIEWER_AUDIT);
auditDO.setState(AuditStateEnum.WAITING_AUDIT);
auditDO.setCreatedBy(orderSubmitReviewCmd.getCreatedBy());
auditDO.setCreatedByName(orderSubmitReviewCmd.getCreatedByName());
auditMapper.insert(auditDO);
}
@Override
@Transactional
public void withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderWithdrawReviewCmd.getOrderId());
queryWrapper.eq(OrderDO::getState, OrderStateEnum.WAITING_AUDIT);
queryWrapper.eq(OrderDO::getState, OrderStateEnum.AUDITING);
queryWrapper.eq(OrderDO::getAuditState, OrderAuditStateEnum.PENDING_QUOTE_APPROVAL);
queryWrapper.last("limit 1");
@ -560,33 +538,16 @@ public class OrderGatewayImpl implements OrderGateway {
throw new BizException(BizErrorCode.B_BIZ_ORDER_NOT_WAITING_FOR_WITHDRAW);
}
orderDO.setState(OrderStateEnum.DRAFT);
orderDO.setAuditState(OrderAuditStateEnum.NONE);
orderMapper.updateById(orderDO);
// 更新审核记录状态为草稿（撤回审核）
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderWithdrawReviewCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_CANCEL);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderWithdrawReviewCmd.getCreatedBy());
auditDO.setAuditByName(orderWithdrawReviewCmd.getCreatedByName());
auditMapper.updateById(auditDO);
}
}
@Override
@Transactional
public void rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderRejectApproveCmd.getOrderId());
queryWrapper.eq(OrderDO::getState, OrderStateEnum.WAITING_AUDIT);
queryWrapper.eq(OrderDO::getState, OrderStateEnum.AUDITING);
queryWrapper.eq(OrderDO::getAuditState, OrderAuditStateEnum.PENDING_QUOTE_APPROVAL);
queryWrapper.last("limit 1");
@ -596,30 +557,11 @@ public class OrderGatewayImpl implements OrderGateway {
throw new BizException(BizErrorCode.B_BIZ_ORDER_NOT_WAITING_AUDIT);
}
orderDO.setState(OrderStateEnum.REJECTED);
orderDO.setState(OrderStateEnum.DRAFT);
orderDO.setAuditState(OrderAuditStateEnum.QUOTE_REJECTED);
orderMapper.updateById(orderDO);
// 更新审核记录
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderRejectApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.REVIEWER_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_REJECTED);
auditDO.setAuditReason(orderRejectApproveCmd.getRejectReason());
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderRejectApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderRejectApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
// 发货单改成（草稿）
LambdaUpdateWrapper<OrderShipDO> updateWrapper = Wrappers.lambdaUpdate(OrderShipDO.class);
updateWrapper.eq(OrderShipDO::getOrderId, orderDO.getOrderId());
@ -631,7 +573,7 @@ public class OrderGatewayImpl implements OrderGateway {
public void finalApprove(OrderFinalApproveCmd orderFinalApproveCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderFinalApproveCmd.getOrderId());
queryWrapper.eq(OrderDO::getState, OrderStateEnum.WAITING_AUDIT);
queryWrapper.eq(OrderDO::getState, OrderStateEnum.AUDITING);
queryWrapper.eq(OrderDO::getAuditState, OrderAuditStateEnum.PENDING_BOSS_APPROVAL);
queryWrapper.last("limit 1");
@ -645,24 +587,6 @@ public class OrderGatewayImpl implements OrderGateway {
orderDO.setState(OrderStateEnum.COMPLETED);
orderDO.setAuditState(OrderAuditStateEnum.BOSS_APPROVED);
// 更新审核记录为审核成功
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderFinalApproveCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.BOSS_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_SUCCESS);
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderFinalApproveCmd.getCreatedBy());
auditDO.setAuditByName(orderFinalApproveCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
orderMapper.updateById(orderDO);
// 发货单改成已发货（待回款）
@ -684,11 +608,10 @@ public class OrderGatewayImpl implements OrderGateway {
}
@Override
@Transactional
public void rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd) {
LambdaQueryWrapper<OrderDO> queryWrapper = Wrappers.lambdaQuery(OrderDO.class);
queryWrapper.eq(OrderDO::getOrderId, orderRejectFinalCmd.getOrderId());
queryWrapper.eq(OrderDO::getState, OrderStateEnum.WAITING_AUDIT);
queryWrapper.eq(OrderDO::getState, OrderStateEnum.AUDITING);
queryWrapper.eq(OrderDO::getAuditState, OrderAuditStateEnum.PENDING_BOSS_APPROVAL);
queryWrapper.last("limit 1");
@ -698,28 +621,8 @@ public class OrderGatewayImpl implements OrderGateway {
throw new BizException(BizErrorCode.B_BIZ_ORDER_NOT_WAITING_FOR_REJECT_FINAL);
}
orderDO.setState(OrderStateEnum.REJECTED);
orderDO.setAuditState(OrderAuditStateEnum.BOSS_REJECTED);
orderMapper.updateById(orderDO);
// 更新审核记录
LambdaQueryWrapper<AuditDO> auditQueryWrapper = Wrappers.lambdaQuery(AuditDO.class);
auditQueryWrapper.eq(AuditDO::getSubjectId, orderRejectFinalCmd.getOrderId());
auditQueryWrapper.eq(AuditDO::getState, AuditStateEnum.WAITING_AUDIT);
auditQueryWrapper.eq(AuditDO::getType, AuditTypeEnum.BOSS_AUDIT);
AuditDO auditDO = auditMapper.selectOne(auditQueryWrapper);
if (auditDO != null) {
auditDO.setState(AuditStateEnum.AUDIT_REJECTED);
auditDO.setAuditReason(orderRejectFinalCmd.getRejectReason());
auditDO.setAuditAt(LocalDateTime.now());
auditDO.setAuditBy(orderRejectFinalCmd.getCreatedBy());
auditDO.setAuditByName(orderRejectFinalCmd.getCreatedByName());
auditMapper.updateById(auditDO);
} else {
// 如果审核记录不存在，抛出异常
throw new BizException(BizErrorCode.B_BIZ_AUDIT_NOT_FOUND);
}
}
@Override
@ -1034,7 +937,18 @@ public class OrderGatewayImpl implements OrderGateway {
queryWrapper.last("limit 1");
OrderVehicleDO orderVehicleDO = orderVehicleMapper.selectOne(queryWrapper);
return orderVehicleDO != null ? orderVehicleDO.getVehicleNo() : null;
if (Objects.nonNull(orderVehicleDO)) {
return orderVehicleDO.getVehicleNo();
}
DealerDO dealerDO = dealerMapper.selectById(lastVehicleNoQry.getDealerId());
if (dealerDO.getSetting().getEnableInitialTrainNo()) {
return dealerDO.getSetting().getInitialTrainNo().toString();
} else {
return "0";
}
}
/**

1
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/mapper/OrderMapper.java
View File

@ -19,6 +19,7 @@ import java.util.Set;
public interface OrderMapper extends BaseMapper<OrderDO> {
List<OrderDO> selectByOrderIdList(@Param("orderIdList") Set<Long> orderIdList);
OrderDO selectByOrderId(@Param("orderId") Long orderId);
IPage<OrderDO> selectPage(IPage<OrderDO> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<OrderDO> queryWrapper, @Param("query") OrderPageQry orderPageQry);
}

1
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostItemMapper.xml
View File

@ -12,7 +12,6 @@
<result property="price" column="price"/>
<result property="rule" column="rule"/>
<result property="sort" column="sort"/>
<result property="costId" column="cost_id"/>
<result property="remark" column="remark"/>
<result property="status" column="status"/>
<result property="createdAt" column="created_at"/>

1
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CostMapper.xml
View File

@ -11,6 +11,7 @@
<result property="costItemIds" column="cost_item_ids"
typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
<result property="remark" column="remark"/>
<result property="isDefault" column="is_default"/>
<result property="sort" column="sort"/>
<result property="status" column="status"/>
<result property="createdAt" column="created_at"/>

15
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderMapper.xml
View File

@ -114,5 +114,20 @@
</if>
</where>
</select>
<select id="selectByOrderId"
resultType="com.xunhong.erp.turbo.biz.infrastructure.entity.OrderDO"
resultMap="SelectByOrderIdListResultMap">
SELECT
po.order_id, po.order_sn, po.state, po.audit_state, po.type,
ov.vehicle_id, ov.vehicle_no, ov.dealer_id, ov.dealer_name, ov.origin,
ov.destination
FROM `order` po
LEFT JOIN order_vehicle ov ON po.order_id = ov.order_id AND ov.is_delete
= 0
where po.is_delete = 0
AND po.order_id = #{orderId}
limit 1
</select>
</mapper>

13
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/api/OrderServiceI.java
View File

@ -2,6 +2,7 @@ package com.xunhong.erp.turbo.api.biz.api;
import com.xunhong.erp.turbo.api.biz.dto.cmd.*;
import com.xunhong.erp.turbo.api.biz.dto.qry.*;
import com.xunhong.erp.turbo.api.biz.dto.vo.AuditVO;
import com.xunhong.erp.turbo.api.biz.dto.vo.OrderVO;
import com.xunhong.erp.turbo.base.dto.PageDTO;
@ -23,17 +24,17 @@ public interface OrderServiceI {
void destroy(OrderDestroyCmd orderDestroyCmd);
void approve(OrderApproveCmd orderApproveCmd);
AuditVO approve(OrderApproveCmd orderApproveCmd);
void submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd);
AuditVO submitReview(OrderSubmitReviewCmd orderSubmitReviewCmd);
void withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd);
AuditVO withdrawReview(OrderWithdrawReviewCmd orderWithdrawReviewCmd);
void rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd);
AuditVO rejectApprove(OrderRejectApproveCmd orderRejectApproveCmd);
void finalApprove(OrderFinalApproveCmd orderFinalApproveCmd);
AuditVO finalApprove(OrderFinalApproveCmd orderFinalApproveCmd);
void rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd);
AuditVO rejectFinal(OrderRejectFinalCmd orderRejectFinalCmd);
Long countOrderByState(OrderCountQry orderCountQry);

6
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CostCreateCmd.java
View File

@ -60,6 +60,12 @@ public class CostCreateCmd extends Command {
@Schema(title = "备注")
private String remark;
/**
* 是否默认
*/
@Schema(title = "是否默认")
private Boolean isDefault;
/**
* 排序号
*/

12
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/DealerCreateCmd.java
View File

@ -136,5 +136,17 @@ public class DealerCreateCmd extends Command {
@Schema(title = "损耗金额")
private BigDecimal lossAmount;
/**
* 是否启用初始车次号
*/
@Schema(title = "是否启用初始车次号")
private Boolean enableInitialTrainNo;
/**
* 初始车次号
*/
@Schema(title = "初始车次号")
private Integer initialTrainNo;
}

3
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/OrderApproveCmd.java
View File

@ -21,6 +21,9 @@ public class OrderApproveCmd extends OrderCreateCmd {
@Schema(title = "采购订单ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long orderId;
@Schema(title = "审核ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED)
private Long auditId;
@Schema(title = "是否是暂存", type = "boolean", requiredMode = Schema.RequiredMode.REQUIRED)
private Boolean draft;

3
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/OrderFinalApproveCmd.java
View File

@ -15,5 +15,8 @@ public class OrderFinalApproveCmd extends Command {
@Schema(title = "采购订单ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long orderId;
@Schema(title = "审核ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED)
private Long auditId;
}

3
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/OrderRejectApproveCmd.java
View File

@ -16,6 +16,9 @@ public class OrderRejectApproveCmd extends Command {
@Schema(title = "采购订单ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long orderId;
@Schema(title = "审核ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED)
private Long auditId;
@Schema(title = "审核原因", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private String rejectReason;
}

3
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/OrderRejectFinalCmd.java
View File

@ -16,6 +16,9 @@ public class OrderRejectFinalCmd extends Command {
@Schema(title = "采购订单ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long orderId;
@Schema(title = "审核ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED)
private Long auditId;
@Schema(title = "驳回原因", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private String rejectReason;
}

3
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/OrderWithdrawReviewCmd.java
View File

@ -15,5 +15,8 @@ public class OrderWithdrawReviewCmd extends Command {
@Schema(title = "采购订单ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long orderId;
@Schema(title = "审核ID", requiredMode = Schema.RequiredMode.REQUIRED, type = "string")
private Long auditId;
}

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderSupplier.java
View File

@ -256,9 +256,9 @@ public class OrderSupplier extends Command {
private Boolean selected;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum poState;
/**

7
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/enums/OrderStateEnum.java
View File

@ -8,13 +8,12 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public enum OrderStateEnum {
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；4_已关闭；
*/
DRAFT(0, "草稿"),
WAITING_AUDIT(1, "审核中"),
AUDITING(1, "审核中"),
COMPLETED(2, "已完结"),
REJECTED(3, "已驳回"),
CLOSED(4, "已关闭"),
CLOSED(3, "已关闭"),
;
@EnumValue

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderCountQry.java
View File

@ -17,9 +17,9 @@ import lombok.EqualsAndHashCode;
public class OrderCountQry extends Query {
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum state;
/**

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderListQry.java
View File

@ -23,9 +23,9 @@ public class OrderListQry extends Query {
private String orderSn;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum state;
/**

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/OrderPageQry.java
View File

@ -26,9 +26,9 @@ public class OrderPageQry extends PageQuery {
private String orderSn;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum state;
/**

6
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CostVO.java
View File

@ -61,6 +61,12 @@ public class CostVO extends DTO {
@Schema(title = "备注")
private String remark;
/**
* 是否默认
*/
@Schema(title = "是否默认")
private Boolean isDefault;
/**
* 排序号
*/

12
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/DealerVO.java
View File

@ -155,5 +155,17 @@ public class DealerVO extends DTO {
*/
@Schema(title = "损耗金额")
private BigDecimal lossAmount;
/**
* 是否启用初始车次号
*/
@Schema(title = "是否启用初始车次号")
private Boolean enableInitialTrainNo;
/**
* 初始车次号
*/
@Schema(title = "初始车次号")
private Integer initialTrainNo;
}

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderCostVO.java
View File

@ -96,9 +96,9 @@ public class OrderCostVO extends Command {
private LocalDateTime createdAt;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum poState;
/**

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderRebateVO.java
View File

@ -75,9 +75,9 @@ public class OrderRebateVO extends Command {
private LocalDateTime createdAt;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum poState;
/**

6
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderShipVO.java
View File

@ -38,19 +38,19 @@ public class OrderShipVO extends DTO {
/**
* 经销商ID
*/
@Schema(title = "经销商ID", type = "string")
@Schema(title = "经销商ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED)
private Long dealerId;
/**
* 经销商名称
*/
@Schema(title = "经销商名称")
@Schema(title = "经销商名称", requiredMode = Schema.RequiredMode.REQUIRED)
private String dealerName;
/**
* 发货单编号
*/
@Schema(title = "发货单编号")
@Schema(title = "发货单编号", requiredMode = Schema.RequiredMode.REQUIRED)
private String orderSn;
/**

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderSupplierVO.java
View File

@ -228,9 +228,9 @@ public class OrderSupplierVO extends DTO {
private LocalDateTime createdAt;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；")
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；")
private OrderStateEnum poState;
/**

4
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/OrderVO.java
View File

@ -66,9 +66,9 @@ public class OrderVO extends DTO {
private OrderPricingMethodEnum pricingMethod;
/**
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；
* 采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；
*/
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已驳回；4_已关闭；", requiredMode = Schema.RequiredMode.REQUIRED)
@Schema(title = "采购订单状态: 0_草稿；1_审核中；2_已完成；3_已关闭；", requiredMode = Schema.RequiredMode.REQUIRED)
private OrderStateEnum state;
/**