Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2024-07-19 539130eff1bc899ec8dcdb312d5b5b2bec402bd2

Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -605,6 +605,8 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\list.SOTrace3.cpp" />
    <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp" />
    <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp" />
    <ClCompile Include="..\project\business\GDN\po.paper.cpp" />
    <ClCompile Include="..\project\business\GDN\select.item.po.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>

 jrj/ext-jrj/ext-jrj.vcxproj.filters

@@ -1130,5 +1130,11 @@
    <ClCompile Include="..\project\business\Quote\Product.Select.cpp">
      <Filter>project\business\Quote</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\listex.GDN3.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\maintex.gdn3.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
  </ItemGroup>
</Project>

 jrj/project/business/GDN/GDNDelay.cpp

Binary files differ

 jrj/project/business/GDN/listex.GDN3.cpp

Binary files differ

 jrj/project/business/GDN/maintex.gdn3.cpp

Binary files differ

 jrj/project/business/GDN3.list.cpp

@@ -433,7 +433,7 @@
            xstring EntityIDEx = dw_list.GetGuid(dw_list.GetRow());
            xaserverarg argEx;
            
            alert(EntityIDEx);
            //alert(EntityIDEx);
            argEx.AddArg(L"GDNID", EntityIDEx);
            OpenWindow(L"dev:xpage[GDNDelay.vx]", argEx);
            return 1;

 jrj/project/business/PO/business4.cpp

Binary files differ