解决冲突

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/LF.K3.SCM.AppServerPlugin.csproj

@@ -9,11 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LF.K3.SCM.AppServerPlugin</RootNamespace>
     <AssemblyName>LF.K3.SCM.AppServerPlugin</AssemblyName>
-<<<<<<< HEAD
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-=======
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -90,10 +86,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AuditChecks\AuditCheckPlugIn.cs" />
-<<<<<<< HEAD
-    <Compile Include="AuditChecks\BOMTaskCheckServer.cs" />
-=======
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     <Compile Include="BOMTaskEditionServer.cs" />
     <Compile Include="BOMTaskExamineServer.cs" />
     <Compile Include="BomTaskSaveServer.cs" />

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/SaveLeifeiMaterial/SaveMaterialChanges.cs

@@ -236,11 +236,7 @@ namespace LF.K3.SCM.AppServerPlugin.SaveLeifeiMaterial
                 Specification = spe;
                 ListSpecification = new List<object>();
             }
-<<<<<<< HEAD
             string sq1 = "select F_QAZ_REMARK from T_BD_MATERIAL where FMATERIALGROUP='358233'";
-=======
-            string sq1 = "select F_QAZ_REMARK from T_BD_MATERIAL where FMATERIALGROUP='111963'";
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
             var dt = DBServiceHelper.ExecuteDataSet(this.Context, sq1).Tables[0];
             foreach (DataRow item in dt.Rows)
             {

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin.csproj

@@ -9,11 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>LF.K3.SCM.BusinessPlugin</RootNamespace>
     <AssemblyName>LF.K3.SCM.BusinessPlugin</AssemblyName>
-<<<<<<< HEAD
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-=======
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -115,7 +111,6 @@
     <Compile Include="OutStockListPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RecConditionEditPlugin.cs" />
-    <Compile Include="TreeColorExpress.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

DataModel/Start/BasicData/SimpleData/838801bd-1547-4369-8402-e8aac3e8bacc.sql

@@ -142,12 +142,12 @@ and t1.[货品代号] in (select  [货品代号]  from  '+@TableName+'  group  b
  Execute sp_executesql @MATERIALSQL
 --select * from Z_BAS_ITEM
 set @MATERIALSQL1=N'
-insert into T_BD_MATERIAL(FMATERIALID,FMASTERID, FCREATEORGID,FUSEORGID,FCREATEDATE,FMODIFYDATE,
+insert into T_BD_MATERIAL(FMATERIALID,FMASTERID, FCREATEORGID,FUSEORGID,FCREATEDATE,FMODIFYDATE,F_KTEN_CHECKBOX,
 FNUMBER,FCREATORID,FDOCUMENTSTATUS,FFORBIDSTATUS,F_QAZ_REMARK,
 F_QAZ_TEXT,F_QAZ_INTEGER,F_QAZ_TEXT1,F_QAZ_INTEGER1,F_QAZ_COMBO,
 F_QAZ_TEXT2,F_QAZ_TEXT3,F_QAZ_TEXT6,F_QAZ_COMBO2,F_QAZ_ASSISTANT,
 F_QAZ_ASSISTANT1,F_QAZ_INTEGER2,F_QAZ_QTY,F_QAZ_INTEGER3,FMATERIALGROUP
-) select T2.Id,T2.Id,1,1,GETDATE(),GETDATE(),
+) select T2.Id,T2.Id,1,1,GETDATE(),GETDATE(),case when [货品代号]  collate Chinese_PRC_CS_AI like ''ZJ%'' then ''1'' else ''0'' end as tc,
  货品代号,convert(int,创建人)as 创建人,''A'',''A'',规格,ISNULL([品牌], ''  '') as 品牌,ISNULL( [单模日产],0) as 单模日产,  ISNULL([开模图号], ''  '') as 开模图号,
   ISNULL( [每模穴数],0) as 每模穴数, ISNULL([使用范围], ''  '') as 使用范围,
   ISNULL([12NC], ''  '') as [12NC], ISNULL([SKU], ''  '') as SKU, ISNULL([CK编码], ''  '') as CK编码,ISNULL([调价物料类型], ''  '') as 调价物料类型,ISNULL([材质], ''  '') as 材质,
@@ -324,3 +324,4 @@ end
 
 
 
+

DataModel/Start/BasicData/SimpleData/a8032de8-5be4-4d20-b0fd-8bef14090835.sql

@@ -107,7 +107,3 @@ INSERT INTO T_BAS_ASSISTANTDATAENTRY_L(FPKID,FENTRYID,FLOCALEID,FDATAVALUE,FDESC
 
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e

DataModel_1/Start/BasicData/SimpleData/8_subsystem.sql

-IF NOT EXISTS (SELECT 1 FROM T_META_SUBSYSTEM WHERE fid='8')
-BEGIN
-/****** Object:Data       Script Date: 2021-11-10 21:40:17 ******/
-DELETE T_META_SUBSYSTEM WHERE fid='8' 
-INSERT INTO T_META_SUBSYSTEM(FID,FTOPCLASSID,FNUMBER,FSEQ,FVISIBLE,FISDEFAULT,FCHECKBOX,FMAPSCCMETAFOLDER,FFUNCPERMISSIONCTRL,FFIELDPERMISSIONCTRL) VALUES ('8','1',N'CN',60,null,1,0,N'http://192.168.16.99/svn/k3cloud_std/trunk/K3/FIN/DataModel/6.0/Public/Start/BasicData/MetaData/CN','1','1')  
-
-/****** Object:Data       Script Date: 2021-11-10 21:40:18 ******/
-DELETE T_META_SUBSYSTEM_L WHERE fid='8' 
-INSERT INTO T_META_SUBSYSTEM_L(FPKID,FID,FLOCALEID,FNAME,FDESCRIPTION) VALUES ('310a923ed717492ca57b76ab753b16bf','8',2052,N'出纳管理',N'出纳管理')  
-
-END;
-

DataModel_1/财务会计.pkgdef

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
@@ -31,42 +31,15 @@
       <Scripts />
     </CommonScripts>
   </CommonScript>
-<<<<<<< HEAD
   <LinkBusinessObjects />
   <BusinessObjects />
-=======
-  <LinkBusinessObjects>
-    <DynamicLinkBusinessObject>
-      <Target>CompileAndPackage</Target>
-      <Caption>出纳管理</Caption>
-      <Name>8</Name>
-      <ComponentPath>CN_1de26173</ComponentPath>
-    </DynamicLinkBusinessObject>
-  </LinkBusinessObjects>
-  <BusinessObjects>
-    <BusinessObject Target="CompileAndPackage" Id="39014c81-8d7f-4e2c-86cf-1dc61c8f63aa" Status="Updated" ComponentPath="CN_1de26173\39014c81-8d7f-4e2c-86cf-1dc61c8f63aa.dym" Type="Meta">39014c81-8d7f-4e2c-86cf-1dc61c8f63aa.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="88f6cc7e-4c17-442b-8914-868e25cdd0a9" Status="Updated" ComponentPath="CN_1de26173\88f6cc7e-4c17-442b-8914-868e25cdd0a9.dym" Type="Meta">88f6cc7e-4c17-442b-8914-868e25cdd0a9.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="AR_RECEIVEBILL" Status="Updated" ComponentPath="CN_1de26173\AR_RECEIVEBILL.dym" Type="Meta">AR_RECEIVEBILL.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="AR_REFUNDBILL" Status="Updated" ComponentPath="CN_1de26173\AR_REFUNDBILL.dym" Type="Meta">AR_REFUNDBILL.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="39014c81-8d7f-4e2c-86cf-1dc61c8f63aa.2052" Status="Updated" ComponentPath="CN_1de26173\39014c81-8d7f-4e2c-86cf-1dc61c8f63aa.2052.dymx" Type="LanguageRes">39014c81-8d7f-4e2c-86cf-1dc61c8f63aa.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="88f6cc7e-4c17-442b-8914-868e25cdd0a9.2052" Status="Updated" ComponentPath="CN_1de26173\88f6cc7e-4c17-442b-8914-868e25cdd0a9.2052.dymx" Type="LanguageRes">88f6cc7e-4c17-442b-8914-868e25cdd0a9.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="AR_RECEIVEBILL.2052" Status="Updated" ComponentPath="CN_1de26173\AR_RECEIVEBILL.2052.dymx" Type="LanguageRes">AR_RECEIVEBILL.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="AR_REFUNDBILL.2052" Status="Updated" ComponentPath="CN_1de26173\AR_REFUNDBILL.2052.dymx" Type="LanguageRes">AR_REFUNDBILL.2052.dymx</BusinessObject>
-  </BusinessObjects>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
   <ResourceObject />
   <StartScript>
     <SchemaScript Seq="0">
       <Scripts />
     </SchemaScript>
     <ConsoleMenuScript Seq="0">
-<<<<<<< HEAD
       <Scripts />
-=======
-      <Scripts>
-        <SqlScript Target="CompileAndPackage" ComponentPath="Start\BasicData\SimpleData\8_subsystem.sql" SqlSyntaxType="KSQL" Assertion="Semicolon" Seq="0" Id="8_subsystem.sql" UniqueScope="ISV" VerRule="ByContent" Level="0" Name="[子系统]出纳管理">[子系统]出纳管理</SqlScript>
-      </Scripts>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
     </ConsoleMenuScript>
     <InstallPlugIns />
     <SimpleDataScript Seq="0">

DataModel_20/供应链.pkgdef

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
@@ -31,45 +31,8 @@
       <Scripts />
     </CommonScripts>
   </CommonScript>
-<<<<<<< HEAD
   <LinkBusinessObjects />
   <BusinessObjects />
-=======
-  <LinkBusinessObjects>
-    <DynamicLinkBusinessObject>
-      <Target>CompileAndPackage</Target>
-      <Caption>销售管理</Caption>
-      <Name>23</Name>
-      <ComponentPath>XSYFX_3c2efeac</ComponentPath>
-    </DynamicLinkBusinessObject>
-  </LinkBusinessObjects>
-  <BusinessObjects>
-    <BusinessObject Target="CompileAndPackage" Id="3062fb33-4935-4d70-8579-bfeb53df0c47" Status="Updated" ComponentPath="XSYFX_3c2efeac\3062fb33-4935-4d70-8579-bfeb53df0c47.dym" Type="Meta">3062fb33-4935-4d70-8579-bfeb53df0c47.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="4c1da6fa-227e-4eb3-9aab-33314e642c66" Status="Updated" ComponentPath="XSYFX_3c2efeac\4c1da6fa-227e-4eb3-9aab-33314e642c66.dym" Type="Meta">4c1da6fa-227e-4eb3-9aab-33314e642c66.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="4e08b089-3565-4117-b2c9-7462cdb2c44e" Status="Updated" ComponentPath="XSYFX_3c2efeac\4e08b089-3565-4117-b2c9-7462cdb2c44e.dym" Type="Meta">4e08b089-3565-4117-b2c9-7462cdb2c44e.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5" Status="Updated" ComponentPath="XSYFX_3c2efeac\d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5.dym" Type="Meta">d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="d7d65998-1c31-406c-b4b5-c448aed51772" Status="Updated" ComponentPath="XSYFX_3c2efeac\d7d65998-1c31-406c-b4b5-c448aed51772.dym" Type="Meta">d7d65998-1c31-406c-b4b5-c448aed51772.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="de6a09e0-ef43-4ce0-94e1-51142dd27704" Status="Updated" ComponentPath="XSYFX_3c2efeac\de6a09e0-ef43-4ce0-94e1-51142dd27704.dym" Type="Meta">de6a09e0-ef43-4ce0-94e1-51142dd27704.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="f969b8d9-25a2-428b-9741-d454628d9ae8" Status="Updated" ComponentPath="XSYFX_3c2efeac\f969b8d9-25a2-428b-9741-d454628d9ae8.dym" Type="Meta">f969b8d9-25a2-428b-9741-d454628d9ae8.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="k2136fc96a4894e4a99a40ec69b8e2e62" Status="Updated" ComponentPath="XSYFX_3c2efeac\k2136fc96a4894e4a99a40ec69b8e2e62.dym" Type="Meta">k2136fc96a4894e4a99a40ec69b8e2e62.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="qaz_ChangeReceiveDate" Status="Updated" ComponentPath="XSYFX_3c2efeac\qaz_ChangeReceiveDate.dym" Type="Meta">qaz_ChangeReceiveDate.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="qaz_outStock" Status="Updated" ComponentPath="XSYFX_3c2efeac\qaz_outStock.dym" Type="Meta">qaz_outStock.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="SAL_OUTSTOCK" Status="Updated" ComponentPath="XSYFX_3c2efeac\SAL_OUTSTOCK.dym" Type="Meta">SAL_OUTSTOCK.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="SAL_RETURNSTOCK" Status="Updated" ComponentPath="XSYFX_3c2efeac\SAL_RETURNSTOCK.dym" Type="Meta">SAL_RETURNSTOCK.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="3062fb33-4935-4d70-8579-bfeb53df0c47.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\3062fb33-4935-4d70-8579-bfeb53df0c47.2052.dymx" Type="LanguageRes">3062fb33-4935-4d70-8579-bfeb53df0c47.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="4c1da6fa-227e-4eb3-9aab-33314e642c66.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\4c1da6fa-227e-4eb3-9aab-33314e642c66.2052.dymx" Type="LanguageRes">4c1da6fa-227e-4eb3-9aab-33314e642c66.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="4e08b089-3565-4117-b2c9-7462cdb2c44e.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\4e08b089-3565-4117-b2c9-7462cdb2c44e.2052.dymx" Type="LanguageRes">4e08b089-3565-4117-b2c9-7462cdb2c44e.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5.2052.dymx" Type="LanguageRes">d7c2bbb9-ae27-4aac-bc03-199f8ec7dfc5.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="d7d65998-1c31-406c-b4b5-c448aed51772.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\d7d65998-1c31-406c-b4b5-c448aed51772.2052.dymx" Type="LanguageRes">d7d65998-1c31-406c-b4b5-c448aed51772.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="de6a09e0-ef43-4ce0-94e1-51142dd27704.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\de6a09e0-ef43-4ce0-94e1-51142dd27704.2052.dymx" Type="LanguageRes">de6a09e0-ef43-4ce0-94e1-51142dd27704.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="f969b8d9-25a2-428b-9741-d454628d9ae8.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\f969b8d9-25a2-428b-9741-d454628d9ae8.2052.dymx" Type="LanguageRes">f969b8d9-25a2-428b-9741-d454628d9ae8.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="k2136fc96a4894e4a99a40ec69b8e2e62.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\k2136fc96a4894e4a99a40ec69b8e2e62.2052.dymx" Type="LanguageRes">k2136fc96a4894e4a99a40ec69b8e2e62.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="qaz_ChangeReceiveDate.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\qaz_ChangeReceiveDate.2052.dymx" Type="LanguageRes">qaz_ChangeReceiveDate.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="qaz_outStock.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\qaz_outStock.2052.dymx" Type="LanguageRes">qaz_outStock.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="SAL_OUTSTOCK.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\SAL_OUTSTOCK.2052.dymx" Type="LanguageRes">SAL_OUTSTOCK.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="SAL_RETURNSTOCK.2052" Status="Updated" ComponentPath="XSYFX_3c2efeac\SAL_RETURNSTOCK.2052.dymx" Type="LanguageRes">SAL_RETURNSTOCK.2052.dymx</BusinessObject>
-  </BusinessObjects>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
   <ResourceObject>
     <ResourceObject Target="CompileAndPackage" Id="qaz_OutStockToReceiveDateChange.cv" Status="Updated" ComponentPath="ResourceObject\qaz_OutStockToReceiveDateChange.cv" Type="ConvertRule">销售出库单下推签收日期变更单<SubComponentPaths /></ResourceObject>
   </ResourceObject>

DataModel_27ddc008-7442-4b63-9aaf-917bd9f7b4e0/BOS.pkgdef

@@ -39,26 +39,7 @@
       <ComponentPath>FrameWork_4485d301</ComponentPath>
     </DynamicLinkBusinessObject>
   </LinkBusinessObjects>
-<<<<<<< HEAD
   <BusinessObjects />
-=======
-  <BusinessObjects>
-    <BusinessObject Target="CompileAndPackage" Id="7ec6b3f9-fd4a-4b42-8230-851466cbbebb" Status="Updated" ComponentPath="FrameWork_4485d301\7ec6b3f9-fd4a-4b42-8230-851466cbbebb.dym" Type="Meta">7ec6b3f9-fd4a-4b42-8230-851466cbbebb.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="ab7c96d0-8ce5-4340-b56d-6206b52bd9d7" Status="Updated" ComponentPath="FrameWork_4485d301\ab7c96d0-8ce5-4340-b56d-6206b52bd9d7.dym" Type="Meta">ab7c96d0-8ce5-4340-b56d-6206b52bd9d7.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BD_AuxPtyValue_Select" Status="Updated" ComponentPath="FrameWork_4485d301\BD_AuxPtyValue_Select.dym" Type="Meta">BD_AuxPtyValue_Select.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BD_AuxPty_Select" Status="Updated" ComponentPath="FrameWork_4485d301\BD_AuxPty_Select.dym" Type="Meta">BD_AuxPty_Select.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_ASSISTANTDATA_DETAIL" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_ASSISTANTDATA_DETAIL.dym" Type="Meta">BOS_ASSISTANTDATA_DETAIL.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_ASSISTANTDATA_SELECT" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_ASSISTANTDATA_SELECT.dym" Type="Meta">BOS_ASSISTANTDATA_SELECT.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_FORMGROUP" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_FORMGROUP.dym" Type="Meta">BOS_FORMGROUP.dym</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="7ec6b3f9-fd4a-4b42-8230-851466cbbebb.2052" Status="Updated" ComponentPath="FrameWork_4485d301\7ec6b3f9-fd4a-4b42-8230-851466cbbebb.2052.dymx" Type="LanguageRes">7ec6b3f9-fd4a-4b42-8230-851466cbbebb.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="ab7c96d0-8ce5-4340-b56d-6206b52bd9d7.2052" Status="Updated" ComponentPath="FrameWork_4485d301\ab7c96d0-8ce5-4340-b56d-6206b52bd9d7.2052.dymx" Type="LanguageRes">ab7c96d0-8ce5-4340-b56d-6206b52bd9d7.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BD_AuxPtyValue_Select.2052" Status="Updated" ComponentPath="FrameWork_4485d301\BD_AuxPtyValue_Select.2052.dymx" Type="LanguageRes">BD_AuxPtyValue_Select.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BD_AuxPty_Select.2052" Status="Updated" ComponentPath="FrameWork_4485d301\BD_AuxPty_Select.2052.dymx" Type="LanguageRes">BD_AuxPty_Select.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_ASSISTANTDATA_DETAIL.2052" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_ASSISTANTDATA_DETAIL.2052.dymx" Type="LanguageRes">BOS_ASSISTANTDATA_DETAIL.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_ASSISTANTDATA_SELECT.2052" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_ASSISTANTDATA_SELECT.2052.dymx" Type="LanguageRes">BOS_ASSISTANTDATA_SELECT.2052.dymx</BusinessObject>
-    <BusinessObject Target="CompileAndPackage" Id="BOS_FORMGROUP.2052" Status="Updated" ComponentPath="FrameWork_4485d301\BOS_FORMGROUP.2052.dymx" Type="LanguageRes">BOS_FORMGROUP.2052.dymx</BusinessObject>
-  </BusinessObjects>
->>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
   <ResourceObject />
   <StartScript>
     <SchemaScript Seq="0">

KD-Composite-Package.pkgdef

+<?xml version="1.0" encoding="utf-8"?>
+<CompositePackage xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <Id>c2040676-80f3-446d-93f5-aebcaa2018ef</Id>
+  <MasterId>K3Cloud</MasterId>
+  <Name>商业条款和逾期账龄(基础管理)</Name>
+  <Developer>
+    <Id>IJCF-EGLJ-QKRT-ZENJ-SCXH</Id>
+    <DevCode>qaz</DevCode>
+    <Level>1</Level>
+    <Name>qaz</Name>
+  </Developer>
+  <RequiredPackages />
+  <ExclusivePackages />
+  <IsSuperPkg>false</IsSuperPkg>
+  <IncludedExtended>false</IncludedExtended>
+  <DevPhase>Unknown</DevPhase>
+  <CanBeStopped>false</CanBeStopped>
+  <DeployEdition>ALL</DeployEdition>
+  <PatchType>ALL</PatchType>
+  <Deploy>Business</Deploy>
+  <PackageCategory>FuncPackage</PackageCategory>
+  <IsReplace>true</IsReplace>
+  <LocaleId>0</LocaleId>
+  <Issues />
+  <Links />
+  <PreInstallMsg />
+  <AfterInstallMsg />
+  <ChildPkgDefs>
+    <ChildExtPkgItem>
+      <Target>CompileAndPackage</Target>
+      <OutDir>AM</OutDir>
+      <Seq>0</Seq>
+      <Name>Assembly Package</Name>
+      <ComponentPath>Code\app.pkgdef</ComponentPath>
+      <Type>AssemblyModel</Type>
+    </ChildExtPkgItem>
+    <ChildExtPkgItem>
+      <Target>CompileAndPackage</Target>
+      <OutDir>DM</OutDir>
+      <Seq>0</Seq>
+      <Name>MetaData Package</Name>
+      <ComponentPath>DataModel\meta.pkgdef</ComponentPath>
+      <Type>DataModel</Type>
+    </ChildExtPkgItem>
+    <ChildExtPkgItem>
+      <Target>CompileAndPackage</Target>
+      <OutDir>供应链</OutDir>
+      <Seq>0</Seq>
+      <Name>供应链</Name>
+      <ComponentPath>DataModel_20\供应链.pkgdef</ComponentPath>
+      <Type>DataModel</Type>
+    </ChildExtPkgItem>
+    <ChildExtPkgItem>
+      <Target>CompileAndPackage</Target>
+      <OutDir>生产制造</OutDir>
+      <Seq>0</Seq>
+      <Name>生产制造</Name>
+      <ComponentPath>DataModel_30\生产制造.pkgdef</ComponentPath>
+      <Type>DataModel</Type>
+    </ChildExtPkgItem>
+  </ChildPkgDefs>
+  <LinkPkgDefs />
+  <Children />
+  <Resources />
+  <InstallPlugIns />
+  <ChildPkgIds />
+</CompositePackage>
\ No newline at end of file