zgty/zt-base
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、订单管理相关 2、销售订单相关接口

Browse Source
This commit is contained in:
潘荣晟
2025-10-24 17:13:33 +08:00
parent 4c7a5e878d
commit 1427e5a55b
23 changed files with 592 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderDetailsRespVO.java
View File

@@ -27,7 +27,7 @@ public class PurchaseOrderDetailsRespVO {
/**
* 公司编码;推送ERP（必须）
*/
private String companyNumber;
private String cpNum;
/**
* 客商编码;推送ERP（必须）
*/

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/purchaseorder/vo/PurchaseOrderRespVO.java
View File

@@ -27,7 +27,7 @@ public class PurchaseOrderRespVO {
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("公司编码;推送ERP（必须）")
private String companyNumber;
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商编码;推送ERP（必须）")

21
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/SalesOrderController.java
View File

@@ -12,6 +12,7 @@ import com.zt.plat.module.contractorder.api.ContractApiImpl;
import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.*;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderPageReqVO;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderRespVO;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderReviewReqVO;
import com.zt.plat.module.contractorder.controller.admin.salesorder.vo.SalesOrderSaveReqVO;
import com.zt.plat.module.contractorder.dal.dataobject.salesorder.SalesOrderDO;
import com.zt.plat.module.contractorder.service.purchaseorder.PurchaseOrderService;
@@ -122,6 +123,26 @@ public class SalesOrderController implements BusinessControllerMarker {
BeanUtils.toBean(list, PurchaseOrderRespVO.class));
}
//推送erp091
@PostMapping("/push-erp091")
@Operation(summary = "推送erp091")
public CommonResult<Boolean> pushErp091(@RequestParam("id")String id ) {
return success(salesOrderService.pushErp091(id));
}
//提交审批
@PostMapping("/submit-order")
@Operation(summary = "提交审批")
public CommonResult<String> submitOrder(@RequestParam("id")String id ) {
return success(salesOrderService.submitOrder(id));
}
//提交审批
@PostMapping("/order-pass-reject")
@Operation(summary = "订单审核")
public CommonResult<Boolean> orderPassReject(@RequestBody SalesOrderReviewReqVO reqVO) {
return success(salesOrderService.orderPassReject(reqVO));
}
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SaleOrderDetailsRespVO.java
View File

@@ -27,7 +27,7 @@ public class SaleOrderDetailsRespVO {
/**
* 公司编码;推送ERP（必须）
*/
private String companyNumber;
private String cpNum;
/**
* 客商编码;推送ERP（必须）
*/

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderDetailSaveReqVO.java
View File

@@ -14,8 +14,8 @@ public class SalesOrderDetailSaveReqVO {
private Long id;
@Schema(description = "订单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "9072")
@NotNull(message = "订单主键不能为空")
private Long orderId;
@NotEmpty(message = "订单主键不能为空")
private String orderId;
@Schema(description = "行项目;推送ERP(必须)", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "行项目;推送ERP(必须)不能为空")

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderPageReqVO.java
View File

@@ -22,7 +22,7 @@ public class SalesOrderPageReqVO extends PageParam {
private String systemOrderNumber;
@Schema(description = "公司编码;推送ERP（必须）")
private String companyNumber;
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）")
private String supplierNumber;

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderRespVO.java
View File

@@ -30,7 +30,7 @@ public class SalesOrderRespVO {
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("公司编码;推送ERP（必须）")
private String companyNumber;
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("客商编码;推送ERP（必须）")

23
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderReviewReqVO.java Normal file
View File

@@ -0,0 +1,23 @@
package com.zt.plat.module.contractorder.controller.admin.salesorder.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Data;
@Schema(description = "管理后台 - 订单审核请求对象 Request VO")
@Data
public class SalesOrderReviewReqVO {
@Schema(description = "合同主键ID", requiredMode = Schema.RequiredMode.REQUIRED)
@NotNull(message = "合同主键ID不能为空")
private Long id;
@Schema(description = "审批意见", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "审核意见不能为空")
private String reviewOpinion;
@Schema(description = "状态：待推送 WAIT_PUSH，已驳回 REJECTED", requiredMode = Schema.RequiredMode.REQUIRED)
@NotBlank(message = "审核状态不能为空")
private String status;
}

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderSaveReqVO.java
View File

@@ -32,7 +32,7 @@ public class SalesOrderSaveReqVO {
@Schema(description = "公司编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "公司编码;推送ERP（必须）不能为空")
private String companyNumber;
private String cpNum;
@Schema(description = "客商编码;推送ERP（必须）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "客商编码;推送ERP（必须）不能为空")

2
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PurchaseOrderDO.java
View File

@@ -52,7 +52,7 @@ public class PurchaseOrderDO extends BusinessBaseDO {
* 公司编码;推送ERP（必须）
*/
@TableField("CPN_NUM")
private String companyNumber;
private String cpNum;
/**
* 客商编码;推送ERP（必须）
*/

Some files were not shown because too many files have changed in this diff Show More