Merge branch 'dev' into 'test'

toTest

See merge request jygk/dsc-base!11

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

@@ -107,4 +107,20 @@ public class PurchaseOrderController implements BusinessControllerMarker {
                         BeanUtils.toBean(list, PurchaseOrderRespVO.class));
     }
 
+    //提交订单审核
+    @PostMapping("/submit-order")
+    @Operation(summary = "提交订单审核")
+    @PreAuthorize("@ss.hasPermission('bse:purchase-order:update')")
+    public CommonResult<Boolean> submitOrder(@RequestParam("id") Long id) {
+        purchaseOrderService.submitOrder(id);
+        return success(true);
+    }
+
+    //提交ERP订单
+    @PostMapping("/submit-erp")
+    @Operation(summary = "提交ERP订单", description = "bse:purchase-order:update')")
+    public CommonResult<?> submitErp(@RequestBody List<Long> ids) {
+        return success( purchaseOrderService.submitErp(ids));
+    }
+
 }

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

@@ -1,6 +1,7 @@
 package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -148,4 +149,22 @@ public class PurchaseOrderSaveReqVO {
     @Schema(description = "订单明细")
     @ExcelProperty("订单明细")
     private List<PrchOrdDtlSaveReqVO> prchOrdDtlSaveReqVOS;
+
+
+    @Schema(description = "流程实例编号")
+    @ExcelProperty("流程实例编号")
+    @NotEmpty(message = "流程实例编号不能为空")
+    private String processInstanceId;
+
+    @Schema(description = "流程当前任务节点id")
+    @ExcelProperty("流程当前任务节点id")
+    private String taskId;
+
+    @Schema(description = " 审批意见")
+    @ExcelProperty(" 审批意见")
+    private String reviewOpinion;
+
+    @Schema(description = "是否提交审核，value为0或1")
+    @ExcelProperty("是否提交审核")
+    private int isPush;
 }

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

@@ -0,0 +1,28 @@
+package com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo;
+
+import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PrchOrdDtlDO;
+import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
+import lombok.Data;
+import java.util.List;
+
+/**
+ * 采购订单及明细查询结果 VO
+ */
+@Data
+public class PurchaseOrderWithDetailsVO {
+
+    /**
+     * 采购订单信息
+     */
+    private PurchaseOrderDO purchaseOrder;
+
+    /**
+     * 订单明细列表
+     */
+    private List<PrchOrdDtlDO> orderDetails;
+
+    /**
+     * 订单号（用于分组）
+     */
+    private String systemOrderNumber;
+}

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

@@ -214,4 +214,27 @@ public class PurchaseOrderDO extends BusinessBaseDO {
     @TableField("PRCH_GRP_NAME")
     private String purchaseGroupName;
 
+    /**
+     * 流程实例编号
+     */
+    @TableField("PRCS_INSC_ID")
+    private String processInstanceId;
+
+    /**
+     * 流程当前任务节点id
+     */
+    @TableField("TSK_NDE_ID")
+    private String taskId;
+
+    /**
+     * 审批意见
+     */
+    @TableField("RVW_ONN")
+    private String reviewOpinion;
+
+    /**
+     * 是否需要审批
+     */
+    @TableField("IS_PUSH")
+    private int isPush;
 }

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

@@ -7,8 +7,10 @@ import com.zt.plat.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zt.plat.framework.mybatis.core.mapper.BaseMapperX;
 
 import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderPageReqVO;
+import com.zt.plat.module.contractorder.controller.admin.purchaseorder.vo.PurchaseOrderWithDetailsVO;
 import com.zt.plat.module.contractorder.dal.dataobject.purchaseorder.PurchaseOrderDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -60,4 +62,5 @@ public interface PurchaseOrderMapper extends BaseMapperX<PurchaseOrderDO> {
                 .orderByDesc(PurchaseOrderDO::getId));
     }
 
+    List<PurchaseOrderWithDetailsVO> selectOrderById(@Param("ids") List<Long> id);
 }

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

@@ -63,4 +63,8 @@ public interface PurchaseOrderService {
      */
     PageResult<PurchaseOrderDO> getPurchaseOrderPage(PurchaseOrderPageReqVO pageReqVO);
 
+    String submitOrder(Long id);
+
+    String submitErp(List<Long> ids);
+
 }

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

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