合并

quanzhou

2025-08-27 f9e7cfbc3d3323158139a8f0b89286f90fd6326b

合并

 global.json

File was deleted

 src/Bro.M141.Process/Bro.M141.Process.csproj

@@ -15,6 +15,14 @@
        <Exec Command="Copy $(SolutionDir)libs\PFW $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\SafetyDog $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\Nuget $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\halcon12 $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\HikCamera $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\IKAPCamera $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\InsCamera $(OutDir)&#xD;&#xA;Copy $(SolutionDir)libs\WebServiceDll $(OutDir)" />
    </Target>

    <ItemGroup>
      <Compile Remove="UI\新建文件夹\**" />
      <EmbeddedResource Remove="UI\新建文件夹\**" />
      <None Remove="UI\新建文件夹\**" />
    </ItemGroup>



    <!--<ItemGroup>
      <Compile Include="UI\FrmContinuousNGAlarm.cs" />
      <Compile Include="UI\FrmContinuousNGAlarm.Designer.cs" />

 src/Bro.M141.Process/UI/UIPrinter.cs

@@ -1,5 +1,4 @@

using Bro.Common.Helper;
using Bro.Common.Helper;
using Bro.Common.Interface;
using Bro.M135.Common;
using Bro.UI.Model.Winform;
@@ -17,8 +16,12 @@
using System.Windows.Forms;
using ZXing;
using ZXing.Common;
using ZXing.QrCode;
using static Bro.M141.Process.BasketCodeUI;
using ZXing.QrCode.Internal;
using static System.Windows.Forms.AxHost;
using ZXing.QrCode;



//using System.Printing;

@@ -44,7 +47,7 @@
            printDocument1.PrintPage += new PrintPageEventHandler(printDocument_Print);

            Process141.StartPrinter += StartPrint;
            textBox1.Text = "Broconcentric";
            textBox1.Text = "C229M2508250500002";
        }


@@ -85,8 +88,10 @@
            //Config141
            Process141.PlcwritePrinter(1520, 0);
            Process141.PlcwritePrinter(1510, 1);

        }


        //C229M2508250500002
        private void printDocument_Print(object sender, PrintPageEventArgs e)
        {
            Font fntTxt = new Font("黑体", 15, System.Drawing.FontStyle.Bold);//正文文字               
@@ -146,6 +151,16 @@
                //g.DrawString("厂商", font, brush, (startX + 20) * Scale, (startY + 5) * Scale);//
                //g.DrawString("嘉彰科技", font2, brush, (startX + 140) * Scale, (startY + 4) * Scale);

                BarcodeWriter writer = new BarcodeWriter();
                writer.Format = BarcodeFormat.QR_CODE;
                QrCodeEncodingOptions options = new QrCodeEncodingOptions()
                {
                    DisableECI = true,//设置内容编码
                    CharacterSet = "UTF-8",  //设置二维码的宽度和高度
                    Width = 123,
                    Height = 123,
                    Margin = 1//设置二维码的边距,单位不是固定像素
                };

                ////第二行数据
                //g.DrawRectangle(p, startX * Scale, (startY + 20) * Scale, 70 * Scale, 20 * Scale);