baogq
/
ATJ_MES_581
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交

Browse Source
master
国强 鲍 1 month ago
parent 2251d3dc1d
commit e816259b59
33 changed files with 97 additions and 101 deletions
Show Stats Download Patch File Download Diff File

BIN
Comprosser/DLL/ICSharpCode.Core.dll
View File

Binary file not shown.

3
Comprosser/Data/DbHandler_local.cs
Unescape Escape View File

@ -3,10 +3,11 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using Mesnac.Basic;
using Mesnac.Codd.Session;
using System.Data;
using Mesnac.Compressor.Entity;
using Mesnac.Compressor.Unity;
using Mesnac.Codd.Session;
namespace Mesnac.Compressor.Data
{

4
Comprosser/Data/Mesnac.Compressor.Data.csproj
Unescape Escape View File

@ -34,11 +34,11 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.Core">
<HintPath>..\Libraries\ICSharpCode.Core.dll</HintPath>
<HintPath>..\DLL\ICSharpCode.Core.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Codd, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libraries\Mesnac.Codd.dll</HintPath>
<HintPath>..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />

3
Comprosser/FrmPrint/Form1.cs
Unescape Escape View File

@ -5,7 +5,7 @@ using Mesnac.Compressor.Data;
using Mesnac.HighWay.ATC.Common;
using Mesnac.HighWay.ATC.SqlSugar;
using Mesnac.HighWay.ATC.SqlSugar.serviceImpl;
using SqlSugar;
using Mesnac.HighWay.ATC.SqlSugar;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -27,6 +27,7 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement.Button;
using System.Collections;
using System.Runtime.InteropServices;
using System.Reflection.Emit;
using SqlSugar;
namespace FrmPrint
{

11
Comprosser/FrmPrint/FrmPrint.csproj
Unescape Escape View File

@ -43,14 +43,14 @@
<ItemGroup>
<Reference Include="ICSharpCode.Core, Version=4.3.0.9338, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libraries\ICSharpCode.Core.dll</HintPath>
<HintPath>..\DLL\ICSharpCode.Core.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\Libraries\log4net\log4net.dll</HintPath>
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Codd">
<HintPath>..\Libraries\Mesnac.Codd.dll</HintPath>
<HintPath>..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Controls.Default">
<HintPath>..\..\Controls\Mesnac.Controls.Default\obj\Debug\Mesnac.Controls.Default.dll</HintPath>
@ -58,8 +58,8 @@
<Reference Include="Mesnac.Docking">
<HintPath>..\..\Libraries\Mesnac.Docking\obj\Debug\Mesnac.Docking.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll</HintPath>
<Reference Include="SqlSugar, Version=5.1.4.193, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\SqlSugar.5.1.4.193\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@ -116,6 +116,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
Comprosser/FrmPrint/packages.config
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SqlSugar" version="5.1.4.193" targetFramework="net452" />
</packages>

6
Comprosser/Mesnac.HighWay.ATC.Common/Mesnac.HighWay.ATC.Common.csproj
Unescape Escape View File

@ -41,10 +41,10 @@
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="Nancy, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Nancy.2.0.0\lib\net452\Nancy.dll</HintPath>
<HintPath>..\DLL\Nancy.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll</HintPath>
<Reference Include="SqlSugar, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />

1
Comprosser/Mesnac.HighWay.ATC.Common/packages.config
Unescape Escape View File

@ -2,4 +2,5 @@
<packages>
<package id="log4net" version="2.0.12" targetFramework="net452" />
<package id="Nancy" version="2.0.0" targetFramework="net452" />
<package id="SqlSugar" version="5.0.3" targetFramework="net452" />
</packages>

7
Comprosser/Mesnac.HighWay.ATC.SqlSugar/Mesnac.HighWay.ATC.SqlSugar.csproj
Unescape Escape View File

@ -35,8 +35,8 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
</PropertyGroup>
<ItemGroup>
<Reference Include="SqlSugar">
<HintPath>..\DLL\SqlSugar.dll</HintPath>
<Reference Include="SqlSugar, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
@ -58,5 +58,8 @@
<Name>Mesnac.HighWay.ATC.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

4
Comprosser/Mesnac.HighWay.ATC.SqlSugar/packages.config
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SqlSugar" version="5.0.3" targetFramework="net452" />
</packages>

4
Comprosser/PLCManager/PLCManager.csproj
Unescape Escape View File

@ -34,10 +34,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.Core">
<HintPath>..\Libraries\ICSharpCode.Core.dll</HintPath>
<HintPath>..\..\PlugInPlatform\ICSharpCode.Core\bin\Debug\ICSharpCode.Core.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Codd">
<HintPath>..\Libraries\Mesnac.Codd.dll</HintPath>
<HintPath>..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />

6
Comprosser/SocketProcess/SocketProcess.csproj
Unescape Escape View File

@ -34,14 +34,14 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.Core">
<HintPath>..\Libraries\ICSharpCode.Core.dll</HintPath>
<HintPath>..\DLL\ICSharpCode.Core.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\Libraries\log4net\log4net.dll</HintPath>
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Log, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\2020\程序\中间件\云平台\dll\Mesnac.Log.dll</HintPath>
<HintPath>..\DLL\Mesnac.Log.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />

4
Controls/Mesnac.Controls.Compressor/Mesnac.Controls.Compressor.csproj
Unescape Escape View File

@ -38,14 +38,14 @@
<HintPath>..\..\Libraries\MXComponent\HslCommunication.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.Core">
<HintPath>..\..\Libraries\ICSharpCode.Core.dll</HintPath>
<HintPath>..\..\Comprosser\DLL\ICSharpCode.Core.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Codd, Version=0.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Controls.Base">
<HintPath>..\Mesnac.Controls.Base.dll</HintPath>
<HintPath>..\Mesnac.Controls.Base\bin\Debug\Mesnac.Controls.Base.dll</HintPath>
</Reference>
<Reference Include="Mesnac.Controls.Feeding">
<HintPath>..\Mesnac.Controls.Feeding\bin\Debug\Mesnac.Controls.Feeding.dll</HintPath>

7
Equips/Mesnac.Equips.Connection/Mesnac.Equips.Connection.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Equips.Connection</RootNamespace>
<AssemblyName>Mesnac.Equips.Connection</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -19,7 +19,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -29,7 +28,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -38,7 +36,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

6
Equips/Mesnac.Equips/Mesnac.Equips.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Equips</RootNamespace>
<AssemblyName>Mesnac.Equips</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>
@ -29,7 +29,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -38,7 +37,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

7
Equips/Mesnac.Maths/Mesnac.Maths.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Maths</RootNamespace>
<AssemblyName>Mesnac.Maths</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -19,7 +19,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -29,7 +28,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -38,7 +36,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

2
Libraries/Host/Host.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Host</RootNamespace>
<AssemblyName>Host</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>

2
Libraries/Loder/Loder.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Loder</RootNamespace>
<AssemblyName>Loder</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>

2
Libraries/Mesnac.Codd/Mesnac.Codd.csproj
Unescape Escape View File

@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Codd</RootNamespace>
<AssemblyName>Mesnac.Codd</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
Libraries/Mesnac.Communication/Mesnac.Communication.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Communication</RootNamespace>
<AssemblyName>Mesnac.Communication</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
Libraries/Mesnac.Docking/Mesnac.Docking.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Docking</RootNamespace>
<AssemblyName>Mesnac.Docking</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>

2
Libraries/Mesnac.UI.ToolBox/Mesnac.UI.ToolBox.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.UI.ToolBox</RootNamespace>
<AssemblyName>Mesnac.UI.ToolBox</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
Libraries/OpcDaNet/OpcDaNet.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OpcDaNet</RootNamespace>
<AssemblyName>OpcDaNet</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>

2
Libraries/PropertyGridEx/PropertyGridEx.csproj
Unescape Escape View File

@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PropertyGridEx</RootNamespace>
<AssemblyName>PropertyGridEx</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<SccProjectName>

5
Manager/BarTenderPrint/BarTenderPrint.csproj
Unescape Escape View File

@ -45,8 +45,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>Libary\Seagull.BarTender.Print.dll</HintPath>
</Reference>
<Reference Include="SqlSugar">
<HintPath>..\..\Comprosser\Mesnac.HighWay.ATC.SqlSugar\bin\Debug\SqlSugar.dll</HintPath>
<Reference Include="SqlSugar, Version=5.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\SqlSugar.5.0.3\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.configuration" />
@ -151,6 +151,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

44
Manager/BarTenderPrint/PrintManager.cs
Unescape Escape View File

@ -774,28 +774,28 @@ namespace BarTenderPrint
return null;
}
}
public List<baseBarcodePrintInfo> GetLocal_Mchilsurface__DetailInfoList(string ShiftID, string ProductID, string starttime, string endtime)
{
List<baseBarcodePrintInfo> result;
try
{
string sql = "SELECT [ID],[ProductBarcode],[SerialNo],[IsRestart],[ProductID],[ShiftID],[InsertTime] FROM [base_Barcode_PrintInfo] WHERE 1 = 1 AND [ShiftID]=@ShiftID AND [ProductID]=@ProductID AND [InsertTime] > @starttime AND InsertTime < @endtime "
;
List<baseBarcodePrintInfo> MaterialTypeList = new BaseServices<baseBarcodePrintInfo>().QueryBySql1<baseBarcodePrintInfo>(sql, new List<SugarParameter>
{
new SugarParameter("@ShiftID", ShiftID),
new SugarParameter("@ProductID", ProductID),
new SugarParameter("@starttime", starttime),
new SugarParameter("@endtime", endtime)
});
result = MaterialTypeList;
}
catch (Exception ex)
{
result = new List<baseBarcodePrintInfo>();
}
return result;
}
//public List<baseBarcodePrintInfo> GetLocal_Mchilsurface__DetailInfoList(string ShiftID, string ProductID, string starttime, string endtime)
//{
// List<baseBarcodePrintInfo> result;
// try
// {
// string sql = "SELECT [ID],[ProductBarcode],[SerialNo],[IsRestart],[ProductID],[ShiftID],[InsertTime] FROM [base_Barcode_PrintInfo] WHERE 1 = 1 AND [ShiftID]=@ShiftID AND [ProductID]=@ProductID AND [InsertTime] > @starttime AND InsertTime < @endtime "
// ;
// List<baseBarcodePrintInfo> MaterialTypeList = new BaseServices<baseBarcodePrintInfo>().QueryBySql1<baseBarcodePrintInfo>(sql, new List<SugarParameter>
// {
// new SugarParameter("@ShiftID", ShiftID),
// new SugarParameter("@ProductID", ProductID),
// new SugarParameter("@starttime", starttime),
// new SugarParameter("@endtime", endtime)
// });
// result = MaterialTypeList;
// }
// catch (Exception ex)
// {
// result = new List<baseBarcodePrintInfo>();
// }
// return result;
//}
public DataTable GetProductList(string ProductID)
{
DataTable result = null;

4
Manager/BarTenderPrint/packages.config
Unescape Escape View File

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="SqlSugar" version="5.0.3" targetFramework="net452" />
</packages>

7
Mesnac.Compressor.Station/Mesnac.Compressor.Station.csproj
Unescape Escape View File

@ -33,9 +33,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mesnac.Codd">
<HintPath>..\Libraries\Mesnac.Codd\bin\Debug\Mesnac.Codd.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
@ -70,6 +67,10 @@
<Project>{7fa4febd-51e5-47d6-9db1-147bb8b3df4d}</Project>
<Name>Mesnac.Equips</Name>
</ProjectReference>
<ProjectReference Include="..\Libraries\Mesnac.Codd\Mesnac.Codd.csproj">
<Project>{60f0fc7f-c072-4887-8bab-d4cdcadf366a}</Project>
<Name>Mesnac.Codd</Name>
</ProjectReference>
<ProjectReference Include="..\Manager\BarTenderPrint\BarTenderPrint.csproj">
<Project>{83E230AD-4998-48E1-B20B-BFB97A5E5939}</Project>
<Name>BarTenderPrint</Name>

7
PlugInPlatform/ICSharpCode.Core/ICSharpCode.Core.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ICSharpCode.Core</RootNamespace>
<AssemblyName>ICSharpCode.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -20,7 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -31,7 +30,6 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>AnyCPU</PlatformTarget>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@ -40,7 +38,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

7
PlugInPlatform/ICSharpCode.Data.Core/ICSharpCode.Data.Core.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ICSharpCode.Data.Core</RootNamespace>
<AssemblyName>ICSharpCode.Data.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -20,7 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -30,7 +29,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@ -39,7 +37,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

7
PlugInPlatform/Mesnac.Core/Mesnac.Core.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Core</RootNamespace>
<AssemblyName>Mesnac.Core</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -20,7 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -30,7 +29,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@ -39,7 +37,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net">

15
PlugInPlatform/Mesnac.Gui/Mesnac.Gui.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.Gui</RootNamespace>
<AssemblyName>Mesnac.Gui</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -20,7 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -30,7 +29,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@ -39,7 +37,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@ -80,17 +77,15 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Controls\Mesnac.Controls.Default\Mesnac.Controls.Default.csproj">
<Project>{F022C0E6-2819-4FB1-BB86-0F389F061A44}</Project>
<Project>{f022c0e6-2819-4fb1-bb86-0f389f061a44}</Project>
<Name>Mesnac.Controls.Default</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Controls\Mesnac.Controls.Feeding\Mesnac.Controls.Feeding.csproj">
<Project>{D0C0324F-434E-47EB-8F7C-BA6CD7F233B4}</Project>
<Project>{d0c0324f-434e-47eb-8f7c-ba6cd7f233b4}</Project>
<Name>Mesnac.Controls.Feeding</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Libraries\Mesnac.Docking\Mesnac.Docking.csproj">
<Project>{0D2DF7C8-0185-4F75-997C-3AE34C1181D3}</Project>
<Project>{ed8f690a-f97c-4c56-b94c-d055a8815bd8}</Project>
<Name>Mesnac.Docking</Name>
</ProjectReference>
<ProjectReference Include="..\..\PlugInPlatform\ICSharpCode.Core\ICSharpCode.Core.csproj">

9
PlugInPlatform/Mesnac.PlugIn/Mesnac.PlugIn.csproj
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Mesnac.PlugIn</RootNamespace>
<AssemblyName>Mesnac.PlugIn</AssemblyName>
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<SccProjectName>
</SccProjectName>
@ -20,7 +20,6 @@
</SccAuxPath>
<SccProvider>
</SccProvider>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -30,7 +29,6 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@ -39,7 +37,6 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
@ -69,7 +66,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Libraries\Mesnac.Docking\Mesnac.Docking.csproj">
<Project>{ED8F690A-F97C-4C56-B94C-D055A8815BD8}</Project>
<Project>{ed8f690a-f97c-4c56-b94c-d055a8815bd8}</Project>
<Name>Mesnac.Docking</Name>
</ProjectReference>
<ProjectReference Include="..\ICSharpCode.Core\ICSharpCode.Core.csproj">

Write Preview
Loading…
Cancel
Save