From c84977748c4c83a0ba5587196e571065b4f1fef9 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 29 十月 2024 16:59:13 +0800
Subject: [PATCH] update
---
jrj/ext-jrj/JVariant.hpp | 7 +
jrj/ext-jrj/JType.cpp | 1
jrj/ext-jrj/JParam.hpp | 7 +
jrj/ext-jrj/JBinaryOp.cpp | 1
jrj/ext-jrj/JVariant.cpp | 1
jrj/ext-jrj/JType.hpp | 16 ++++
jrj/ext-jrj/JField.hpp | 7 +
jrj/ext-jrj/ext-jrj.vcxproj.filters | 63 +++++++++++++++
jrj/project/business/ProductSample/SampleBarcodePrint.cpp | 0
jrj/ext-jrj/JModule.cpp | 1
jrj/project/business/ProductSample/outstore.Sample3.cpp | 0
jrj/ext-jrj/JValue.cpp | 1
jrj/ext-jrj/JField.cpp | 1
jrj/ext-jrj/JValue.hpp | 7 +
jrj/project/business/QuoteFile.cpp | 2
jrj/ext-jrj/JModule.hpp | 20 +++++
jrj/ext-jrj/JMethod.cpp | 1
jrj/ext-jrj/JMethod.hpp | 6 +
jrj/ext-jrj/JArgument.hpp | 7 +
jrj/ext-jrj/JLiteral.cpp | 1
jrj/ext-jrj/JArgument.cpp | 1
jrj/ext-jrj/JLiteral.hpp | 7 +
jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp | 0
jrj/ext-jrj/JBinaryOp.hpp | 7 +
jrj/ext-jrj/JParam.cpp | 1
jrj/ext-jrj/ext-jrj.vcxproj | 20 +++++
26 files changed, 185 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/JArgument.cpp b/jrj/ext-jrj/JArgument.cpp
new file mode 100644
index 0000000..0761c80
--- /dev/null
+++ b/jrj/ext-jrj/JArgument.cpp
@@ -0,0 +1 @@
+#include "JArgument.hpp"
diff --git a/jrj/ext-jrj/JArgument.hpp b/jrj/ext-jrj/JArgument.hpp
new file mode 100644
index 0000000..72cbf33
--- /dev/null
+++ b/jrj/ext-jrj/JArgument.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <JObject.hpp>
+
+class JArgument : public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JBinaryOp.cpp b/jrj/ext-jrj/JBinaryOp.cpp
new file mode 100644
index 0000000..f610ded
--- /dev/null
+++ b/jrj/ext-jrj/JBinaryOp.cpp
@@ -0,0 +1 @@
+#include "JBinaryOp.hpp"
diff --git a/jrj/ext-jrj/JBinaryOp.hpp b/jrj/ext-jrj/JBinaryOp.hpp
new file mode 100644
index 0000000..5bb3d90
--- /dev/null
+++ b/jrj/ext-jrj/JBinaryOp.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include "JObject.hpp"
+class JBinaryOp :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JField.cpp b/jrj/ext-jrj/JField.cpp
new file mode 100644
index 0000000..914f13e
--- /dev/null
+++ b/jrj/ext-jrj/JField.cpp
@@ -0,0 +1 @@
+#include "JField.hpp"
diff --git a/jrj/ext-jrj/JField.hpp b/jrj/ext-jrj/JField.hpp
new file mode 100644
index 0000000..e3f5872
--- /dev/null
+++ b/jrj/ext-jrj/JField.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <JObject.hpp>
+class JField :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JLiteral.cpp b/jrj/ext-jrj/JLiteral.cpp
new file mode 100644
index 0000000..100ca9d
--- /dev/null
+++ b/jrj/ext-jrj/JLiteral.cpp
@@ -0,0 +1 @@
+#include "JLiteral.hpp"
diff --git a/jrj/ext-jrj/JLiteral.hpp b/jrj/ext-jrj/JLiteral.hpp
new file mode 100644
index 0000000..3eb75f4
--- /dev/null
+++ b/jrj/ext-jrj/JLiteral.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <JObject.hpp>
+class JLiteral :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JMethod.cpp b/jrj/ext-jrj/JMethod.cpp
new file mode 100644
index 0000000..b7c7607
--- /dev/null
+++ b/jrj/ext-jrj/JMethod.cpp
@@ -0,0 +1 @@
+#include "JMethod.hpp"
diff --git a/jrj/ext-jrj/JMethod.hpp b/jrj/ext-jrj/JMethod.hpp
new file mode 100644
index 0000000..041bb9a
--- /dev/null
+++ b/jrj/ext-jrj/JMethod.hpp
@@ -0,0 +1,6 @@
+#pragma once
+#include <JObject.hpp>
+class JMethod : public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JModule.cpp b/jrj/ext-jrj/JModule.cpp
new file mode 100644
index 0000000..26bccb5
--- /dev/null
+++ b/jrj/ext-jrj/JModule.cpp
@@ -0,0 +1 @@
+#include "JModule.hpp"
diff --git a/jrj/ext-jrj/JModule.hpp b/jrj/ext-jrj/JModule.hpp
new file mode 100644
index 0000000..ecf0329
--- /dev/null
+++ b/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();
+};
+
diff --git a/jrj/ext-jrj/JParam.cpp b/jrj/ext-jrj/JParam.cpp
new file mode 100644
index 0000000..f91dff2
--- /dev/null
+++ b/jrj/ext-jrj/JParam.cpp
@@ -0,0 +1 @@
+#include "JParam.hpp"
diff --git a/jrj/ext-jrj/JParam.hpp b/jrj/ext-jrj/JParam.hpp
new file mode 100644
index 0000000..7f39740
--- /dev/null
+++ b/jrj/ext-jrj/JParam.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <JObject.hpp>
+class JParam :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JType.cpp b/jrj/ext-jrj/JType.cpp
new file mode 100644
index 0000000..cb3a4da
--- /dev/null
+++ b/jrj/ext-jrj/JType.cpp
@@ -0,0 +1 @@
+#include "JType.hpp"
diff --git a/jrj/ext-jrj/JType.hpp b/jrj/ext-jrj/JType.hpp
new file mode 100644
index 0000000..35e5706
--- /dev/null
+++ b/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();
+};
+
diff --git a/jrj/ext-jrj/JValue.cpp b/jrj/ext-jrj/JValue.cpp
new file mode 100644
index 0000000..99ef988
--- /dev/null
+++ b/jrj/ext-jrj/JValue.cpp
@@ -0,0 +1 @@
+#include "JValue.hpp"
diff --git a/jrj/ext-jrj/JValue.hpp b/jrj/ext-jrj/JValue.hpp
new file mode 100644
index 0000000..459c42f
--- /dev/null
+++ b/jrj/ext-jrj/JValue.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include <JObject.hpp>
+class JValue :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/JVariant.cpp b/jrj/ext-jrj/JVariant.cpp
new file mode 100644
index 0000000..cd0563d
--- /dev/null
+++ b/jrj/ext-jrj/JVariant.cpp
@@ -0,0 +1 @@
+#include "JVariant.hpp"
diff --git a/jrj/ext-jrj/JVariant.hpp b/jrj/ext-jrj/JVariant.hpp
new file mode 100644
index 0000000..74225a9
--- /dev/null
+++ b/jrj/ext-jrj/JVariant.hpp
@@ -0,0 +1,7 @@
+#pragma once
+#include "jobject.hpp"
+class JVariant :
+ public JObject
+{
+};
+
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 7d78754..15dd1c5 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/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>
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj.filters b/jrj/ext-jrj/ext-jrj.vcxproj.filters
index 0f6abff..e08ed52 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj.filters
+++ b/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">
diff --git a/jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp b/jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp
index 43e6abb..98aacec 100644
--- a/jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp
+++ b/jrj/project/business/ProductSample/CheckOut.instore.Sample.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/SampleBarcodePrint.cpp b/jrj/project/business/ProductSample/SampleBarcodePrint.cpp
index b0f6e9b..5f249e3 100644
--- a/jrj/project/business/ProductSample/SampleBarcodePrint.cpp
+++ b/jrj/project/business/ProductSample/SampleBarcodePrint.cpp
Binary files differ
diff --git a/jrj/project/business/ProductSample/outstore.Sample3.cpp b/jrj/project/business/ProductSample/outstore.Sample3.cpp
index db4ae6f..0d705fb 100644
--- a/jrj/project/business/ProductSample/outstore.Sample3.cpp
+++ b/jrj/project/business/ProductSample/outstore.Sample3.cpp
Binary files differ
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index 8f048b2..c0fa286 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/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;
--
Gitblit v1.9.3