Skip to content

L
leifei
提交 50604900 authored 作者: 彭寒菲's avatar 彭寒菲
浏览文件
操作

Merge branch 'master' of http://192.168.2.95:8090/phf/leifei

# Conflicts: # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/BOMTaskEditionServer.cs # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/LF.K3.SCM.AppServerPlugin.csproj # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/SaveLeifeiMaterial/SaveMaterialChanges.cs # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/GGReplaceModel.cs # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin.csproj # Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/TreeColorExpress.cs # DataModel/Start/BasicData/SimpleData/a8032de8-5be4-4d20-b0fd-8bef14090835.sql # DataModel/meta.pkgdef # DataModel_1/财务会计.pkgdef # DataModel_20/供应链.pkgdef # DataModel_27ddc008-7442-4b63-9aaf-917bd9f7b4e0/BOS.pkgdef # DataModel_30/ENG_696934ac/c3a978f7-516f-4308-b65f-9f904b31c52e.2052.dymx # DataModel_30/ENG_696934ac/c3a978f7-516f-4308-b65f-9f904b31c52e.dym # KD-Composite-Package.pkgdef
上级 4058d902 71993e9f
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 127 行增加 和 70 行删除
Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/BOMTaskEditionServer.cs
浏览文件 @ 50604900
......@@ -12,7 +12,11 @@ using System.Text;
namespace LF.K3.SCM.AppServerPlugin
{
<<<<<<< HEAD
[Description("磊飞任务表保存插件，已作废")]
=======
[Description("磊飞任务表保存插件")]
>>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
[HotUpdate]
public class BOMTaskEditionServer : AbstractOperationServicePlugIn
{
......
Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.AppServerPlugin/LF.K3.SCM.AppServerPlugin.csproj
浏览文件 @ 50604900
......@@ -9,7 +9,11 @@
<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 />
......@@ -86,7 +90,10 @@
</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
浏览文件 @ 50604900
......@@ -236,7 +236,11 @@ 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/GGReplaceModel.cs
浏览文件 @ 50604900
......@@ -22,7 +22,11 @@ using System.Transactions;
namespace LF.K3.SCM.BusinessPlugin
{
<<<<<<< HEAD
[Description("打开物料替换弹出框")]
=======
[Description("打开物料替换弹出框")]
>>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
[HotUpdate]
public class GGReplaceModel : AbstractDynamicFormPlugIn
{
......
Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin.csproj
浏览文件 @ 50604900
......@@ -9,7 +9,11 @@
<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 />
......
Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/TreeColorExpress.cs
浏览文件 @ 50604900
......@@ -12,7 +12,11 @@ using System.Text;
namespace LF.K3.SCM.BusinessPlugin
{
<<<<<<< HEAD
[Description("树形颜色标识,已作废")]
=======
[Description("树形颜色标识")]
>>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
[HotUpdate]
public class TreeColorExpress : AbstractMFGDynamicFormPlugIn
{
......
DataModel/Start/BasicData/SimpleData/a8032de8-5be4-4d20-b0fd-8bef14090835.sql
浏览文件 @ 50604900
......@@ -107,4 +107,7 @@ INSERT INTO T_BAS_ASSISTANTDATAENTRY_L(FPKID,FENTRYID,FLOCALEID,FDATAVALUE,FDESC
<<<<<<< HEAD
=======
>>>>>>> 71993e9f1f1a6152ccc681f643bd453648debc9e
DataModel/meta.pkgdef
浏览文件 @ 50604900
差异被折叠。
DataModel_1/Start/BasicData/SimpleData/8_subsystem.sql 0 → 100644
浏览文件 @ 50604900
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
浏览文件 @ 50604900
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
......@@ -31,15 +31,42 @@
<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
浏览文件 @ 50604900
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
......@@ -31,8 +31,45 @@
<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
浏览文件 @ 50604900
......@@ -39,7 +39,26 @@
<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 deleted 100644 → 0
浏览文件 @ 4058d902
<?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>BOS</OutDir>
<Seq>0</Seq>
<Name>BOS</Name>
<ComponentPath>DataModel_27ddc008-7442-4b63-9aaf-917bd9f7b4e0\BOS.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
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论