diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/XzdClassEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/XzdClassEnum.java index 6baece75..df1ffcea 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/XzdClassEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/XzdClassEnum.java @@ -12,14 +12,11 @@ public enum XzdClassEnum { JS_ZHFW_JINDU("xzd_js_zhfw_jindu"), //综合服务合同进度结算 JS_CG_JUNGON("xzd_js_cg_jungon"), //采购合同竣工结算 JS_CG_JINDU("xzd_js_cg_jindu"), //采购合同进度结算 -// 分包合同 - FENBAOHETONG_INFORMATION("xzd_subcontract"), -// 分包合同变更 - FENBAOHETONGBINGGENG_INFORMATION("xzd_subcontract_change"), - // 采购变更合同 - CAIGOUHETONG_INFORMATION("xzd_purchase_contract_alteration"), -// 采购合同 - PURCHASE_CONTRACT_INFORMATION("xzd_purchase_contract_information"); + FENBAOHETONG_INFORMATION("xzd_subcontract"),//分包合同 + FENBAOHETONGBINGGENG_INFORMATION("xzd_subcontract_change"),//分包合同变更 + CAIGOUHETONG_INFORMATION("xzd_purchase_contract_alteration"), //采购变更合同 + FENBAOHETONG_JINDU("xzd_settlement_of_subcontracting_contract"),//分包合同进度结算 + PURCHASE_CONTRACT_INFORMATION("xzd_purchase_contract_information");//采购合同 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java index 1ae23bc4..31161b73 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/enums/ZxdEnum.java @@ -5,6 +5,9 @@ public enum ZxdEnum { TYPE_CORRESPONDENT("客户","1"), TYPE_SUPPLIER("供应商","2"), + FENBAOHET("分包合同","2"), + HETONGLEIXING("合同外清单","1"), + HETONGLEIXINGNEI("合同内清单","2"), PURCHASE_PREFIX("采购合同信息前缀","CCTEG(CWZ)"), FENBAOHETONG_PREFIX("分包合同信息前缀","CCTEG(CSG)");