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

Code/LF.K3.SCM.BusinessPlugin/LF.K3.SCM.BusinessPlugin/DynamicForm.BomTree1.cs

@@ -348,27 +348,38 @@ public class BomTree1 : AbstractMFGDynamicFormPlugIn
     {
         BomTreeDatasMger.ToTreeNodeObject();
         string id = BomTreeDatasMger.RootNode.children.First().id;
-
         string txt = BomTreeDatasMger.RootNode.children.First().text;
-        var strarry = txt.Split('*');
+        var parameterDate = this.Model.ParameterData;//获取  物料清单-树形维护用户参数
+        char SplitStr = Convert.ToChar(parameterDate["SplitCode"]);
+        var strarry = txt.Split(SplitStr);
         string number = "";
+        string sqlParameter = "";
         if (strarry.Length > 0)
         {
             number = strarry[0];
 
+            var IsBomId = parameterDate["BomId"].ToString();
+            if (IsBomId == "True")//BOM版本是否勾选
+            {
+                sqlParameter = $@"where FNUMBER='{number}'";
+            }
+            else
+            {
+                sqlParameter = $@"where wlnumber='{number}'";
+            }
         }
         if (number != "")
         {
 
 
-            string sql = $@"/*dialect*//*dialect*/with stepCTE AS ( 
+            string sql = $@"/*dialect*/with stepCTE AS ( 
 select b.FMATERIALID as 父项物料, a.FMATERIALID as 子项物料,a.FID 父项BOMID,a.FENTRYID 子项ID,b.TreeValue 父项名称,b.wlnumber,(ma.FNUMBER+'*'+mc.FNAME) 子项名称,
 1 AS Lev  from T_ENG_BOMCHILD a inner join 
 ( select * from
 (select (wl.FNUMBER+'*'+wlmc.FNAME) TreeValue,wl.FNUMBER as wlnumber,bom.* from T_ENG_BOM bom 
 left join T_BD_MATERIAL wl on bom.FMATERIALID=wl.FMATERIALID
 left join T_BD_MATERIAL_l wlmc on wl.FMATERIALID=wlmc.FMATERIALID and bom.FMATERIALID=wlmc.FMATERIALID) 
-as T0  where wlnumber='{number}') b on a.FID=b.FID 
+as T0  {sqlParameter}) b on a.FID=b.FID 
 inner join T_BD_MATERIAL ma on a.FMATERIALID=ma.FMATERIALID 
 inner join T_BD_MATERIAL_L mc on a.FMATERIALID=mc.FMATERIALID 
 union all
@@ -496,7 +507,22 @@ left join T_BD_MATERIAL_L l on stepCTE.子项物料=l.FMATERIALID   ";
     }
     private void WalkNode1(TreeNode treeNodeLst, Dictionary<string, List<ChirdNode>> all, Dictionary<string, List<ChirdNode>> Examine, Dictionary<string, List<ChirdNode>> Disable, HashSet<string> hs)
     {
-        var txt = treeNodeLst.text.Split('*')[0];
+        var txt = "";
+        var parameterDate = this.Model.ParameterData;//获取  物料清单-树形维护用户参数
+        char SplitStr = Convert.ToChar(parameterDate["SplitCode"]);
+        var strarry = treeNodeLst.text.Split(SplitStr);
+        if (strarry.Length > 0)
+        {
+            var IsBomId = parameterDate["BomId"].ToString();
+            if (IsBomId == "True")//BOM版本是否勾选
+            {
+                txt = strarry[1];
+            }
+            else
+            {
+                txt = strarry[0];
+            }
+        }
         if (Examine.ContainsKey(txt))
         {
             treeNodeLst.Forecolor = "#0000FF";

DataModel_60/基础管理.pkgdef

-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <DataModel xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Id>adfbe505-1958-45f0-8b35-1055a55e2944</Id>
-  <MasterId>adfbe505-1958-45f0-8b35-1055a55e2944</MasterId>
+  <Id>8571b1a2-a2d6-4b17-abc1-9201a088bf34</Id>
+  <MasterId>8571b1a2-a2d6-4b17-abc1-9201a088bf34</MasterId>
   <Name>基础管理</Name>
   <Developer>
     <Id>IJCF-EGLJ-QKRT-ZENJ-SCXH</Id>
@@ -15,6 +15,7 @@
   <DevPhase>Unknown</DevPhase>
   <CanBeStopped>false</CanBeStopped>
   <DeployEdition>ALL</DeployEdition>
+  <PatchType>ALL</PatchType>
   <Deploy>Business</Deploy>
   <PackageCategory>FuncPackage</PackageCategory>
   <IsReplace>true</IsReplace>

KD-Composite-Package.pkgdef

 <?xml version="1.0" encoding="utf-8"?>
-<CompositePackage xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<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>
@@ -60,14 +60,6 @@
     </ChildExtPkgItem>
     <ChildExtPkgItem>
       <Target>CompileAndPackage</Target>
-      <OutDir>BOS</OutDir>
-      <Seq>0</Seq>
-      <Name>BOS</Name>
-      <ComponentPath>\BOS.pkgdef</ComponentPath>
-      <Type>DataModel</Type>
-    </ChildExtPkgItem>
-    <ChildExtPkgItem>
-      <Target>CompileAndPackage</Target>
       <OutDir>财务会计</OutDir>
       <Seq>0</Seq>
       <Name>财务会计</Name>