lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-10-13 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-13 18:52:45 +08:00
parent 1ca00540a3
commit 9183f74b55
25 changed files with 4019 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/BLL.csproj
+6
View File
@@ -97,6 +97,11 @@
<Reference Include="office, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c">
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="QRCoder, Version=1.4.3.0, Culture=neutral, PublicKeyToken=c4ed5b9ae8358a28, processorArchitecture=MSIL">
<HintPath>..\packages\QRCoder.1.4.3\lib\net40\QRCoder.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=106.15.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.106.15.0\lib\net452\RestSharp.dll</HintPath>
</Reference>
@@ -134,6 +139,7 @@
<Reference Include="ThoughtWorks.QRCode">
<HintPath>..\FineUIPro\Reference BLL\ThoughtWorks.QRCode.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Compile Include="API\APIBaseInfoService.cs" />
SGGL/BLL/Common/Const.cs
+1 -1
View File
@@ -3024,7 +3024,7 @@
/// <summary>
/// PDMS输出（设计）数据导入模板
/// </summary>
public const string PDMSPipelineTemplateUrl = "File\\Excel\\DataIn\\PDMS输出（设计）数据模板.xls";
public const string PDMSPipelineTemplateUrl = "File\\Excel\\DataIn\\PDMS输出（设计）数据模板.xlsx";
/// <summary>
/// 施工计划模板
/// </summary>
SGGL/BLL/Common/CreateQRCodeService.cs
+28 -9
View File
@@ -1,7 +1,9 @@
using System;
using NPOI.OpenXmlFormats.Shared;
using System;
using System.IO;
using System.Text;
using ThoughtWorks.QRCode.Codec;
using QRCoder;
namespace BLL
{
@@ -49,6 +51,16 @@ namespace BLL
return null;
}
}
/*
public Bitmap GetGraphic(int pixelsPerModule, Color darkColor, Color lightColor, [Bitmap icon=null], [int iconSizePercent=15], [int iconBorderWidth=6], [bool drawQuietZones=true])
int pixelsPerModule：生成二维码图片的像素大小；
Color darkColor：二维码图像暗色，一般设置为Color.Black。
Color lightColor：二维码图像亮色， 一般设置为Color.White。
Bitmap icon：二维码中间水印图标。
int iconSizePercent：水印图标的大小比例。
int iconBorderWidth：水印图标的边框。不能设为0，否则会显示“参数错误”，程序运行出错。
bool drawQuietZones：静止区，即是否绘画二维码的空白边框区域，默认为true。
*/
public static string CreateCode_Simple(string nr,string filename)
{
try
@@ -56,14 +68,21 @@ namespace BLL
string imageUrl = string.Empty;
if (!string.IsNullOrEmpty(nr))
{
QRCodeEncoder qrCodeEncoder = new QRCodeEncoder
{
QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE,
QRCodeScale = nr.Length,
QRCodeVersion = 0,
QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M
};
System.Drawing.Image image = qrCodeEncoder.Encode(nr, Encoding.UTF8);
//QRCodeEncoder qrCodeEncoder = new QRCodeEncoder
//{
// QRCodeEncodeMode = QRCodeEncoder.ENCODE_MODE.BYTE,
// QRCodeScale = nr.Length,
// QRCodeVersion =0,
// QRCodeErrorCorrect = QRCodeEncoder.ERROR_CORRECTION.M
//};
//System.Drawing.Image image = qrCodeEncoder.Encode(nr, Encoding.UTF8);
QRCoder.QRCode qRCode = new QRCoder.QRCode();
QRCodeGenerator qrGenerator = new QRCodeGenerator();
QRCodeData qrCodeData = qrGenerator.CreateQrCode(nr, QRCodeGenerator.ECCLevel.Q);
QRCode qrcode = new QRCode(qrCodeData);
System.Drawing.Image image = qrcode.GetGraphic(100);
string filepath = Funs.RootPath + UploadFileService.QRCodeImageFilePath;
//如果文件夹不存在，则创建
if (!Directory.Exists(filepath))
SGGL/BLL/HJGL/DataImport/DataImportService.cs
+2 -2
View File
@@ -43,10 +43,10 @@ namespace BLL
/// <param name="FileName"></param>
/// <param name="project"></param>
/// <returns></returns>
public static Model.HJGL_DataImport GetLatestFileByFileName(string FileName, string project)
public static Model.HJGL_DataImport GetLatestFileByFileName(string FileName,string ImportType, string project)
{
var q = (from x in Funs.DB.HJGL_DataImport
where x.FileName.Contains(FileName) && x.ProjectId == project
where x.FileName.Contains(FileName) && x.ProjectId == project&&x.ImportType==ImportType
select x
).OrderByDescending(x => x.Version).FirstOrDefault();
return q;