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

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/ErrorCodeConstants.java

@@ -15,5 +15,6 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_ID_NOT_EXISTS = new ErrorCode(1_008_000_010, "订单id不能为空");
     ErrorCode PRCH_ORD_DTL_NOT_EXISTS =  new ErrorCode(1_008_001_001, "采购订单明细不存在");
     ErrorCode PURCHASE_ORDER_STATUS_ERROR = new ErrorCode(1_008_001_020, "非法的订单状态");
-    ErrorCode Sales_ORDER_NOT_EXISTS =  new ErrorCode(1_008_000_001, "销售订单不存在");
+    ErrorCode Sales_ORDER_NOT_EXISTS =  new ErrorCode(1_008_000_030, "销售订单不存在");
+    ErrorCode Sales_ORD_DTL_NOT_EXISTS =  new ErrorCode(1_008_001_040, "销售订单明细不存在");
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/enums/purchaseorder/OrderStatusEnum.java

@@ -3,7 +3,7 @@ package com.zt.plat.module.contractorder.enums.purchaseorder;
 import lombok.Getter;
 
 @Getter
-public enum PurchaseOrderStatusEnum {
+public enum OrderStatusEnum {
     // 草稿状态
     DRAFT("DRAFT", "草稿"),
     // 审批中状态
@@ -20,7 +20,7 @@ public enum PurchaseOrderStatusEnum {
     /** 状态描述 */
     private final String description;
 
-    PurchaseOrderStatusEnum(String code, String description) {
+    OrderStatusEnum(String code, String description) {
         this.code = code;
         this.description = description;
     }
@@ -30,8 +30,8 @@ public enum PurchaseOrderStatusEnum {
      * @param code 状态编码
      * @return 匹配的枚举，无匹配时返回 null
      */
-    public static PurchaseOrderStatusEnum getByCode(String code) {
+    public static OrderStatusEnum getByCode(String code) {
-        for (PurchaseOrderStatusEnum status : PurchaseOrderStatusEnum.values()) {
+        for (OrderStatusEnum status : OrderStatusEnum.values()) {
             if (status.getCode().equals(code)) {
                 return status;
             }

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

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

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

@@ -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（必须）")

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

@@ -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));
+    }
 
 
 }

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

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

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

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

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

@@ -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;

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

@@ -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（必须）")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/salesorder/vo/SalesOrderReviewReqVO.java

@@ -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;
+}