订单管理相关

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

@@ -182,4 +182,12 @@ public class PurchaseOrderController implements BusinessControllerMarker {
         return success(purchaseOrderService.linkOrder(req));
     }
 
+    @PostMapping("/order-pass-reject")
+    @Operation(summary = "订单审核")
+    public CommonResult<Boolean> orderPassReject(@RequestBody PurchaseorderReqVO reqVO){
+        return success(purchaseOrderService.orderPassReject(reqVO));
+    }
+
+
+
 }

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

@@ -175,4 +175,25 @@ public class PurchaseOrderRespVO {
     @Schema(description = "订单分类", example = "2")
     @ExcelProperty("订单分类")
     private String splyBsnTp;
+
+    @Schema(description = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    @ExcelProperty("公司名称")
+    private String cpName;
+
+    @Schema(description = "是否提交审核，value为0或1")
+    @ExcelProperty("是否提交审核")
+    private int isPush;
+
+    @Schema(description = "流程实例编号")
+    @ExcelProperty("流程实例编号")
+    private String processInstanceId;
+
+    @Schema(description = "流程当前任务节点id")
+    @ExcelProperty("流程当前任务节点id")
+    private String taskId;
+
+    @Schema(description = " 审批意见")
+    @ExcelProperty(" 审批意见")
+    private String reviewOpinion;
+
 }

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

@@ -0,0 +1,23 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.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 PurchaseorderReqVO {
+
+    @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;
+}

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/purchaseorder/PrchOrdDtlDO.java

@@ -84,7 +84,7 @@ public class PrchOrdDtlDO extends BusinessBaseDO {
     * 暂估数量;推送ERP（必须）
     */
     @TableField("QTY")
-    private String qty;
+    private BigDecimal qty;
     /**
     * 计量单位;推送ERP（必须）
     */

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/purchaseorder/PurchaseOrderService.java

@@ -110,4 +110,11 @@ public interface PurchaseOrderService {
      *
      */
     boolean linkOrder(LinkOrderReqVO reqVO);
+    /**
+     * 订单审核通过和不通过
+     *
+     * @param purchaseorderReqVO 采购审核
+     *
+     */
+    boolean orderPassReject(PurchaseorderReqVO purchaseorderReqVO);
 }

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/util/constants/ProcessDefinitionKeyConstants.java

@@ -2,5 +2,5 @@ package com.zt.plat.module.contractorder.util.constants;
 
 public interface ProcessDefinitionKeyConstants {
 
-    String PURCHASE_ORDER_REVIEW_PROCESS = "purchase_order_review_process";
+    String PURCHASE_ORDER_REVIEW_PROCESS = "purchase_order_review";
 }