xignzi006 发布系统代码

app_CRM/src/interface/entity/account.ts

@@ -1263,7 +1263,7 @@ export interface Account {
     territoryname?: any;
 
     /**
-     * 上级单位
+     * 上级客户
      *
      * @returns {*}
      * @memberof Account

app_CRM/src/locale/lanres/entities/account/account_en_US.ts

@@ -158,7 +158,7 @@ export default {
     originatingleadname: "原始潜在顾客",
     defaultpricelevelname: "价目表",
     territoryname: "区域",
-    parentaccountname: "上级单位",
+    parentaccountname: "上级客户",
     preferredequipmentname: "首选设施/设备",
     preferredservicename: "首选服务",
     primarycontactname: "主要联系人",
@@ -275,7 +275,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -333,7 +333,7 @@ export default {
 			sic: "行业编码", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			ownershipcode: "所有权", 
 			defaultpricelevelname: "价目表", 
@@ -381,7 +381,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -406,7 +406,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -456,7 +456,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -603,6 +603,7 @@ export default {
 			address1_city: "地址 1: 市/县",
 			primarycontactname: "主要联系人",
 			emailaddress1: "电子邮件",
+			parentaccountname: "上级客户",
 		},
 		uiactions: {
 		},

app_CRM/src/locale/lanres/entities/account/account_zh_CN.ts

@@ -157,7 +157,7 @@ export default {
     originatingleadname: "原始潜在顾客",
     defaultpricelevelname: "价目表",
     territoryname: "区域",
-    parentaccountname: "上级单位",
+    parentaccountname: "上级客户",
     preferredequipmentname: "首选设施/设备",
     preferredservicename: "首选服务",
     primarycontactname: "主要联系人",
@@ -274,7 +274,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -332,7 +332,7 @@ export default {
 			sic: "行业编码", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			ownershipcode: "所有权", 
 			defaultpricelevelname: "价目表", 
@@ -380,7 +380,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -405,7 +405,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -455,7 +455,7 @@ export default {
 			telephone1: "主要电话", 
 			fax: "传真", 
 			websiteurl: "网站", 
-			parentaccountname: "上级单位", 
+			parentaccountname: "上级客户", 
 			tickersymbol: "股票代号", 
 			customertypecode: "关系类型", 
 			defaultpricelevelname: "价目表", 
@@ -602,6 +602,7 @@ export default {
 			address1_city: "地址 1: 市/县",
 			primarycontactname: "主要联系人",
 			emailaddress1: "电子邮件",
+			parentaccountname: "上级客户",
 		},
 		uiactions: {
 		},

app_CRM/src/widgets/account/edit-account-info-form/edit-account-info-form-base.tsx

@@ -117,7 +117,7 @@ export class Edit_AccountInfoEditFormBase extends EditFormControlBase {
 
         websiteurl: new FormItemModel({ caption: '网站', detailType: 'FORMITEM', name: 'websiteurl', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        parentaccountname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+        parentaccountname: new FormItemModel({ caption: '上级客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         tickersymbol: new FormItemModel({ caption: '股票代号', detailType: 'FORMITEM', name: 'tickersymbol', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/account/info-all-form/info-all-form-base.tsx

@@ -242,7 +242,7 @@ export class Info_AllEditFormBase extends EditFormControlBase {
 
         websiteurl: new FormItemModel({ caption: '网站', detailType: 'FORMITEM', name: 'websiteurl', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        parentaccountname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+        parentaccountname: new FormItemModel({ caption: '上级客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         tickersymbol: new FormItemModel({ caption: '股票代号', detailType: 'FORMITEM', name: 'tickersymbol', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/account/main-form/main-form-base.tsx

@@ -144,7 +144,7 @@ export class MainEditFormBase extends EditFormControlBase {
 
         websiteurl: new FormItemModel({ caption: '网站', detailType: 'FORMITEM', name: 'websiteurl', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        parentaccountname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+        parentaccountname: new FormItemModel({ caption: '上级客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         tickersymbol: new FormItemModel({ caption: '股票代号', detailType: 'FORMITEM', name: 'tickersymbol', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/account/main-grid/main-grid-base.tsx

@@ -91,6 +91,13 @@ export class MainGridBase extends GridControllerBase {
             show: true,
             util: 'PX'
         },
+        {
+            name: 'parentaccountname',
+            label: '上级客户',
+            langtag: 'entities.account.main_grid.columns.parentaccountname',
+            show: true,
+            util: 'PX'
+        },
     ]
 
     /**
@@ -130,6 +137,7 @@ export class MainGridBase extends GridControllerBase {
         'address1_city':false,
         'primarycontactname':false,
         'emailaddress1':false,
+        'parentaccountname':false,
     };
 
     /**

app_CRM/src/widgets/account/main-grid/main-grid-model.ts

@@ -46,6 +46,11 @@ export default class MainModel {
           prop: 'transactioncurrencyid',
           dataType: 'PICKUP',
         },
+        {
+          name: 'parentaccountname',
+          prop: 'parentaccountname',
+          dataType: 'PICKUPTEXT',
+        },
         {
           name: 'slaid',
           prop: 'slaid',

app_CRM/src/widgets/account/main-grid/main-grid.html

@@ -83,6 +83,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('parentaccountname')">
+                <el-table-column show-overflow-tooltip :prop="'parentaccountname'" :label="$t('entities.account.main_grid.columns.parentaccountname')" :width="200"  :align="'left'" :sortable="'custom'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.account.main_grid.columns.parentaccountname')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.parentaccountname}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>

app_CRM/src/widgets/account/quick-create-form/quick-create-form-base.tsx

@@ -117,7 +117,7 @@ export class QuickCreateEditFormBase extends EditFormControlBase {
 
         websiteurl: new FormItemModel({ caption: '网站', detailType: 'FORMITEM', name: 'websiteurl', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
-        parentaccountname: new FormItemModel({ caption: '上级单位', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
+        parentaccountname: new FormItemModel({ caption: '上级客户', detailType: 'FORMITEM', name: 'parentaccountname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 
         tickersymbol: new FormItemModel({ caption: '股票代号', detailType: 'FORMITEM', name: 'tickersymbol', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }),
 

app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form-service.ts

@@ -119,6 +119,9 @@ export default class Edit_ChildIncidentService extends ControlService {
         if (Object.is(serviceName, 'SubjectService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.subjectService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'subjectid', 'subject');
         }
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
         if (Object.is(serviceName, 'ProductService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.productService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'productid', 'product');
         }

app_CRM/src/widgets/incident/edit-child-incident-form/edit-child-incident-form.html

@@ -77,7 +77,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ }"
+  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
   valueitem='primarycontactid' 
   :value="data.primarycontactname" 
   editortype="" 

app_CRM/src/widgets/lead/qualification-form/qualification-form-service.ts

@@ -98,6 +98,9 @@ export default class QualificationService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/lead/qualification-form/qualification-form.html

@@ -20,7 +20,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ }"
+  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype="" 

app_CRM/src/widgets/opportunity/main-form/main-form-service.ts

@@ -116,6 +116,9 @@ export default class MainService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/opportunity/main-form/main-form.html

@@ -26,7 +26,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ }"
+  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype="" 

app_CRM/src/widgets/opportunity/quick-create-form/quick-create-form-service.ts

@@ -107,6 +107,9 @@ export default class QuickCreateService extends ControlService {
      */
     @Errorlog
     public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
+        if (Object.is(serviceName, 'ContactService') && Object.is(interfaceName, 'FetchDefault')) {
+            return this.doItems(this.contactService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'contactid', 'contact');
+        }
         if (Object.is(serviceName, 'AccountService') && Object.is(interfaceName, 'FetchDefault')) {
             return this.doItems(this.accountService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'accountid', 'account');
         }

app_CRM/src/widgets/opportunity/quick-create-form/quick-create-form.html

@@ -26,7 +26,7 @@
   deMajorField='fullname'
   deKeyField='contact'
   :service="service"
-  :acParams="{ }"
+  :acParams="{ serviceName: 'ContactService', interfaceName: 'FetchDefault'}"
   valueitem='parentcontactid' 
   :value="data.parentcontactname" 
   editortype="" 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/domain/Account.java

@@ -1225,7 +1225,7 @@ public class Account extends EntityMP implements Serializable {
     @JsonProperty("territoryname")
     private String territoryname;
     /**
-     * 上级单位
+     * 上级客户
      */
     @TableField(value = "parentaccountname")
     @JSONField(name = "parentaccountname")
@@ -2609,7 +2609,7 @@ public class Account extends EntityMP implements Serializable {
     }
 
     /**
-     * 设置 [上级单位]
+     * 设置 [上级客户]
      */
     public void setParentaccountname(String parentaccountname){
         this.parentaccountname = parentaccountname ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/base/filter/AccountSearchContext.java

@@ -293,14 +293,14 @@ public class AccountSearchContext extends QueryWrapperContext<Account> {
             this.getSearchCond().like("territoryname", n_territoryname_like);
         }
     }
-	private String n_parentaccountname_eq;//[上级单位]
+	private String n_parentaccountname_eq;//[上级客户]
 	public void setN_parentaccountname_eq(String n_parentaccountname_eq) {
         this.n_parentaccountname_eq = n_parentaccountname_eq;
         if(!ObjectUtils.isEmpty(this.n_parentaccountname_eq)){
             this.getSearchCond().eq("parentaccountname", n_parentaccountname_eq);
         }
     }
-	private String n_parentaccountname_like;//[上级单位]
+	private String n_parentaccountname_like;//[上级客户]
 	public void setN_parentaccountname_like(String n_parentaccountname_like) {
         this.n_parentaccountname_like = n_parentaccountname_like;
         if(!ObjectUtils.isEmpty(this.n_parentaccountname_like)){

businesscentral-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[ACCOUNT]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-account-427-1">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-account-429-1">
         <createTable tableName="ACCOUNT">
                 <column name="ADDRESS1_PRIMARYCONTACTNAME" remarks="" type="VARCHAR(100)">
                 </column>
@@ -10879,7 +10879,7 @@
 
 
     <!--输出实体[WEBSITECHANNEL]数据结构 -->
-    <changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-43-129">
+    <changeSet author="a_LAB01_e85d8801c" id="tab-websitechannel-68-129">
         <createTable tableName="WEBSITECHANNEL">
                 <column name="WEBSITECHANNELID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_WEBSITECHANNEL_WEBSITECHANN"/>
@@ -10978,31 +10978,31 @@
     </changeSet>
 
         <!--输出实体[ACCOUNT]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-132">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-132">
        <addForeignKeyConstraint baseColumnNames="PARENTACCOUNTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__ACCOUNT__PARENT" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ACCOUNTID" referencedTableName="ACCOUNT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-133">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-133">
        <addForeignKeyConstraint baseColumnNames="PRIMARYCONTACTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__CONTACT__PRIMAR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONTACTID" referencedTableName="CONTACT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-134">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-134">
        <addForeignKeyConstraint baseColumnNames="PREFERREDEQUIPMENTID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__EQUIPMENT__PREF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="EQUIPMENTID" referencedTableName="EQUIPMENT" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-135">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-135">
        <addForeignKeyConstraint baseColumnNames="ORIGINATINGLEADID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__LEAD__ORIGINATI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="LEADID" referencedTableName="LEAD" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-136">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-136">
        <addForeignKeyConstraint baseColumnNames="DEFAULTPRICELEVELID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__PRICELEVEL__DEF" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PRICELEVELID" referencedTableName="PRICELEVEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-137">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-137">
        <addForeignKeyConstraint baseColumnNames="PREFERREDSERVICEID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SERVICE__PREFER" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SERVICEID" referencedTableName="SERVICE" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-138">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-138">
        <addForeignKeyConstraint baseColumnNames="SLAID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__SLA__SLAID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SLAID" referencedTableName="SLA" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-139">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-139">
        <addForeignKeyConstraint baseColumnNames="TERRITORYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TERRITORY__TERR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TERRITORYID" referencedTableName="TERRITORY" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-account-427-140">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-account-429-140">
        <addForeignKeyConstraint baseColumnNames="TRANSACTIONCURRENCYID" baseTableName="ACCOUNT" constraintName="DER1N_ACCOUNT__TRANSACTIONCURR" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="TRANSACTIONCURRENCYID" referencedTableName="TRANSACTIONCURRENCY" validate="true"/>
     </changeSet>
         <!--输出实体[ACTIVITYMIMEATTACHMENT]外键关系 -->
@@ -11904,10 +11904,10 @@
         <!--输出实体[UOMSCHEDULE]外键关系 -->
         <!--输出实体[WEBSITE]外键关系 -->
         <!--输出实体[WEBSITECHANNEL]外键关系 -->
-    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-43-427">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-68-427">
        <addForeignKeyConstraint baseColumnNames="PWEBSITECHANNELID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITECH" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITECHANNELID" referencedTableName="WEBSITECHANNEL" validate="true"/>
     </changeSet>
-    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-43-428">
+    <changeSet author="a_LAB01_e85d8801c" id="fk-websitechannel-68-428">
        <addForeignKeyConstraint baseColumnNames="WEBSITEID" baseTableName="WEBSITECHANNEL" constraintName="DER1N_WEBSITECHANNEL_WEBSITE_W" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="WEBSITEID" referencedTableName="WEBSITE" validate="true"/>
     </changeSet>
         <!--输出实体[WEBSITECONTENT]外键关系 -->