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

xj qian

2024-07-01 d013a35ef5bb3b45b46362c67d6f3ca52a54e96d

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

 jrj/ext-jrj/ext-jrj.vcxproj

@@ -254,6 +254,21 @@
    <ClCompile Include="..\project\business\GDN3.maint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNDelay.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNSourcePriceMaint.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\select.item.po.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\project\business\HR\AdministrativeDepartment.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>

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

@@ -73,6 +73,9 @@
    <Filter Include="project\business\Supplier">
      <UniqueIdentifier>{411fad96-7418-4b98-8e36-3f9893659ea1}</UniqueIdentifier>
    </Filter>
    <Filter Include="project\business\GDN">
      <UniqueIdentifier>{1d8cf000-b4e6-4f4c-931c-fb1eddc22430}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="framework.h">
@@ -482,5 +485,20 @@
    <ClCompile Include="..\project\business\Supplier\SupplierSource.cpp">
      <Filter>project\business\Supplier</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNDelay.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNSourcePaperCard.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\SelectItem.New.GDN.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\GDNSourcePriceMaint.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
    <ClCompile Include="..\project\business\GDN\select.item.po.cpp">
      <Filter>project\business\GDN</Filter>
    </ClCompile>
  </ItemGroup>
</Project>

 jrj/project/business/GDN/GDNDelay.cpp

Binary files differ

 jrj/project/business/GDN/GDNSourcePaperCard.cpp

Binary files differ

 jrj/project/business/GDN/GDNSourcePriceMaint.cpp

Binary files differ

 jrj/project/business/GDN/SelectItem.New.GDN.cpp

Binary files differ

 jrj/project/business/GDN/select.item.po.cpp

Binary files differ

 jrj/project/business/SO/Product.Select.SO.cpp

@@ -672,7 +672,7 @@
            dw_list.Redraw();
            impStr = L"";

            SendMessageW(hObject, 0x401, ls_nos, 0);
            SendMessage(hObject, 0x401, ls_nos, 0);
            alert(L"转入完成!");
            return 1;
        }
@@ -833,7 +833,7 @@
            }
            else if (comdid == L"xmRertieve")
            {
                int hItem1 = tv_folder.GetSelectedItem();
                HTREEITEM hItem1 = tv_folder.GetSelectedItem();
                KXMLDOMElement e2 = tv_folder.GetItemData(hItem1);
                xstring no1 = e2.getAttribute(L"no");
                xml x2 = vcontrol::RetrieveData(L"/sale/data/SO/goods/usergoods/listex1", L"parent", no1);

 jrj/project/business/Supplier/SupplierSource.cpp

Binary files differ

 jrj/project/business/Supplier/list.Owner.Supplier.cpp

Binary files differ

 jrj/project/business/Supplier/maint.Document.SupplierEx.cpp

Binary files differ

 jrj/project/business/Supplier/maint.Owner.Supplier.cpp

Binary files differ

 jrj/project/business/Supplier/maintex.Owner.Supplier.cpp

Binary files differ