update

xj qian

2024-10-29 c84977748c4c83a0ba5587196e571065b4f1fef9

update

 jrj/ext-jrj/JArgument.cpp

对比新文件
@@ -0,0 +1 @@
#include "JArgument.hpp"

 jrj/ext-jrj/JArgument.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include <JObject.hpp>

class JArgument : public JObject
{
};


 jrj/ext-jrj/JBinaryOp.cpp

对比新文件
@@ -0,0 +1 @@
#include "JBinaryOp.hpp"

 jrj/ext-jrj/JBinaryOp.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include "JObject.hpp"
class JBinaryOp :
    public JObject
{
};


 jrj/ext-jrj/JField.cpp

对比新文件
@@ -0,0 +1 @@
#include "JField.hpp"

 jrj/ext-jrj/JField.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include <JObject.hpp>
class JField :
    public JObject
{
};


 jrj/ext-jrj/JLiteral.cpp

对比新文件
@@ -0,0 +1 @@
#include "JLiteral.hpp"

 jrj/ext-jrj/JLiteral.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include <JObject.hpp>
class JLiteral :
    public JObject
{
};


 jrj/ext-jrj/JMethod.cpp

对比新文件
@@ -0,0 +1 @@
#include "JMethod.hpp"

 jrj/ext-jrj/JMethod.hpp

对比新文件
@@ -0,0 +1,6 @@
#pragma once
#include <JObject.hpp>
class JMethod : public JObject
{
};


 jrj/ext-jrj/JModule.cpp

对比新文件
@@ -0,0 +1 @@
#include "JModule.hpp"

 jrj/ext-jrj/JModule.hpp

对比新文件
@@ -0,0 +1,20 @@
#pragma once
#include <JObject.hpp>
#include <JString.hpp>
class JModule :
    public JObject
{
public:
    bool AddModule(JModule* _module);
    bool AddNameSpace(JObject* _ns);
    bool AddMethod(JObject* _method);
    bool AddType(JObject* _type);
    bool AddInterface(JObject* _interface);
    bool AddConst(JObject* _const);
    bool AddTag(JObject* _tag);
    bool AddField(JObject* _field);
public:
    JString toString();
    JString toXml();
};


 jrj/ext-jrj/JParam.cpp

对比新文件
@@ -0,0 +1 @@
#include "JParam.hpp"

 jrj/ext-jrj/JParam.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include <JObject.hpp>
class JParam :
    public JObject
{
};


 jrj/ext-jrj/JType.cpp

对比新文件
@@ -0,0 +1 @@
#include "JType.hpp"

 jrj/ext-jrj/JType.hpp

对比新文件
@@ -0,0 +1,16 @@
#pragma once
#include <JObject.hpp>
#include <JString.hpp>
class JType :
    public JObject
{
public:
    bool AddMethod(JObject* _method);
    bool AddProp(JObject* _field);
    bool AddConst(JObject* _const);
    bool AddApply(JObject* _apply);
public:
    JString toString();
    JString toXml();
};


 jrj/ext-jrj/JValue.cpp

对比新文件
@@ -0,0 +1 @@
#include "JValue.hpp"

 jrj/ext-jrj/JValue.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include <JObject.hpp>
class JValue :
    public JObject
{
};


 jrj/ext-jrj/JVariant.cpp

对比新文件
@@ -0,0 +1 @@
#include "JVariant.hpp"

 jrj/ext-jrj/JVariant.hpp

对比新文件
@@ -0,0 +1,7 @@
#pragma once
#include "jobject.hpp"
class JVariant :
    public JObject
{
};


 jrj/ext-jrj/ext-jrj.vcxproj

@@ -269,14 +269,24 @@
    <ClInclude Include="..\xframe\xcontrol\xtreeview.hpp" />
    <ClInclude Include="framework.h" />
    <ClInclude Include="JAlloc.hpp" />
    <ClInclude Include="JArgument.hpp" />
    <ClInclude Include="JBinaryOp.hpp" />
    <ClInclude Include="JFactory.hpp" />
    <ClInclude Include="JFactoryStringImpl.h" />
    <ClInclude Include="JField.hpp" />
    <ClInclude Include="JGui.hpp" />
    <ClInclude Include="JItemAlloc.hpp" />
    <ClInclude Include="JLang.hpp" />
    <ClInclude Include="JLiteral.hpp" />
    <ClInclude Include="JMethod.hpp" />
    <ClInclude Include="JModule.hpp" />
    <ClInclude Include="JParam.hpp" />
    <ClInclude Include="JPlatform.hpp" />
    <ClInclude Include="JPtr.hpp" />
    <ClInclude Include="JScript.hpp" />
    <ClInclude Include="JType.hpp" />
    <ClInclude Include="JValue.hpp" />
    <ClInclude Include="JVariant.hpp" />
    <ClInclude Include="pch.h" />
  </ItemGroup>
  <ItemGroup>
@@ -1147,13 +1157,23 @@
    <ClCompile Include="..\xframe\src\xstring.cpp" />
    <ClCompile Include="dllmain.cpp" />
    <ClCompile Include="JAllocImpl.cpp" />
    <ClCompile Include="JArgument.cpp" />
    <ClCompile Include="JBinaryOp.cpp" />
    <ClCompile Include="JFactoryStringImpl.cpp" />
    <ClCompile Include="JField.cpp" />
    <ClCompile Include="JGuiImpl.cpp" />
    <ClCompile Include="JItemAlloc.cpp" />
    <ClCompile Include="JLang.cpp" />
    <ClCompile Include="JLiteral.cpp" />
    <ClCompile Include="JMethod.cpp" />
    <ClCompile Include="JModule.cpp" />
    <ClCompile Include="JParam.cpp" />
    <ClCompile Include="JPlatform.cpp" />
    <ClCompile Include="JPtr.cpp" />
    <ClCompile Include="JScript.cpp" />
    <ClCompile Include="JType.cpp" />
    <ClCompile Include="JValue.cpp" />
    <ClCompile Include="JVariant.cpp" />
    <ClCompile Include="pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

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

@@ -136,6 +136,9 @@
    <Filter Include="jarch.impl">
      <UniqueIdentifier>{4d691658-8fdc-4c09-8cfa-d8fa62419ef3}</UniqueIdentifier>
    </Filter>
    <Filter Include="jarch\module">
      <UniqueIdentifier>{ee1bdbb1-df9a-4db8-8212-b40535f8b9e9}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="framework.h">
@@ -470,6 +473,36 @@
    </ClInclude>
    <ClInclude Include="..\xframe\xcontrol\xsedit.hpp">
      <Filter>xframe\xcontrol</Filter>
    </ClInclude>
    <ClInclude Include="JModule.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JType.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JArgument.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JField.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JMethod.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JParam.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JValue.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JLiteral.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JBinaryOp.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
    <ClInclude Include="JVariant.hpp">
      <Filter>jarch\module</Filter>
    </ClInclude>
  </ItemGroup>
  <ItemGroup>
@@ -1439,6 +1472,36 @@
    <ClCompile Include="..\project\business\PO\paymentmethod.cpp">
      <Filter>project\business\PO</Filter>
    </ClCompile>
    <ClCompile Include="JModule.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JType.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JArgument.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JField.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JMethod.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JParam.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JValue.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JLiteral.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JBinaryOp.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
    <ClCompile Include="JVariant.cpp">
      <Filter>jarch\module</Filter>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="ext-jrj.def">

 jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp

Binary files differ

 jrj/project/business/ProductSample/SampleBarcodePrint.cpp

Binary files differ

 jrj/project/business/ProductSample/outstore.Sample3.cpp

Binary files differ

 jrj/project/business/QuoteFile.cpp

@@ -2953,7 +2953,7 @@
        trace(L"\r\n----row:" + xstring(row) + L"--col:" + xstring(col));
        trace(L"\r\n----row:" + xstring(row) + L"--col:" + xstring(col));
        trace(L"\r\n--value:" + dw_cell.GetItemString(row, col) + L"--orig:" + orivalue);
        if (row == ARow && col == ACol && dw_cell.GetItemString(row, col) == orivalue) return 1;
        //if (row == ARow && col == ACol && dw_cell.GetItemString(row, col) == orivalue) return 1;
        trace(L"\r\n--enter:");

        ARow = row;