替换 Curtain.Framework.net4.dll 增加一维码打印格式

DK.Basics/InvoiceLayout/InvoiceLayout.csproj

@@ -76,8 +76,8 @@
     <ErrorReport>prompt</ErrorReport>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Framework">
-      <HintPath>..\..\DLL\Curtain.Framework.dll</HintPath>
+    <Reference Include="Curtain.Framework.net4">
+      <HintPath>..\..\DLL\Curtain.Framework.net4.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.VisualBasic.PowerPacks, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="System" />
@@ -281,6 +281,9 @@
       <Name>WFControls</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Connected Services\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>

DK.Client/Client.Controls/Layout/F_MST_012003.designer.cs

@@ -1319,7 +1319,7 @@
             this.Controls.Add(this.txtLogo);
             this.Controls.Add(this.txtInvoiceName);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.Margin = new System.Windows.Forms.Padding(5);
             this.Name = "F_MST_012003";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "";

DK.Client/Client.Controls/Layout/F_MST_012003.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="tsrOperate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
+    <value>17, 55</value>
   </metadata>
   <data name="lbxInvoice.PaperSize" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -159,7 +159,7 @@
 </value>
   </data>
   <metadata name="mnsInvoice.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>262, 17</value>
+    <value>17, 93</value>
   </metadata>
   <metadata name="ItemCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>

DK.Client/SAPDataModule/Hegii/F_SAP_HEGII_0103.cs

@@ -11,7 +11,7 @@ using System;
 using System.Reflection;
 using System.Windows.Forms;
 
-using Curtain.Core;
+using Curtain.Extension.ExObjectConvert;
 
 using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;

DK.Client/SAPDataModule/SAPDataModule.csproj

@@ -56,9 +56,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7301.20286, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

DK.Service/BarcodePrintService/BarcodePrintService.csproj

@@ -84,15 +84,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core">
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess">
       <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Curtain.Framework, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Framework.dll</HintPath>
+    <Reference Include="Curtain.Framework.net4">
+      <HintPath>..\..\DLL\Curtain.Framework.net4.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

DK.Service/CMNModuleService/CMNModuleService.csproj

@@ -74,15 +74,14 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7301.20286, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess">
       <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Curtain.Framework">
-      <HintPath>..\..\DLL\Curtain.Framework.dll</HintPath>
+    <Reference Include="Curtain.Framework.net4">
+      <HintPath>..\..\DLL\Curtain.Framework.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.Net.Sockets.net4">
       <HintPath>..\..\DLL\Curtain.Net.Sockets.net4.dll</HintPath>

DK.Service/CMNModuleService/PLCWorkLogic..cs

@@ -15,8 +15,8 @@ using System.Data;
 using System.Net.Sockets;
 using System.Text;
 
-using Curtain.Core;
 using Curtain.DataAccess;
+using Curtain.Extension.ExObjectConvert;
 using Curtain.Framework.Json;
 using Curtain.Net.Sockets.PLC;
 using Curtain.Net.Sockets.PLC.Model.Siemens;

DK.Service/InvoiceLayout/InvoiceLayout.csproj

@@ -53,8 +53,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Framework">
-      <HintPath>..\..\DLL\Curtain.Framework.dll</HintPath>
+    <Reference Include="Curtain.Framework.net4">
+      <HintPath>..\..\DLL\Curtain.Framework.net4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

DK.Service/InvoiceLayout/Items/TextItem.cs

@@ -1048,11 +1048,26 @@ namespace Dongke.WinForm.Controls.InvoiceLayout
                     ops.ImageHeight = LayoutCommon.MillimeterToPixelDpi(rectangleM.Height, graphics.DpiY);
                     ops.DpiX = graphics.DpiX;
                     ops.DpiY = graphics.DpiY;
-                    using (Image pic1 = OneDHelper.GetOneDImage(value.ToString(), ops))
-                    {
-                        graphics.DrawImage(pic1, rectangleM, ops.ImageRect, GraphicsUnit.Pixel);
-                    }
-                    return;
+                    //using (Image pic1 = OneDHelper.GetOneDImage(value.ToString(), ops))
+                    //{
+                    //    graphics.DrawImage(pic1, rectangleM, ops.ImageRect, GraphicsUnit.Pixel);
+                    //}
+					string vv = value + "";
+					if (vv.StartsWith("69"))
+					{
+						using (Image pic1 = OneDHelper.GetOneDImage(value.ToString(), ops, OneDFormat.EAN_13))
+						{
+							graphics.DrawImage(pic1, rectangleM, ops.ImageRect, GraphicsUnit.Pixel);
+						}
+					}
+					else
+					{
+						using (Image pic1 = OneDHelper.GetOneDImage(value.ToString(), ops))
+						{
+							graphics.DrawImage(pic1, rectangleM, ops.ImageRect, GraphicsUnit.Pixel);
+						}
+					}
+					return;
                 }
                 if (this._itemStyle == ItemStyle.QRCode)
                 {

DK.Service/PMModuleLogic/PMModuleLogic.csproj

@@ -79,9 +79,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7301.20286, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Curtain.Core.net4, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

DK.Service/PMModuleService/PMModuleService.csproj

@@ -74,8 +74,9 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core">
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess">
       <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>

DK.Service/ReportModuleLogic/ReportModuleLogic.csproj

@@ -74,8 +74,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core">
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess">
       <HintPath>..\..\DLL\Curtain.DataAccess.dll</HintPath>

DK.Service/SystemModuleLogic/SystemModuleLogic.cs

@@ -21,7 +21,7 @@ using System.Collections.Generic;
 using Dongke.IBOSS.PRD.Service.BarcodePrintService;
 using Curtain.Net.Sockets.PLC;
 using Curtain.Net.Sockets.PLC.Model.Siemens;
-using Curtain.Log;
+
 using static Dongke.IBOSS.PRD.Basics.BaseResources.Constant;
 
 namespace Dongke.IBOSS.PRD.Service.SystemModuleLogic

DK.Service/SystemModuleLogic/SystemModuleLogic.csproj

@@ -80,9 +80,8 @@
     <Compile Include="SystemModuleLogicPartial.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7301.20286, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.Net.Sockets.net4">
       <HintPath>..\..\DLL\Curtain.Net.Sockets.net4.dll</HintPath>

DLL/Curtain.Framework.xml → DLL/Curtain.Framework.net4.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <doc>
     <assembly>
-        <name>Curtain.Framework</name>
+        <name>Curtain.Framework.net4</name>
     </assembly>
     <members>
         <member name="T:Curtain.Framework.Framework.Async.AsyncFactory">
@@ -444,7 +444,7 @@
         </member>
         <member name="P:Curtain.Framework.Barcode.DrawingOptions.Margin">
             <summary>
-            一维码图片余白
+            图片余白
             </summary>
         </member>
         <member name="P:Curtain.Framework.Barcode.DrawingOptions.BackColor">
@@ -822,7 +822,7 @@
         </member>
         <member name="M:Curtain.Framework.Barcode.QRCode.QRCodeHelper.GetQRCodeImage(Curtain.Framework.Barcode.QRCode.QRCodeData,Curtain.Framework.Barcode.QRCode.QRCodeDrawingOptions)">
             <summary>
-            原始条码图片
+            条码图片
             </summary>
             <param name="data"></param>
             <param name="options"></param>
@@ -880,33 +880,37 @@
             Json工具类
             </summary>
         </member>
-        <member name="M:Curtain.Framework.Json.JsonHelper.FromObject(System.Object)">
+        <member name="M:Curtain.Framework.Json.JsonHelper.FromObject(System.Object,Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
             将指定的对象序列化成 JSON 数据
             </summary>
             <param name="obj">要序列化的对象</param>
+            <param name="jss">要序列化的设置</param>
             <returns>JSON</returns>
         </member>
-        <member name="M:Curtain.Framework.Json.JsonHelper.ToObject``1(System.String)">
+        <member name="M:Curtain.Framework.Json.JsonHelper.ToObject``1(System.String,Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
             将指定的 JSON 数据反序列化成指定对象。
             </summary>
             <typeparam name="T">对象类型</typeparam>
             <param name="json">JSON 数据</param>
+            <param name="jss">要序列化的设置</param>
             <returns>对象</returns>
         </member>
-        <member name="M:Curtain.Framework.Json.JsonHelper.ToJson(System.Object)">
+        <member name="M:Curtain.Framework.Json.JsonHelper.ToJson(System.Object,Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
             对象转Json字符串
             </summary>
             <param name="value"></param>
+            <param name="jss">要序列化的设置</param>
             <returns></returns>
         </member>
-        <member name="M:Curtain.Framework.Json.JsonHelper.ToObjectByJson``1(System.String)">
+        <member name="M:Curtain.Framework.Json.JsonHelper.ToObjectByJson``1(System.String,Newtonsoft.Json.JsonSerializerSettings)">
             <summary>
             Json字符串转成对象
             </summary>
             <param name="value"></param>
+            <param name="jss">要序列化的设置</param>
             <returns></returns>
         </member>
         <member name="T:Curtain.Framework.Zip.SevenZipSharpHelper">

IBOSS.PRD.sln

@@ -101,17 +101,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCF.WebHosting", "WCF.Servi
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DLL", "DLL", "{7B766D59-13AD-4258-B076-367DDA5BF5A1}"
 	ProjectSection(SolutionItems) = preProject
-		DLL\Curtain.Core.dll = DLL\Curtain.Core.dll
-		DLL\Curtain.Core.xml = DLL\Curtain.Core.xml
+		DLL\Curtain.Core.net4.dll = DLL\Curtain.Core.net4.dll
+		DLL\Curtain.Core.net4.xml = DLL\Curtain.Core.net4.xml
 		DLL\Curtain.DataAccess.dll = DLL\Curtain.DataAccess.dll
 		DLL\Curtain.DataAccess.xml = DLL\Curtain.DataAccess.xml
-		DLL\Curtain.Framework.dll = DLL\Curtain.Framework.dll
-		DLL\Curtain.Framework.xml = DLL\Curtain.Framework.xml
+		DLL\Curtain.Framework.net4.dll = DLL\Curtain.Framework.net4.dll
+		DLL\Curtain.Framework.net4.xml = DLL\Curtain.Framework.net4.xml
 		DLL\Curtain.Net.Sockets.dll = DLL\Curtain.Net.Sockets.dll
+		DLL\Curtain.Net.Sockets.net4.dll = DLL\Curtain.Net.Sockets.net4.dll
 		DLL\Curtain.Net.Sockets.xml = DLL\Curtain.Net.Sockets.xml
 		DLL\Newtonsoft.Json.dll = DLL\Newtonsoft.Json.dll
 		DLL\Newtonsoft.Json.xml = DLL\Newtonsoft.Json.xml
 		DLL\Oracle.ManagedDataAccess.dll = DLL\Oracle.ManagedDataAccess.dll
+		DLL\sapnco.dll = DLL\sapnco.dll
+		DLL\sapnco.dll.refresh = DLL\sapnco.dll.refresh
+		DLL\sapnco_utils.dll = DLL\sapnco_utils.dll
 		DLL\Utilities.dll = DLL\Utilities.dll
 		DLL\zxing.dll = DLL\zxing.dll
 		DLL\zxing.xml = DLL\zxing.xml

IBOSS.PRD/F_SYS_0202.cs

@@ -14,7 +14,7 @@ using System.Data;
 using System.Linq;
 using System.Reflection;
 using System.Windows.Forms;
-using Curtain.Helpers;
+
 using Dongke.IBOSS.PRD.Basics.BaseControls;
 using Dongke.IBOSS.PRD.Basics.BaseResources;
 using Dongke.IBOSS.PRD.Basics.DockPanel;

IBOSS.PRD/IBOSS.PRD.csproj

@@ -103,12 +103,11 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core">
-      <HintPath>..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
-    <Reference Include="Curtain.Framework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\DLL\Curtain.Framework.dll</HintPath>
+    <Reference Include="Curtain.Framework.net4">
+      <HintPath>..\DLL\Curtain.Framework.net4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

WCF.Service/WCF.Hosting/WCF.Hosting.csproj

@@ -124,9 +124,8 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7284.23729, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess, Version=1.1.7285.24561, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

WCF.Service/WCF.Services/PMModuleServiceNew.cs

@@ -13,7 +13,9 @@ using System.Collections.Generic;
 using System.Data;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
-using Curtain.Core;
+
+using Curtain.Extension.ExObjectConvert;
+
 using Dongke.IBOSS.PRD.Basics.Library;
 using Dongke.IBOSS.PRD.Service.PDAModuleLogic;
 using Dongke.IBOSS.PRD.Service.PMModuleService;

WCF.Service/WCF.Services/SAPDataService.cs

@@ -2,7 +2,9 @@
 using System;
 using System.ServiceModel;
 using System.ServiceModel.Activation;
-using Curtain.Core;
+
+using Curtain.Extension.ExObjectConvert;
+
 using Dongke.IBOSS.PRD.Service.BPMDataService;
 using Dongke.IBOSS.PRD.Service.SAPHegiiDataService;
 using Dongke.IBOSS.PRD.Service.WMSDataService;

WCF.Service/WCF.Services/WCF.Services.csproj

@@ -107,9 +107,8 @@
     <Compile Include="WCFTestSerice.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7283.30513, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

WCF.Service/WCF.WebHosting/Global.asax.cs

@@ -4,8 +4,9 @@ using System.ServiceModel.Activation;
 using System.Timers;
 using System.Web;
 using System.Web.Routing;
-using Curtain.Core;
+
 using Curtain.DataAccess;
+using Curtain.Extension.ExObjectConvert;
 using Curtain.Log;
 
 using Dongke.IBOSS.PRD.Basics.BaseResources;

WCF.Service/WCF.WebHosting/WCF.WebHosting.csproj

@@ -109,9 +109,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Curtain.Core, Version=1.1.7284.23729, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\DLL\Curtain.Core.dll</HintPath>
+    <Reference Include="Curtain.Core.net4">
+      <HintPath>..\..\DLL\Curtain.Core.net4.dll</HintPath>
     </Reference>
     <Reference Include="Curtain.DataAccess, Version=1.1.7285.24561, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>