diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index ec11f930e..e309e4f2e 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -137,6 +137,9 @@ public class PurApplyEntity { @TableField(value = "approvalFlowId") private String approvalFlowId; + @TableField(value = "pageType") + private Integer pageType; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurContractEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurContractEntity.java index 13878ec9b..479195a71 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurContractEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurContractEntity.java @@ -163,5 +163,8 @@ public class PurContractEntity implements Serializable { @TableField(value = "isGenerateOrder") private Integer isGenerateOrder; + @TableField(value = "pageType") + private Integer pageType; + private static final long serialVersionUID = 1L; } diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java index d7b3210a5..161d72ccc 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderDetailEntity.java @@ -62,6 +62,9 @@ public class PurOrderDetailEntity { @TableField(value = "destinyId") private String destinyId; + @TableField(exist = false) + private Integer pageType; + public static final String COL_ID = "id"; public static final String COL_ORDERIDFK = "orderIdFk"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 0357540b3..8811d0cb9 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -154,6 +154,9 @@ public class PurOrderEntity { @TableField(value = "approvalFlowId") private String approvalFlowId; + @TableField(value = "pageType") + private Integer pageType; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index f17a8cc09..ce1d9c97b 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -156,6 +156,9 @@ public class PurPlanEntity { @TableField(value = "importStatus") private Integer importStatus; + @TableField(value = "pageType") + private Integer pageType; + public static final String COL_ID = "id"; public static final String COL_BILLNO = "billNo"; diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java index 0e598e7b8..d36240f24 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java @@ -68,4 +68,6 @@ public class PurApplyDetailRequest extends ListPageRequest { */ private String endDate; private String nameCode; + + private Integer pageType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java index 027d7079b..f9b7215c8 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyRequest.java @@ -115,4 +115,6 @@ public class PurApplyRequest extends ListPageRequest { private Boolean sysApprovalFlow; + private Integer pageType; + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java index 8624bbfcd..dd51fd420 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderDetailRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -76,4 +77,9 @@ public class PurOrderDetailRequest extends ListPageRequest { */ private String manufactory; private String nameCode; + + + @TableField(value = "pageType") + private Integer pageType; + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java index f0069c683..c50082e28 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurOrderRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -98,6 +99,7 @@ public class PurOrderRequest extends ListPageRequest { private String orderBy; private Boolean sysApprovalFlow; - + @TableField(value = "pageType") + private Integer pageType; } diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java index b925d8e46..b91ea7ccc 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanDetailRequest.java @@ -1,6 +1,7 @@ package com.glxp.api.req.purchase; +import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -78,4 +79,7 @@ public class PurPlanDetailRequest extends ListPageRequest { private String nameCode; private String checksupId; + @TableField(value = "pageType") + private Integer pageType; + } diff --git a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java index 59866cc17..af7202dc7 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurPlanRequest.java @@ -107,4 +107,7 @@ public class PurPlanRequest extends ListPageRequest { @TableField(value = "importStatus") private Integer importStatus; + @TableField(value = "pageType") + private Integer pageType; + } diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml index b4f0572d9..9747c4156 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml @@ -76,28 +76,31 @@ - AND deptCode = #{deptCode} + AND pur_apply.deptCode = #{deptCode} AND pur_apply.invCode = #{invCode} - AND targetInvCode = #{targetInvCode} + AND pur_apply.targetInvCode = #{targetInvCode} - AND targetDeptCode = #{targetDeptCode} + AND pur_apply.targetDeptCode = #{targetDeptCode} - AND auditUser = #{auditUser} + AND pur_apply.auditUser = #{auditUser} AND pur_apply.createUser = #{createUser} - AND generatePlan = 1 + AND pur_apply.generatePlan = 1 - AND emergency = #{emergency} + AND pur_apply.emergency = #{emergency} + + + AND pur_apply.pageType = #{pageType} @@ -192,6 +195,9 @@ approvalFlowId=#{approvalFlowId}, + + pageType=#{pageType}, + WHERE id = #{id} diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml index 5d65f45a6..f00ca65e1 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml @@ -139,6 +139,9 @@ AND pur_apply.billNo like concat('%', #{billNo}, '%') + + AND pur_apply.pageType = #{pageType} + AND productId like concat('%', #{productId}, '%') diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml index cd406021b..07500e9a2 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml @@ -110,19 +110,22 @@ - AND deptCode = #{deptCode} + AND pur_order.deptCode = #{deptCode} - AND invCode = #{invCode} + AND pur_order.invCode = #{invCode} - AND auditUser = #{auditUser} + AND pur_order.auditUser = #{auditUser} - AND createUser = #{createUser} + AND pur_order.createUser = #{createUser} - AND emergency = #{emergency} + AND pur_order.emergency = #{emergency} + + + AND pur_order.pageType = #{pageType} diff --git a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml index 828f0e390..56d99e5f4 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurOrderDetailDao.xml @@ -158,6 +158,9 @@ AND pur_order.billNo like concat('%', #{billNo}, '%') + + AND pur_order.pageType = #{pageType} + AND productId like concat('%', #{productId}, '%') diff --git a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml index 0c911b196..15017b310 100644 --- a/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/PurPlanDao.xml @@ -78,22 +78,25 @@ - AND deptCode = #{deptCode} + AND pur_plan.deptCode = #{deptCode} - AND invCode = #{invCode} + AND pur_plan.invCode = #{invCode} - AND auditUser = #{auditUser} + AND pur_plan.auditUser = #{auditUser} - AND createUser = #{createUser} + AND pur_plan.createUser = #{createUser} - AND emergency = #{emergency} + AND pur_plan.emergency = #{emergency} - AND importStatus = #{importStatus} + AND pur_plan.importStatus = #{importStatus} + + + AND pur_plan.pageType = #{pageType} diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index b9f56a239..01e47d3ad 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -2627,3 +2627,131 @@ INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, ` CALL Pro_Temp_ColumnWork('pur_plan', 'importStatus', ' bit(1) NOT NULL DEFAULT b''0'' COMMENT ''是否 导入''', 1); + + +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, + `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) + VALUES (3691, '申购管理', 1703, 13, 'purApply', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-08 17:01:50', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, + `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) + VALUES (3692, '计划管理', 1703, 14, 'purPlan', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-10 14:52:34', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, + `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) + VALUES (3693, '订单管理', 1703, 15, 'purOrder', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-03-08 10:21:58', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, `is_cache`, `menu_type`, + `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) + VALUES (3694, '合同管理', 1703, 16, 'purContract', NULL, NULL, 1, 0, 'M', '0', '0', NULL, NULL, '超级用户', '2023-02-10 14:52:34', NULL, NULL, NULL); + +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3695, '新增申购单', 3691, 1, 'purchase/purApply/purApply', 'purchase/purApply/purApply', '{\"pageType\":2}', 1, 0, 'C', + '0', '0', 'purchase:purApply:purApply', NULL, '超级用户', '2023-02-08 17:02:19', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3696, '审核申购单', 3691, 2, 'purchase/purApply/pureApplyAudit', 'purchase/purApply/pureApplyAudit', '{\"pageType\":2}', + 1, 0, 'C', '0', '0', 'purchase:purApply:pureApplyAudit', NULL, '超级用户', '2023-02-10 13:54:03', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3697, '查询申购单', 3691, 3, 'purchase/purApply/pureApplySearch', 'purchase/purApply/pureApplySearch', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', 'purchase:purApply:pureApplySearch', NULL, '超级用户', '2023-02-10 14:47:19', + NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3698, '新增采购计划', 3692, 1, 'purchase/purPlan/purPlan', 'purchase/purPlan/purPlan', '{\"pageType\":2}', 1, 0, 'C', '0', + '0', 'purchase:purPlan:purPlan', NULL, '超级用户', '2023-02-10 16:25:48', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3699, '审核采购计划', 3692, 2, 'purchase/purPlan/purPlanAudit', 'purchase/purPlan/purPlanAudit', '{\"pageType\":2}', 1, 0, + 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3700, '查询采购计划', 3692, 3, 'purchase/purPlan/purPlanSearch', 'purchase/purPlan/purPlanSearch', '{\"pageType\":2}', 1, + 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:27:49', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3701, '新增采购订单', 3693, 1, 'purchase/purOrder/purOrder', 'purchase/purOrder/purOrder', '{\"pageType\":2}', 1, 0, 'C', + '0', '0', NULL, '', '超级用户', '2023-03-08 10:32:25', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3702, '审核采购订单', 3693, 2, 'purchase/purOrder/purOrderAudit', 'purchase/purOrder/purOrderAudit', '{\"pageType\":2}', + 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-03-08 10:33:41', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3703, '查询采购订单', 3693, 3, 'purchase/purOrder/purOrderSearch', 'purchase/purOrder/purOrderSearch', '{\"pageType\":2}', + 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-03-08 10:34:32', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3704, '申购单明细', 3691, 4, 'details', 'purchase/purApply/pureApplySearchDetails', '{\"pageType\":2}', 1, 0, 'C', '0', + '0', NULL, NULL, '超级用户', '2023-04-04 09:30:27', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3705, '采购计划明细', 3692, 4, 'details', 'purchase/purPlan/purPlanSearchDetails', '{\"pageType\":2}', 1, 0, 'C', '0', + '0', NULL, NULL, '超级用户', '2023-04-04 09:32:00', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3706, '采购订单明细', 3693, 4, 'details', 'purchase/purOrder/purOrderSearchDetails', '{\"pageType\":2}', 1, 0, 'C', '0', + '0', NULL, NULL, '超级用户', '2023-04-04 09:32:44', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3707, '我的申购单 ', 3691, 2, 'purchase/purApply/pureApplyMySearch', 'purchase/purApply/pureApplyMySearch', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-07-20 17:08:38', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3708, '待提交合同', 3694, 1, 'purchase/purContract/purContract', 'purchase/purContract/purContract', '{\"pageType\":2}', + 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-10 16:25:48', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3709, '待审核合同', 3694, 2, 'purchase/purContract/purContractReviewed', 'purchase/purContract/purContractReviewed', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:07:07', NULL, NULL, NULL); +INSERT IGNORE INTO auth_menu(`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query_param`, `is_frame`, + `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, + `update_by`, `update_time`, `remark`) +VALUES (3710, '已完成合同', 3694, 3, 'purchase/purContract/purContractFinish', 'purchase/purContract/purContractFinish', + '{\"pageType\":2}', 1, 0, 'C', '0', '0', NULL, NULL, '超级用户', '2023-02-14 11:27:49', NULL, NULL, NULL); + + +UPDATE auth_menu SET `menu_name` = '新增申购单', `parent_id` = 1674, `order_num` = 1, `path` = 'purchase/purApply/purApply', `component` = 'purchase/purApply/purApply', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'purchase:purApply:purApply', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-08 17:02:19', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1675; +UPDATE auth_menu SET `menu_name` = '审核申购单', `parent_id` = 1674, `order_num` = 2, `path` = 'purchase/purApply/pureApplyAudit', `component` = 'purchase/purApply/pureApplyAudit', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'purchase:purApply:pureApplyAudit', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-10 13:54:03', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1677; +UPDATE auth_menu SET `menu_name` = '查询申购单', `parent_id` = 1674, `order_num` = 3, `path` = 'purchase/purApply/pureApplySearch', `component` = 'purchase/purApply/pureApplySearch', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'purchase:purApply:pureApplySearch', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-10 14:47:19', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1678; +UPDATE auth_menu SET `menu_name` = '新增采购计划', `parent_id` = 1679, `order_num` = 1, `path` = 'purchase/purPlan/purPlan', `component` = 'purchase/purPlan/purPlan', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = 'purchase:purPlan:purPlan', `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-10 16:25:48', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1680; +UPDATE auth_menu SET `menu_name` = '审核采购计划', `parent_id` = 1679, `order_num` = 2, `path` = 'purchase/purPlan/purPlanAudit', `component` = 'purchase/purPlan/purPlanAudit', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-14 11:07:07', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1689; +UPDATE auth_menu SET `menu_name` = '查询采购计划', `parent_id` = 1679, `order_num` = 3, `path` = 'purchase/purPlan/purPlanSearch', `component` = 'purchase/purPlan/purPlanSearch', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-14 11:27:49', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1690; +UPDATE auth_menu SET `menu_name` = '新增采购订单', `parent_id` = 1730, `order_num` = 1, `path` = 'purchase/purOrder/purOrder', `component` = 'purchase/purOrder/purOrder', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = '', `create_by` = '超级用户', `create_time` = '2023-03-08 10:32:25', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1731; +UPDATE auth_menu SET `menu_name` = '审核采购订单', `parent_id` = 1730, `order_num` = 2, `path` = 'purchase/purOrder/purOrderAudit', `component` = 'purchase/purOrder/purOrderAudit', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-03-08 10:33:41', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1732; +UPDATE auth_menu SET `menu_name` = '查询采购订单', `parent_id` = 1730, `order_num` = 3, `path` = 'purchase/purOrder/purOrderSearch', `component` = 'purchase/purOrder/purOrderSearch', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-03-08 10:34:32', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1733; +UPDATE auth_menu SET `menu_name` = '申购单明细', `parent_id` = 1674, `order_num` = 4, `path` = 'details', `component` = 'purchase/purApply/pureApplySearchDetails', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-04-04 09:30:27', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1763; +UPDATE auth_menu SET `menu_name` = '采购计划明细', `parent_id` = 1679, `order_num` = 4, `path` = 'details', `component` = 'purchase/purPlan/purPlanSearchDetails', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-04-04 09:32:00', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1764; +UPDATE auth_menu SET `menu_name` = '采购订单明细', `parent_id` = 1730, `order_num` = 4, `path` = 'details', `component` = 'purchase/purOrder/purOrderSearchDetails', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-04-04 09:32:44', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1765; +UPDATE auth_menu SET `menu_name` = '我的申购单 ', `parent_id` = 1674, `order_num` = 2, `path` = 'purchase/purApply/pureApplyMySearch', `component` = 'purchase/purApply/pureApplyMySearch', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-07-20 17:08:38', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 1843; +UPDATE auth_menu SET `menu_name` = '待提交合同', `parent_id` = 3679, `order_num` = 1, `path` = 'purchase/purContract/purContract', `component` = 'purchase/purContract/purContract', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-10 16:25:48', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 3680; +UPDATE auth_menu SET `menu_name` = '待审核合同', `parent_id` = 3679, `order_num` = 2, `path` = 'purchase/purContract/purContractReviewed', `component` = 'purchase/purContract/purContractReviewed', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-14 11:07:07', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 3689; +UPDATE auth_menu SET `menu_name` = '已完成合同', `parent_id` = 3679, `order_num` = 3, `path` = 'purchase/purContract/purContractFinish', `component` = 'purchase/purContract/purContractFinish', `query_param` = '{\"pageType\":1}', `is_frame` = 1, `is_cache` = 0, `menu_type` = 'C', `visible` = '0', `status` = '0', `perms` = NULL, `icon` = NULL, `create_by` = '超级用户', `create_time` = '2023-02-14 11:27:49', `update_by` = NULL, `update_time` = NULL, `remark` = NULL WHERE `menu_id` = 3690; + + +CALL Pro_Temp_ColumnWork('pur_apply', 'pageType', + ' int NOT NULL DEFAULT b''1'' COMMENT ''1:业务管理;2:设备管理''', + 1); +CALL Pro_Temp_ColumnWork('pur_plan', 'pageType', + ' int NOT NULL DEFAULT b''1'' COMMENT ''1:业务管理;2:设备管理''', + 1); +CALL Pro_Temp_ColumnWork('pur_order', 'pageType', + ' int NOT NULL DEFAULT b''1'' COMMENT ''1:业务管理;2:设备管理''', + 1); +CALL Pro_Temp_ColumnWork('pur_contract', 'pageType', + ' int NOT NULL DEFAULT b''1'' COMMENT ''1:业务管理;2:设备管理''', + 1);