liulb@mesnac.com 1 year ago
parent 4cd0a31977
commit 66ed9de812

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -338,3 +338,43 @@ D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.PLc
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.RunPlc.dll
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.RunPlc.pdb
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.PLc.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Extensions.deps.json
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Extensions.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Extensions.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Common.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.EventBus.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.IRepository.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.IService.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Model.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Repository.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Serilog.Es.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Service.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Tasks.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.PLc.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.RunPlc.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.Scanner.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\MvCodeReaderSDK.Net.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\HslCommunication.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Common.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.EventBus.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Repository.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Service.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Tasks.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.RunPlc.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.Scanner.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.IRepository.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.IService.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Model.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Model.xml
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Admin.Core.Serilog.Es.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\bin\Debug\net6.0\Aucma.Core.PLc.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.csproj.AssemblyReference.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.GeneratedMSBuildEditorConfig.editorconfig
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.AssemblyInfoInputs.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.AssemblyInfo.cs
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.csproj.CoreCompileInputs.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.csproj.CopyComplete
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\refint\Admin.Core.Extensions.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\Admin.Core.Extensions.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\obj\Debug\net6.0\ref\Admin.Core.Extensions.dll

@ -89,6 +89,18 @@ namespace Admin.Core.IRepository
/// <returns></returns>
Task<bool> UpdateAsync(TEntity entity, List<string> lstColumns = null, List<string> lstIgnoreColumns = null, string strWhere = "");
/// <summary>
/// 正序查询第一条数据
/// </summary>
/// <returns></returns>
Task<TEntity> FirstAsync();
/// <summary>
/// 根据条件查询查询第一条数据
/// </summary>
/// <param name="whereExpression"></param>
/// <returns></returns>
Task<TEntity> FirstAsync(Expression<Func<TEntity, bool>> whereExpression);
/// <summary>
/// 查询
/// </summary>

@ -0,0 +1,12 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
namespace Admin.Core.IRepository
{
/// <summary>
/// IOrderBomInfoRepository
/// </summary>
public interface IOrderBomInfoRepository : IBaseRepository<OrderBomInfo>
{
}
}

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -1 +1 @@
48f6582ad412a7c32e9164c6a334fbdc03be69d3
d03ec43faaf2fe4c1db357961d9ae12202991526

@ -0,0 +1,13 @@
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
namespace Admin.Core.IService
{
/// <summary>
/// IOrderBomInfoServices
/// </summary>
public interface IOrderBomInfoServices : IBaseServices<OrderBomInfo>
{
}
}

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -1 +1 @@
e2c44537c66dd97efdfc9fe5dc384fd6bcd269ce
055d438d8e925c98b75dee9ba62a44c57a025f50

@ -8,7 +8,7 @@ using System.Threading.Tasks;
namespace Admin.Core.Model
{
/// <summary>
/// SAP BOM 信息
/// 拆分的SAP BOM 信息
/// </summary>
[SugarTable("BASE_BOMINFO", "AUCMA_MES")]
public class BaseBomInfo
@ -72,5 +72,53 @@ namespace Admin.Core.Model
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
/// <summary>
/// 创建人
/// </summary>
[SugarColumn(ColumnName = "CREATED_BY")]
public string CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(ColumnName = "CREATED_TIME")]
public DateTime CreatedTime { get; set; }
/// <summary>
/// 更新人
/// </summary>
[SugarColumn(ColumnName = "UPDATED_BY")]
public string UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
[SugarColumn(ColumnName = "UPDATED_TIME")]
public DateTime UpdatedTime { get; set; }
/// <summary>
/// 工厂编码
/// </summary>
[SugarColumn(ColumnName = "FACTORY_CODE")]
public string FactoryCode { get; set; }
/// <summary>
/// 排序
/// </summary>
[SugarColumn(ColumnName = "SORT")]
public string Sort { get; set; }
/// <summary>
/// 销售凭证
/// </summary>
[SugarColumn(ColumnName = "VBELN")]
public string Vbeln { get; set; }
/// <summary>
/// 销售单据项目
/// </summary>
[SugarColumn(ColumnName = "VBPOS")]
public string Vbpos { get; set; }
/// <summary>
/// 祖级列表
/// </summary>
[SugarColumn(ColumnName = "ANCESTORS")]
public string Ancestors { get; set; }
}
}

@ -0,0 +1,63 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.Model_New
{
/// <summary>
/// SAP BOM 信息
/// </summary>
[SugarTable("BASE_BOMINFO", "AUCMA_MES")]
public class OrderBomInfo
{ /// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// BOM编号
/// </summary>
[SugarColumn(ColumnName = "BOM_CODE")]
public string BomCode { get; set; }
/// <summary>
/// 物料编号
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_CODE")]
public string MaterialCode { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_NAME")]
public string MaterialName { get; set; }
/// <summary>
/// 物料类别
/// </summary>
[SugarColumn(ColumnName = "MATERIAL_TYPE")]
public string MaterialType { get; set; }
/// <summary>
/// 标准数量
/// </summary>
[SugarColumn(ColumnName = "STANDARD_AMOUNT")]
public int StandardAmount { get; set; }
/// <summary>
/// 父级编号
/// </summary>
[SugarColumn(ColumnName = "PARENT_ID")]
public string ParentId { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
}
}

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -1 +1 @@
03a2929c8d74aec595b1ed4105ee7bf97aadcc8e
24c58aad4fe4f7fc0488429094aa0cd54a6cb1a5

@ -10,6 +10,7 @@ using System.Threading.Tasks;
using Admin.Core.IRepository;
using NPOI.SS.Formula.Functions;
using Org.BouncyCastle.Crypto;
using Castle.DynamicProxy.Generators.Emitters.SimpleAST;
namespace Admin.Core.Repository
{
@ -203,7 +204,23 @@ namespace Admin.Core.Repository
}
return await up.ExecuteCommandHasChangeAsync();
}
/// <summary>
/// 正序查询第一条数据
/// </summary>
/// <returns></returns>
public async Task<TEntity> FirstAsync()
{
return await _db.Queryable<TEntity>().FirstAsync();
}
/// <summary>
/// 查询第一条数据
/// </summary>
/// <param name="whereExpression"></param>
/// <returns></returns>
public async Task<TEntity> FirstAsync(Expression<Func<TEntity, bool>> whereExpression)
{
return await _db.Queryable<TEntity>().WhereIF(whereExpression != null, whereExpression).FirstAsync();
}
/// <summary>
/// 根据实体删除一条数据
/// </summary>

@ -0,0 +1,16 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Repository;
namespace Admin.Core.IRepository
{
/// <summary>
/// BaseBomInfoRepository
/// </summary>
public class BaseBomInfoRepository : BaseRepository<BaseBomInfo>, IBaseBomInfoRepository
{
public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}
}

@ -5,11 +5,11 @@ using Admin.Core.Repository;
namespace Admin.Core.IRepository
{
/// <summary>
/// BaseBomInfoRepository
/// OrderBomInfoRepository
/// </summary>
public class BaseBomInfoRepository : BaseRepository<BaseBomInfo>, IBaseBomInfoRepository
public class OrderBomInfoRepository : BaseRepository<OrderBomInfo>, IOrderBomInfoRepository
{
public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork)
{
}
}

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -1 +1 @@
716a5f290029da783d21656a80fb12d097b68d9c
9b81b00b46eb03d7442abcb13b5c4d0e4eb8060a

@ -5,6 +5,7 @@ using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using NPOI.SS.Formula.Functions;
using StackExchange.Redis;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
@ -19,71 +20,72 @@ namespace Admin.Core.Service
private readonly IPrintOrderInfoRepository _printOrderInfoRepository;
private readonly IBaseOrderInfoRepository _baseOrderInfoRepository;
private readonly IBaseBomInfoRepository _baseBomInfoRepository;
List<BaseBomInfo> bbinfolist=new List<BaseBomInfo>();
public BaseOrderInfoServices(IBaseRepository<BaseOrderInfo> dal,IBaseBomInfoRepository baseBomInfoRepository, IBaseOrderInfoRepository baseOrderInfoRepository, IPrintOrderInfoRepository printOrderInfoRepository)
private readonly IOrderBomInfoRepository _orderBomInfoRepository;
List<OrderBomInfo> bbinfolist=new List<OrderBomInfo>();
public BaseOrderInfoServices(IBaseRepository<BaseOrderInfo> dal,IBaseBomInfoRepository baseBomInfoRepository,
IBaseOrderInfoRepository baseOrderInfoRepository, IPrintOrderInfoRepository printOrderInfoRepository,
IOrderBomInfoRepository orderBomInfoRepository)
{
this._dal = dal;
base.BaseDal = dal;
_baseBomInfoRepository = baseBomInfoRepository;
_baseOrderInfoRepository = baseOrderInfoRepository;
_printOrderInfoRepository = printOrderInfoRepository;
_orderBomInfoRepository = orderBomInfoRepository;
}
/// <summary>
/// 获取打印订单信息
/// 获取打印订单信息-
/// </summary>
/// <returns></returns>
public async Task<List<PrintPlanInfoView>> QueryPrintInfo()
{
List<PrintPlanInfoView> list = new List<PrintPlanInfoView>();
List<PrintPlanInfoView> list= new List<PrintPlanInfoView>();
List<BaseOrderInfo> orderList = await _baseOrderInfoRepository.QueryAsync();
List<BaseBomInfo> bomInfoList = await _baseBomInfoRepository.QueryAsync();
List<OrderBomInfo> orderBomInfoList = await _orderBomInfoRepository.QueryAsync();
//List<BaseBomInfo> bomInfoList = await _baseBomInfoRepository.QueryAsync();
List<PrintOrderInfo> printOrderInfoList = await _printOrderInfoRepository.QueryAsync();
bbinfolist.Clear();
foreach (BaseOrderInfo order in orderList)
{
var bom = bomInfoList.FirstOrDefault(d=>d.BomCode.Equals(order.MaterialCode));
if (bom!=null)
var bomList = await _orderBomInfoRepository.QueryAsync(d => d.ParentId.Equals(order.MaterialCode));
if (bomList != null)
{
if (bom.BomCode == bom.MaterialCode)
{
PrintPlanInfoView view = new PrintPlanInfoView();
view.OrderCode = order.OrderCode;
view.ProductCode = order.MaterialCode;
view.ProductName = order.MaterialName;
view.PlanAmount = order.OrderAmount;
view.MaterialCode = bom.MaterialCode;
view.MaterialName = bom.MaterialName;
view.StandardAmount = bom.StandardAmount;
view.CreateTime = order.CreatedTime;
list.Add(view);
}
else
bomList.ForEach(b =>
{
List<BaseBomInfo> bbList = RecursionFn(bomInfoList, bom.MaterialCode);
if (bbList != null)
List<OrderBomInfo> bbList = RecursionFn(orderBomInfoList, b.MaterialCode);
if (b.ParentId.IsNotEmptyOrNull())
{
bbList.ForEach(b =>
{
if (b.BomCode.IsNotEmptyOrNull())
{
PrintPlanInfoView view = new PrintPlanInfoView();
view.OrderCode = order.OrderCode;
view.ProductCode = order.MaterialCode;
view.ProductName = order.MaterialName;
view.PlanAmount = order.OrderAmount;
view.MaterialCode = b.MaterialCode;
view.MaterialName = b.MaterialName;
view.StandardAmount = b.StandardAmount;
view.CreateTime = order.CreatedTime;
PrintPlanInfoView view = new PrintPlanInfoView();
view.OrderCode = order.OrderCode;
view.ProductCode = order.MaterialCode;
view.ProductName = order.MaterialName;
view.PlanAmount = order.OrderAmount;
view.MaterialCode = b.MaterialCode;
view.MaterialName = b.MaterialName;
view.StandardAmount = b.StandardAmount;
view.CreateTime = order.CreatedTime;
list.Add(view);
}
});
list.Add(view);
}
}
});
}
}
//var list = (from order in orderList
// join b in orderBomInfoList
// on order.MaterialCode equals b.ParentId
// select new PrintPlanInfoView
// {
// OrderCode = order.OrderCode,
// ProductCode = order.MaterialCode,
// ProductName = order.MaterialName,
// PlanAmount = order.OrderAmount,
// MaterialCode = b.MaterialCode,
// MaterialName = b.MaterialName,
// StandardAmount = b.StandardAmount,
// CreateTime = order.CreatedTime
// }).ToList();
list.ForEach(b =>
{
PrintOrderInfo info = printOrderInfoList.FirstOrDefault(d => d.OrderCode == b.OrderCode);
@ -96,14 +98,67 @@ namespace Admin.Core.Service
return list;
}
public async Task<List<PrintPlanInfoView>> QueryPrintInfo(string query){
List<PrintPlanInfoView> list = new List<PrintPlanInfoView>();
List<PrintPlanInfoView> list2 = new List<PrintPlanInfoView>();
List<BaseOrderInfo> orderList = await _baseOrderInfoRepository.QueryAsync();
List<OrderBomInfo> orderBomInfoList = await _orderBomInfoRepository.QueryAsync();
//List<BaseBomInfo> bomInfoList = await _baseBomInfoRepository.QueryAsync();
List<PrintOrderInfo> printOrderInfoList = await _printOrderInfoRepository.QueryAsync();
bbinfolist.Clear();
list2.Clear();
foreach (BaseOrderInfo order in orderList)
{
var bomList = await _orderBomInfoRepository.QueryAsync(d => d.ParentId.Equals(order.MaterialCode));
if (bomList != null)
{
bomList.ForEach(b =>
{
List<OrderBomInfo> bbList = RecursionFn(orderBomInfoList, b.MaterialCode);
if (b.ParentId.IsNotEmptyOrNull())
{
PrintPlanInfoView view = new PrintPlanInfoView();
view.OrderCode = order.OrderCode;
view.ProductCode = order.MaterialCode;
view.ProductName = order.MaterialName;
view.PlanAmount = order.OrderAmount;
view.MaterialCode = b.MaterialCode;
view.MaterialName = b.MaterialName;
view.StandardAmount = b.StandardAmount;
view.CreateTime = order.CreatedTime;
list.Add(view);
}
});
}
}
var printList= list.Where(d=>d.MaterialName.Contains(query));
list.ForEach(b =>
{
PrintOrderInfo info = printOrderInfoList.FirstOrDefault(d => d.OrderCode == b.OrderCode);
if (info != null)
{
PrintPlanInfoView view = new PrintPlanInfoView();
b.LinerAmount = info.LinerAmount;
b.BoxAmount = info.BoxAmount;
b.MaterialCode = string.Empty;
b.MaterialName = string.Empty;
b.StandardAmount = 0;
list2.Add(view);
}
});
list2.Distinct();
return list2;
}
#region 递归列表
/// <summary>
/// 递归列表
/// </summary>
public List<BaseBomInfo> RecursionFn(List<BaseBomInfo> list, string materialCode)
public List<OrderBomInfo> RecursionFn(List<OrderBomInfo> list, string materialCode)
{
// 得到子节点列表
List<BaseBomInfo> childList = GetChildList(list, materialCode);
List<OrderBomInfo> childList = GetChildList(list, materialCode);
childList.ForEach(c => bbinfolist.Add(c));
foreach (var tChild in childList)
{
@ -123,13 +178,13 @@ namespace Admin.Core.Service
/// <param name="list"></param>
/// <param name="t"></param>
/// <returns></returns>
public List<BaseBomInfo> GetChildList(List<BaseBomInfo> list, string materialCode)
public List<OrderBomInfo> GetChildList(List<OrderBomInfo> list, string materialCode)
{
List<BaseBomInfo> tlist = new List<BaseBomInfo>();
IEnumerator<BaseBomInfo> it = list.Where(d => d.ParentId == materialCode).GetEnumerator();
List<OrderBomInfo> tlist = new List<OrderBomInfo>();
IEnumerator<OrderBomInfo> it = list.Where(d => d.ParentId == materialCode).GetEnumerator();
while (it.MoveNext())
{
BaseBomInfo n = it.Current;
OrderBomInfo n = it.Current;
if (n.ParentId.IsNotEmptyOrNull())
{
tlist.Add(n);
@ -146,14 +201,14 @@ namespace Admin.Core.Service
/// <param name="list"></param>
/// <param name="t"></param>
/// <returns></returns>
public bool HasChild(List<BaseBomInfo> list, string materialCode)
public bool HasChild(List<OrderBomInfo> list, string materialCode)
{
return IsExist(list, materialCode).Count > 0 ? true : false;
}
public List<BaseBomInfo> IsExist(List<BaseBomInfo> list, string materialCode)
public List<OrderBomInfo> IsExist(List<OrderBomInfo> list, string materialCode)
{
List<BaseBomInfo> tlist = list.Where(d => d.ParentId == materialCode).ToList();
List<OrderBomInfo> tlist = list.Where(d => d.ParentId == materialCode).ToList();
return tlist;
}
#endregion

@ -0,0 +1,17 @@
using Admin.Core.IRepository;
using Admin.Core.IService;
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
namespace Admin.Core.Service
{
public class OrderBomInfoServices : BaseServices<OrderBomInfo>, IOrderBomInfoServices
{
private readonly IBaseRepository<OrderBomInfo> _dal;
public OrderBomInfoServices(IBaseRepository<OrderBomInfo> dal)
{
this._dal = dal;
base.BaseDal = dal;
}
}
}

@ -223,7 +223,7 @@
</member>
<member name="T:Admin.Core.Model.BaseBomInfo">
<summary>
SAP BOM 信息
拆分的SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.ObjId">
@ -276,6 +276,51 @@
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Sort">
<summary>
排序
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbeln">
<summary>
销售凭证
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Vbpos">
<summary>
销售单据项目
</summary>
</member>
<member name="P:Admin.Core.Model.BaseBomInfo.Ancestors">
<summary>
祖级列表
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.BaseOrderInfo">
<summary>
SAP订单信息
@ -426,6 +471,51 @@
完成时间
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.OrderBomInfo">
<summary>
SAP BOM 信息
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.BomCode">
<summary>
BOM编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.MaterialType">
<summary>
物料类别
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.StandardAmount">
<summary>
标准数量
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.ParentId">
<summary>
父级编号
</summary>
</member>
<member name="P:Admin.Core.Model.Model_New.OrderBomInfo.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="T:Admin.Core.Model.Model_New.PrintBarCode">
<summary>
打印条码信息

@ -1 +1 @@
007df8ac751dc1aa88229653084844c8c834427a
6f909fda7d80d8f529de8b1193a90d62679a77b4

@ -261,3 +261,32 @@ D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Tasks\obj\Debug\net6.0\ref\Admin.Core.Task
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Tasks\bin\Debug\net6.0\HslCommunication.dll
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Aucma.Core.PLc.dll
D:\gitea\AUCMA\AUCMA_SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Aucma.Core.PLc.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Tasks.deps.json
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Tasks.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Tasks.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Common.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.IRepository.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.IService.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Model.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Serilog.Es.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Service.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Aucma.Core.PLc.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\HslCommunication.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Common.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Model.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Model.xml
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Service.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Aucma.Core.PLc.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.IRepository.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.IService.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\bin\Debug\net6.0\Admin.Core.Serilog.Es.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.csproj.AssemblyReference.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.GeneratedMSBuildEditorConfig.editorconfig
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.AssemblyInfoInputs.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.AssemblyInfo.cs
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.csproj.CoreCompileInputs.cache
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.csproj.CopyComplete
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\refint\Admin.Core.Tasks.dll
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\Admin.Core.Tasks.pdb
D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\obj\Debug\net6.0\ref\Admin.Core.Tasks.dll

@ -146,14 +146,14 @@
}
}
},
"log4net/2.0.12": {
"log4net/2.0.15": {
"dependencies": {
"System.Configuration.ConfigurationManager": "6.0.0"
},
"runtime": {
"lib/netstandard2.0/log4net.dll": {
"assemblyVersion": "2.0.12.0",
"fileVersion": "2.0.12.0"
"assemblyVersion": "2.0.15.0",
"fileVersion": "2.0.15.0"
}
}
},
@ -647,7 +647,7 @@
"Microsoft.Extensions.Configuration.Abstractions": "7.0.0",
"Microsoft.Extensions.Configuration.Binder": "7.0.0",
"Microsoft.Extensions.Logging": "5.0.0",
"log4net": "2.0.12"
"log4net": "2.0.15"
},
"runtime": {
"lib/net5.0/Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll": {
@ -821,19 +821,19 @@
}
}
},
"Microsoft.Win32.SystemEvents/6.0.0": {
"Microsoft.Win32.SystemEvents/7.0.0": {
"runtime": {
"lib/net6.0/Microsoft.Win32.SystemEvents.dll": {
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.21.52210"
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
},
"runtimeTargets": {
"runtimes/win/lib/net6.0/Microsoft.Win32.SystemEvents.dll": {
"rid": "win",
"assetType": "runtime",
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.21.52210"
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
}
},
@ -969,7 +969,7 @@
"Portable.BouncyCastle": "1.8.10",
"SharpZipLib": "1.3.2",
"System.Configuration.ConfigurationManager": "6.0.0",
"System.Drawing.Common": "6.0.0"
"System.Drawing.Common": "7.0.0"
},
"runtime": {
"lib/netstandard2.1/NPOI.OOXML.dll": {
@ -1942,28 +1942,22 @@
}
}
},
"System.Drawing.Common/6.0.0": {
"System.Drawing.Common/7.0.0": {
"dependencies": {
"Microsoft.Win32.SystemEvents": "6.0.0"
"Microsoft.Win32.SystemEvents": "7.0.0"
},
"runtime": {
"lib/net6.0/System.Drawing.Common.dll": {
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.21.52210"
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
},
"runtimeTargets": {
"runtimes/unix/lib/net6.0/System.Drawing.Common.dll": {
"rid": "unix",
"assetType": "runtime",
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.21.52210"
},
"runtimes/win/lib/net6.0/System.Drawing.Common.dll": {
"rid": "win",
"assetType": "runtime",
"assemblyVersion": "6.0.0.0",
"fileVersion": "6.0.21.52210"
"assemblyVersion": "7.0.0.0",
"fileVersion": "7.0.22.51805"
}
}
},
@ -2913,7 +2907,7 @@
},
"System.Windows.Extensions/6.0.0": {
"dependencies": {
"System.Drawing.Common": "6.0.0"
"System.Drawing.Common": "7.0.0"
},
"runtime": {
"lib/net6.0/System.Windows.Extensions.dll": {
@ -3085,12 +3079,12 @@
"path": "initq/1.0.0.7",
"hashPath": "initq.1.0.0.7.nupkg.sha512"
},
"log4net/2.0.12": {
"log4net/2.0.15": {
"type": "package",
"serviceable": true,
"sha512": "sha512-9P67BCftJ7KG+B7rNOM1A9KczUwyEDed6zbAddy5Cj/73xVkzi+rEAHeOgUnW5wDqy1JFlY8+oTP0m1PgJ03Tg==",
"path": "log4net/2.0.12",
"hashPath": "log4net.2.0.12.nupkg.sha512"
"sha512": "sha512-GahnO9ZgFka+xYcFwAfIFjW+k86P2nxFoaEpH6t3v4hiGj7tv2ksVZphxCVIHmJxoySS0HeU3dgCW+bSCcfD0A==",
"path": "log4net/2.0.15",
"hashPath": "log4net.2.0.15.nupkg.sha512"
},
"MaterialDesignColors/2.1.2": {
"type": "package",
@ -3484,12 +3478,12 @@
"path": "microsoft.win32.registry/4.7.0",
"hashPath": "microsoft.win32.registry.4.7.0.nupkg.sha512"
},
"Microsoft.Win32.SystemEvents/6.0.0": {
"Microsoft.Win32.SystemEvents/7.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==",
"path": "microsoft.win32.systemevents/6.0.0",
"hashPath": "microsoft.win32.systemevents.6.0.0.nupkg.sha512"
"sha512": "sha512-2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==",
"path": "microsoft.win32.systemevents/7.0.0",
"hashPath": "microsoft.win32.systemevents.7.0.0.nupkg.sha512"
},
"Microsoft.Xaml.Behaviors.Wpf/1.1.39": {
"type": "package",
@ -4051,12 +4045,12 @@
"path": "system.directoryservices.protocols/6.0.1",
"hashPath": "system.directoryservices.protocols.6.0.1.nupkg.sha512"
},
"System.Drawing.Common/6.0.0": {
"System.Drawing.Common/7.0.0": {
"type": "package",
"serviceable": true,
"sha512": "sha512-NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==",
"path": "system.drawing.common/6.0.0",
"hashPath": "system.drawing.common.6.0.0.nupkg.sha512"
"sha512": "sha512-KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
"path": "system.drawing.common/7.0.0",
"hashPath": "system.drawing.common.7.0.0.nupkg.sha512"
},
"System.Dynamic.Runtime/4.3.0": {
"type": "package",

@ -16,8 +16,8 @@
}
],
"additionalProbingPaths": [
"C:\\Users\\Robin\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\Robin\\.nuget\\packages"
"C:\\Users\\admin\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\admin\\.nuget\\packages"
],
"configProperties": {
"Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWPF>true</UseWPF>

@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PrintTo.Common
{
public class Item
{
public string Id { get; }
public string DeviceCode { get; }
public string DeviceName { get; }
public string CostCenter { get; }
public Item(string id, string deviceCode, string deviceName, string costCenter)
{
Id = id;
DeviceCode = deviceCode;
DeviceName = deviceName;
CostCenter = costCenter;
}
}
}

@ -1,5 +1,7 @@
using FastReport;
using FastReport.Export.Pdf;
using log4net;
using NPOI.HSSF.Record.Chart;
using System;
using System.Collections.Generic;
using System.Linq;
@ -20,7 +22,7 @@ namespace Aucma.Core.PrintTo
barReport.Load(System.Environment.CurrentDirectory + @"\Report\MaterialBar.frx");//打印报表位置
// 设置打印机和打印选项
barReport.PrintSettings.ShowDialog = false;
barReport.PrintSettings.ShowDialog = true; // 是否打开打印机选择框
barReport.PrintSettings.Printer = printer; // 设置打印机名称
barReport.PrintSettings.Copies = 1; // 设置打印份数
//barReport.PrintSettings.PageRange = "1-3"; // 设置打印页范围
@ -29,6 +31,10 @@ namespace Aucma.Core.PrintTo
barReport.SetParameterValue("BoxBarData.Order_Material_Name", materialName);//物料名称
barReport.SetParameterValue("BoxBarData.Bar_Code", barCode);//二维码
//barReport.Prepare();
//string BarPath = System.Environment.CurrentDirectory + @"\pdf\" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".pdf";
//barReport.Export(new PDFExport(), BarPath);
barReport.Print();
return true;
}

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PrintTo.Common
{
public enum PrintState
{
[Description("空闲中")]
Idle,
[Description("打印中")]
Printing,
[Description("已暂停")]
Paused,
[Description("已停止")]
Stopped,
[Description("已完成")]
Completetd
}
}

@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Aucma.Core.PrintTo.Common
{
public static class PrintStateColor
{
[Description("打印中")]
public static Color Printing { get; } = Color.LightGreen;
[Description("已暂停")]
public static Color Paused { get; } = Color.Orange;
[Description("打印出错")]
public static Color Error { get; } = Color.Red;
[Description("未打印")]
public static Color Idle { get; } = Color.LightGray;
}
}

@ -3,6 +3,7 @@ using Aucma.Core.PrintTo.Models;
using Aucma.Core.PrintTo.Views;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using log4net;
using Microsoft.Extensions.DependencyInjection;
using System;
@ -26,6 +27,8 @@ namespace Aucma.Core.PrintTo.ViewModels
{
_baseOrderInfoServices = App.ServiceProvider.GetService<IBaseOrderInfoServices>();
_=LoadData();
PrintIsEnabled = "True";
WeakReferenceMessenger.Default.Register<string>(this, Recive);
}
#region 加载DataGrid数据
@ -158,19 +161,30 @@ namespace Aucma.Core.PrintTo.ViewModels
{
if (string.IsNullOrEmpty(obj))
{
MessageBox.Show("请选中一行","系统提醒");
MessageBox.Show("请选中需要打印的产品","系统提醒");
return;
}
string order_code = SelectedCells.OrderCode;
string product_code = SelectedCells.ProductCode;
string product_name = SelectedCells.ProductName;
string material_code = SelectedCells.MaterialCode;
string material_name = SelectedCells.MaterialName;
int standard_amount = SelectedCells.StandardAmount;
PrintToDevView printToDev= new PrintToDevView(product_code, material_code, material_name, standard_amount);
printToDev.ShowDialog();
//if (!CheckPrintPassword())
//{
// return;
//}
try
{
string order_code = SelectedCells.OrderCode;
string product_code = SelectedCells.ProductCode;
string product_name = SelectedCells.ProductName;
string material_code = SelectedCells.MaterialCode;
string material_name = SelectedCells.MaterialName;
int standard_amount = SelectedCells.StandardAmount;
PrintIsEnabled = "False";
PrintToDevView printToDev = new PrintToDevView(product_code, material_code, material_name, standard_amount);
printToDev.ShowDialog();
}
catch (Exception ex)
{
PrintIsEnabled = "True";
log.Error(ex.Message);
}
}
#endregion
@ -238,6 +252,32 @@ namespace Aucma.Core.PrintTo.ViewModels
}
#endregion
#region 常规打印按钮状态
private string _printIsEnabled;
public string PrintIsEnabled
{
get { return _printIsEnabled; }
set
{
_printIsEnabled = value;
OnPropertyChanged();//属性通知
}
}
#endregion
#region 刷新列表-其他界面刷新该方法
/// <summary>
/// 刷新列表
/// </summary>
/// <param name="recipient"></param>
/// <param name="message"></param>
private void Recive(object recipient, object message)
{
PrintIsEnabled = "True";
Datalist.Clear();
_=LoadData();
}
#endregion
}
}

@ -1,12 +1,20 @@
using Admin.Core.Common;
using Aucma.Core.PrintTo;
using Admin.Core.IService;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using Admin.Core.Service;
using Aucma.Core.PrintTo.Common;
using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input;
using CommunityToolkit.Mvvm.Messaging;
using FastReport;
using FastReport.DevComponents.DotNetBar;
using log4net;
using Microsoft.Extensions.DependencyInjection;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows;
@ -14,12 +22,35 @@ namespace Aucma.Core.PrintTo.ViewModels
{
public partial class PrintToDevViewModel : ObservableObject
{
private static readonly log4net.ILog log = LogManager.GetLogger(typeof(PrintToDevViewModel));
protected readonly IOrderBomInfoServices _orderBomInfoServices;
private List<OrderBomInfo> items { get; }
private Queue<OrderBomInfo> BarcodesUnprinted { get; } = new Queue<OrderBomInfo>();
private Queue<OrderBomInfo> BarcodesPrinted { get; } = new Queue<OrderBomInfo>();
private PrintState printState { get; set; } = PrintState.Idle;//打印状态
protected bool isPrint { get; set; } = true;//打印打印标志
public PrintToDevViewModel() { }
public PrintToDevViewModel(string productCode, string materialCode, string materialName, int printAmount, string? barCode = null)
{
ProductCode = productCode;
MaterialName = materialName;
PrintAmount = printAmount;
_orderBomInfoServices = App.ServiceProvider.GetService<IOrderBomInfoServices>();
MaxProgress = 100;
Progress = 50;
//PrintProgress = $"[100/4] B23060512345678910001";
State = "Green";
ErrorNum = 0;
printState = PrintState.Printing;
isPrint=true;
StopOrStart = "暂停";
OperateEnabled = "True";
// 非阻塞打印
Task.Run(async () =>
{
await ExecPrintAsync(productCode, materialCode, materialName, 0); ;
});
}
#region 选中订单参数
@ -54,25 +85,107 @@ namespace Aucma.Core.PrintTo.ViewModels
public int PrintAmount { get => _printAmount; set => SetProperty(ref _printAmount, value); }
#endregion
#region 异常数量
private int _errorNum;
public int ErrorNum { get => _errorNum; set => SetProperty(ref _errorNum, value); }
#endregion
#region 打印进度
private string _printProgress;
public string PrintProgress { get => _printProgress; set => SetProperty(ref _printProgress, value); }
#endregion
#region 进度条最大值
private int _maxProgress;
public int MaxProgress { get => _maxProgress; set => SetProperty(ref _maxProgress, value); }
#endregion
#region 进度条进度
private int _progress;
public int Progress { get => _progress; set => SetProperty(ref _progress, value); }
#endregion
#region 暂停打印、取消打印
#region 打印状态
private string _state;
public string State { get => _state; set => SetProperty(ref _state, value); }
#endregion
#region 开启、暂停状态按钮 名称
private string _stopOrStart;
public string StopOrStart { get => _stopOrStart; set => SetProperty(ref _stopOrStart, value); }
#endregion
#region 操作打印按钮状态
private string _operateEnabled;
public string OperateEnabled
{
get { return _operateEnabled; }
set
{
_operateEnabled = value;
OnPropertyChanged();//属性通知
}
}
#endregion
#endregion
#region 暂停打印、关闭界面
[RelayCommand]
public void Operate(string param)
public void Operate()
{
if (string.IsNullOrEmpty(param)) return;
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
{
if (printState == PrintState.Completetd)
{
isPrint = false;
StopOrStart = "已完成";
MessageBox.Show("打印已完成", "系统提醒");
return;
}
if (isPrint&& printState == PrintState.Printing)
{
if (MessageBox.Show("确定要暂停打印吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
{
isPrint = false;
printState = PrintState.Paused;
StopOrStart = "继续";
}
}
else
{
if (MessageBox.Show("确定要继续打印吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
{
isPrint = true;
printState = PrintState.Printing;
State = "Green";
StopOrStart = "暂停";
}
}
}));
switch (param)
}
[RelayCommand]
public void CloseWindow(object parameter)
{
var window = parameter as Window;
if (window == null) return;
// $"还有【{BarcodesUnprinted.Count}】个条码未打印。确定要退出打印?"
if (MessageBox.Show("确定要退出打印吗?", "系统提醒", MessageBoxButton.YesNo, MessageBoxImage.Question, MessageBoxResult.No) == MessageBoxResult.Yes)
{
case "Suspend":
MessageBox.Show("暂停打印中....","系统信息");
break;
case "Cancel":
MessageBox.Show("取消打印中....","系统信息");
break;
default:
break;
if (printState == PrintState.Printing) MessageBox.Show("请暂停打印后关闭打印界面吗?", "系统提醒");
printState = PrintState.Stopped;
WeakReferenceMessenger.Default.Send<string>("Refresh");//刷新窗口
window.Close();
}
}
#endregion
@ -85,17 +198,131 @@ namespace Aucma.Core.PrintTo.ViewModels
/// <param name="orderNo"></param>
/// <param name="materialName"></param>
/// <param name="planAmount"></param>
public void ExecPrint(string orderNo, string materialName, int planAmount)
public async Task ExecPrintAsync(string orderNo, string materialCode, string materialName, int planAmount)
{
string printer = "ZDesigner ZT411-300dpi ZPL";
orderNo = "11219219";
materialName = "BCD-610";//物料名称
string barCode = "B23102383055009730507";
PrintHelper.Print(printer, orderNo, materialName, barCode);
var boxList = await _orderBomInfoServices.QueryAsync(d => d.ParentId == orderNo&&d.MaterialName.Contains("箱体"));
if (boxList.Count == 0)
{
MessageBox.Show("无法查询打印条码数据", "系统提醒");
return;
}
var list = await _orderBomInfoServices.QueryAsync(d => d.ParentId == orderNo && d.MaterialName.Contains("内胆"));
if (list.Count == 0)
{
MessageBox.Show("无法查询打印条码数据", "系统提醒");
return;
}
list.ForEach(d => BarcodesUnprinted.Enqueue(d));
await Print(printer);
}
#endregion
public Task Print(string printer)
{
try
{
int printNum = BarcodesUnprinted.Count;//打印数
int i=0;
MaxProgress = printNum;
ErrorNum = 0;
while (BarcodesUnprinted.Count > 0)
{
if (printState == PrintState.Paused)
{
SetPaused();
continue;
}
if (printState == PrintState.Completetd) break;
try
{
var item = BarcodesUnprinted.Peek();
////对接打印机
//Report barReport = new Report();
//barReport.Load(System.Environment.CurrentDirectory + @"\Report\MaterialBar.frx");//打印报表位置
//// 设置打印机和打印选项
//barReport.PrintSettings.ShowDialog = false; // 是否打开打印机选择框
//barReport.PrintSettings.Printer = printer; // 设置打印机名称
//barReport.PrintSettings.Copies = 1; // 设置打印份数
// //barReport.PrintSettings.PageRange = "1-3"; // 设置打印页范围
//barReport.SetParameterValue("BoxBarData.Order_No", orderNo);//订单码
//barReport.SetParameterValue("BoxBarData.Order_Material_Name", materialName);//物料名称
//barReport.SetParameterValue("BoxBarData.Bar_Code", barCode);//二维码
////barReport.Prepare();
////string BarPath = System.Environment.CurrentDirectory + @"\pdf\" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".pdf";
////barReport.Export(new PDFExport(), BarPath);
//barReport.Print();
if (item.MaterialName.Contains("箱体"))
{
Console.WriteLine(item.MaterialName);
PrintProgress = $"[{printNum}/{i}] B{DateTime.Now.ToString("yyMMdd")}1234567890000{i + 1}";
Console.WriteLine($"B{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}{i + 1}");
}
if (item.MaterialName.Contains("内胆"))
{
Console.WriteLine(item.MaterialName);
PrintProgress = $"[{printNum}/{i}] B{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}0000{i + 1}";
Console.WriteLine($"L{DateTime.Now.ToString("yyMMdd")}{item.MaterialCode}0000{i + 1}");
}
BarcodesPrinted.Enqueue(BarcodesUnprinted.Dequeue());
i++;
Progress = i;
Thread.Sleep(1000);
}
catch (Exception ex)
{
log.Error($"打印出错:{ex.Message}");
ErrorNum++;
}
}
//打印完成
SetCompletetd();
return Task.FromResult(true);
}
catch (Exception ex)
{
log.Error($"打印出错:{ex.Message}");
return Task.FromResult(false);
}
}
#region 暂停
/// <summary>
/// 暂停
/// </summary>
private void SetPaused()
{
printState = PrintState.Paused;
State = "yellow";
StopOrStart = "继续";
isPrint = false;
}
#endregion
#region 完成
/// <summary>
/// 暂停
/// </summary>
private void SetCompletetd()
{
printState = PrintState.Completetd;
State = "Green";
StopOrStart = "已完成";
isPrint = false;
OperateEnabled = "True";
}
#endregion
}
}

@ -5,7 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
mc:Ignorable="d"
d:DesignHeight="600"
d:DesignHeight="800"
d:DesignWidth="1500">
<UserControl.Resources>
<Style x:Key="DataGridTextColumnCenterSytle" TargetType="{x:Type TextBlock}">
@ -172,7 +172,7 @@
ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single"
SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
<DataGrid.Columns>
<DataGridTextColumn MinWidth="160" Binding="{Binding CreatedTime}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="160" Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd HH:mm\}}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="110" Binding="{Binding OrderCode}" Header="订单编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="110" Binding="{Binding ProductCode}" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="200" Binding="{Binding ProductName}" Header="产品名称" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
@ -181,9 +181,9 @@
<DataGridTextColumn MinWidth="100" Binding="{Binding ErrorNum}" Header="异常量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="120" Binding="{Binding LinerCodeNum}" Header="内胆码已打量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="120" Binding="{Binding BoxCodeNum}" Header="U壳码已打量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="110" Binding="{Binding MaterialCode}" Header="物料编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn MinWidth="110" Binding="{Binding MaterialCode}" Header="物料编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="200" Binding="{Binding MaterialName}" Header="物料名称" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="200" Binding="{Binding StandardAmount}" Header="物料数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn MinWidth="200" Binding="{Binding StandardAmount}" Header="物料数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
</DataGrid.Columns>
</DataGrid>
</UniformGrid>
@ -204,7 +204,7 @@
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0 15">
<TextBlock Text="产品编码" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<TextBox x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0 " FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="300"
<TextBox x:Name="ProductNo" Foreground="white" Text="{Binding SelectedItem.ProductCode, ElementName=dgvMH}" IsReadOnly="True" Margin="15 0 0 0 " FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" Width="400"
materialDesign:HintAssist.Hint="产品编码" />
</WrapPanel>
@ -222,14 +222,14 @@
<TextBlock Text="打印数量" FontSize="15" Foreground="white" HorizontalAlignment="Center" VerticalAlignment="Center" />
<!--<TextBox x:Name="PlanAmount" Foreground="white" Text="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Margin="15 0 0 0" FontSize="15" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Width="{Binding Path=ActualWidth, ElementName=ProductNo}"
materialDesign:HintAssist.Hint="打印数量"/>-->
<Slider x:Name="PlanAmount" Minimum="0" Maximum="500" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" FontSize="15" Width="240"/>
<Slider x:Name="PlanAmount" Minimum="0" Maximum="500" Value="{Binding SelectedItem.StandardAmount, ElementName=dgvMH}" Foreground="white" Height="30" VerticalContentAlignment="Center" HorizontalContentAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15 0 0 0" FontSize="15" Width="340"/>
<TextBlock Text="1~500" Width="50" Margin="10 0 0 0" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</WrapPanel>
<Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="30 5" >
<Border Grid.Row="4" BorderBrush="#0288d1" BorderThickness="1" CornerRadius="5" Margin="100 5" >
<StackPanel >
<WrapPanel Height="110">
<WrapPanel Height="300">
<RadioButton Content="内胆码-L" Foreground="white" FontSize="15" x:Name="内胆" Margin="10 5" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name, ElementName=内胆}"/>
<RadioButton Content="箱体码-B" Foreground="white" FontSize="15" x:Name="U壳" Margin="10 5" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name,ElementName=U壳}"/>
<RadioButton Content="箱体码-B" Foreground="white" FontSize="15" x:Name="箱体" Margin="10 5" Command="{Binding RadioQueryCommand}" CommandParameter="{Binding Name, ElementName=箱体}"/>
</WrapPanel>
<!--<Button Content="添加" Foreground="White" BorderBrush="#0288d1" Background="#4285DE" HorizontalAlignment="Right" VerticalAlignment="Bottom" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />-->
</StackPanel>
@ -237,14 +237,14 @@
<WrapPanel Grid.Row="5" HorizontalAlignment="Center">
<Button
Background="#4285DE"
Content="打印" Width="100" Margin="0 10 0 0" Command="{Binding PrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"/>
Content="常规" Width="100" Margin="0 10 0 0" Command="{Binding PrintCommand}" IsEnabled="{Binding PrintIsEnabled}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"/>
<Button
Background="#4285DE"
Content="补打" Margin="10 10 0 0" Width="100" Command="{Binding SupplementPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE"
Content="续打" Margin="10 10 0 0" Width="100" Command="{Binding SupplementPrintCommand}"
Content="特殊" Margin="10 10 0 0" Width="100" Command="{Binding SupplementPrintCommand}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"/>
<Button
Background="#4285DE"

@ -5,8 +5,8 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
mc:Ignorable="d"
Background="#0C4CA3"
Title="打印" Height="500" Width="500">
Background="#0C4CA3" Name="window"
Title="打印" Height="500" Width="500" WindowStartupLocation="CenterScreen" WindowStyle="None">
<Grid Margin="15">
<Grid.RowDefinitions>
@ -26,16 +26,16 @@
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="物料编号" FontSize="15" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox FontSize="15" Text="{Binding ProductCode}" Width="200" Foreground="White" Margin="15 0 0 0" VerticalAlignment="Center" IsReadOnly="True"/>
<TextBox FontSize="15" Text="{Binding ProductCode}" Width="300" Foreground="White" Margin="15 0 0 0" VerticalAlignment="Center" IsReadOnly="True"/>
</WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="物料名称" FontSize="15" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Text="{Binding MaterialName}" FontSize="15" Width="200" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
<TextBox Text="{Binding MaterialName}" FontSize="15" Width="300" Foreground="White" Margin="15 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
</WrapPanel>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
<!--<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="打印数量" FontSize="15" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Text="{Binding PrintAmount}" FontSize="15" Width="200" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
</WrapPanel>
<TextBox Text="{Binding PrintAmount}" FontSize="15" Width="250" Foreground="White" Margin="15 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
</WrapPanel>-->
</Grid>
</GroupBox>
</UniformGrid>
@ -50,21 +50,21 @@
</Grid.RowDefinitions>
<WrapPanel Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="打印进度" FontSize="15" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Text="SC-12345678" FontSize="15" Width="100" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
<ProgressBar Style="{x:Null}" Height="15" Minimum="1" Maximum="{Binding MaxProgress}" Value="{Binding Progress}" Width="300" Margin="5"/>
</WrapPanel>
<WrapPanel Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="打印信息" FontSize="15" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBox Text="SC-12345678" FontSize="15" Width="100" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
<TextBox Text="{Binding PrintProgress}" FontSize="15" Width="300" Foreground="White" Margin="10 0 0 0" HorizontalAlignment="Center" VerticalAlignment="Center" IsReadOnly="True"/>
</WrapPanel>
<WrapPanel Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center">
<TextBlock Text="打印状态:" FontSize="15" Foreground="White" Margin="5"/>
<TextBlock Text="SC-12345678" FontSize="15" Margin="5" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="异常数量:" Margin="5" FontSize="15" Foreground="White"/>
<TextBlock Text="0" FontSize="15" Margin="5" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="打印状态" FontSize="15" Foreground="White" Margin="5"/>
<TextBlock FontSize="15" Margin="10 0" Background="{Binding State}" Width="20" Height="20" HorizontalAlignment="Center" VerticalAlignment="Center"/>
<TextBlock Text="异常条码数量:" Margin="5" FontSize="15" Foreground="White"/>
<TextBlock Text="{Binding ErrorNum}" FontSize="15" Margin="10 0" Width="150" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center"/>
</WrapPanel>
<WrapPanel Grid.Row="3" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Content="暂停" x:Name="Suspend" Margin="20 0" Command="{Binding OperateCommand}" CommandParameter="{Binding Name,ElementName=Suspend}" />
<Button Content="取消" x:Name="Cancel" Margin="20 0" Command="{Binding OperateCommand}" CommandParameter="{Binding Name,ElementName=Cancel}" />
<Button Content="{Binding StopOrStart}" x:Name="Suspend" Margin="20 0" Command="{Binding OperateCommand}" IsEnabled="{Binding OperateEnabled}" />
<Button Content="关闭" x:Name="Close" Margin="20 0" Command="{Binding CloseWindowCommand}" CommandParameter="{Binding ElementName=window}" />
</WrapPanel>
</Grid>
</GroupBox>

@ -54,7 +54,7 @@ namespace Aucma.Core.PrintTo {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/app.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/app.xaml", System.UriKind.Relative);
#line 1 "..\..\..\App.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -384,3 +384,204 @@ D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Cor
D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.RunPlc.dll
D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PLc.pdb
D:\gitea\AUCMA\AUCMA_SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.RunPlc.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\appsettings.json
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Log4net.config
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Report\MaterialBar.frx
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.exe
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.deps.json
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.runtimeconfig.json
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PrintTo.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AspNetCoreRateLimit.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.Extensions.DependencyInjection.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Autofac.Extras.DynamicProxy.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AutoMapper.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\AutoMapper.Extensions.Microsoft.DependencyInjection.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Castle.Core.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\CommunityToolkit.Mvvm.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Consul.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Elasticsearch.Net.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\InitQ.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\log4net.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MaterialDesignColors.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MaterialDesignThemes.Wpf.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.AspNetCore.Authentication.JwtBearer.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Data.SqlClient.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Data.Sqlite.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Abstractions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Binder.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.FileExtensions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Configuration.Json.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyInjection.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyInjection.Abstractions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.DependencyModel.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileProviders.Abstractions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileProviders.Physical.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.FileSystemGlobbing.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Logging.Log4Net.AspNetCore.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Options.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Options.ConfigurationExtensions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Extensions.Primitives.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Identity.Client.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.JsonWebTokens.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Logging.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Protocols.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.IdentityModel.Tokens.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.OpenApi.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Win32.SystemEvents.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Microsoft.Xaml.Behaviors.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.AspNetCore.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.AspNetCore.Mvc.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MiniProfiler.Shared.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MySqlConnector.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Newtonsoft.Json.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Npgsql.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OOXML.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OpenXml4Net.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.OpenXmlFormats.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\NPOI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Oracle.ManagedDataAccess.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Pipelines.Sockets.Unofficial.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Polly.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\BouncyCastle.Crypto.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Quartz.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\RabbitMQ.Client.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Scrutor.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.AspNetCore.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Extensions.Hosting.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Extensions.Logging.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Formatting.Compact.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Formatting.Elasticsearch.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Settings.Configuration.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Console.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Debug.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.Elasticsearch.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.File.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Serilog.Sinks.PeriodicBatching.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\ICSharpCode.SharpZipLib.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.batteries_v2.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.core.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SQLitePCLRaw.provider.e_sqlite3.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\SqlSugar.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\DmProvider.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Kdbndp.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\StackExchange.Redis.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Filters.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Filters.Abstractions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.Swagger.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.SwaggerGen.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Swashbuckle.AspNetCore.SwaggerUI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Diagnostics.PerformanceCounter.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.DirectoryServices.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.DirectoryServices.Protocols.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Drawing.Common.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.IdentityModel.Tokens.Jwt.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Runtime.Caching.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Text.Encodings.Web.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\System.Text.Json.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\UAParser.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm\native\Microsoft.Data.SqlClient.SNI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm64\native\Microsoft.Data.SqlClient.SNI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x86\native\Microsoft.Data.SqlClient.SNI.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\Microsoft.Win32.SystemEvents.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-arm\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-arm64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\alpine-x64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-arm\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-arm64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-armel\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-mips64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-arm\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-arm64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-musl-x64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-ppc64le\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-s390x\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-x64\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux-x86\native\libe_sqlite3.so
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\maccatalyst-arm64\native\libe_sqlite3.dylib
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\maccatalyst-x64\native\libe_sqlite3.dylib
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx-arm64\native\libe_sqlite3.dylib
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx-x64\native\libe_sqlite3.dylib
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm\native\e_sqlite3.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-arm64\native\e_sqlite3.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x64\native\e_sqlite3.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win-x86\native\e_sqlite3.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.Diagnostics.PerformanceCounter.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.DirectoryServices.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\linux\lib\net6.0\System.DirectoryServices.Protocols.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\osx\lib\net6.0\System.DirectoryServices.Protocols.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.DirectoryServices.Protocols.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\net6.0\System.Drawing.Common.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\win\lib\netstandard2.0\System.Runtime.Caching.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Common.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.EventBus.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Extensions.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IRepository.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IService.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Repository.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Serilog.Es.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Service.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Tasks.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PLc.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.RunPlc.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.Scanner.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.Bars.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\FastReport.Editor.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\HslCommunication.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\MvCodeReaderSDK.Net.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Extensions.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Common.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.EventBus.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IRepository.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.IService.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Model.xml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Repository.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Serilog.Es.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Service.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Admin.Core.Tasks.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.PLc.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.RunPlc.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\bin\Debug\net6.0-windows\Aucma.Core.Scanner.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.AssemblyReference.cache
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Assets\Styles\DefaultStyles.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\IndexPage.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\MainWindow.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\ButtomPageView.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\HomeWindowView.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\IndexPage.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\MainWindow.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\PrintToDevView.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\SupplementPrintPageView.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\App.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_Content.g.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_MarkupCompile.cache
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo_MarkupCompile.lref
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\App.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\ButtomPageView.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\HomeWindowView.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\PrintToDevView.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Views\SupplementPrintPageView.baml
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.g.resources
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.GeneratedMSBuildEditorConfig.editorconfig
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.AssemblyInfoInputs.cache
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.AssemblyInfo.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.CoreCompileInputs.cache
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.csproj.CopyComplete
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\refint\Aucma.Core.PrintTo.dll
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.pdb
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\Aucma.Core.PrintTo.genruntimeconfig.cache
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\ref\Aucma.Core.PrintTo.dll

@ -16,8 +16,8 @@
}
],
"additionalProbingPaths": [
"C:\\Users\\Robin\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\Robin\\.nuget\\packages"
"C:\\Users\\admin\\.dotnet\\store\\|arch|\\|tfm|",
"C:\\Users\\admin\\.nuget\\packages"
],
"configProperties": {
"Microsoft.NETCore.DotNetHostPolicy.SetAppPaths": true

@ -1,7 +1,7 @@
Aucma.Core.PrintTo
1.0.0.0
winexe
exe
C#
.cs
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\obj\Debug\net6.0-windows\
@ -12,7 +12,7 @@ TRACE;DEBUG;NET;NET6_0;NETCOREAPP
D:\Project\gitea\AUCMA\SCADA\Aucma.Core.PrintTo\App.xaml
7-1193702131
21064389523
22538831302
25-22781981
418350597904
Assets\Styles\DefaultStyles.xaml;Views\ButtomPageView.xaml;Views\HomeWindowView.xaml;Views\IndexPage.xaml;Views\MainWindow.xaml;Views\PrintToDevView.xaml;Views\SupplementPrintPageView.xaml;

@ -102,7 +102,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/buttompageview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/buttompageview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\ButtomPageView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -57,7 +57,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/homewindowview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/homewindowview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\HomeWindowView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "49B8D33C44FF5BE7A6DA9454A1A230A69D48EF73"
#pragma checksum "..\..\..\..\Views\IndexPage.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "02BEE2CDBE6A899546CAF5985066D03B976B7DDD"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -111,7 +111,7 @@ namespace Aucma.Core.PrintTo.Views {
#line 232 "..\..\..\..\Views\IndexPage.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.RadioButton U;
internal System.Windows.Controls.RadioButton ;
#line default
#line hidden
@ -128,7 +128,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/indexpage.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/indexpage.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\IndexPage.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
@ -171,7 +171,7 @@ namespace Aucma.Core.PrintTo.Views {
this. = ((System.Windows.Controls.RadioButton)(target));
return;
case 9:
this.U = ((System.Windows.Controls.RadioButton)(target));
this. = ((System.Windows.Controls.RadioButton)(target));
return;
}
this._contentLoaded = true;

@ -96,7 +96,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/mainwindow.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/mainwindow.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\MainWindow.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7CF668107A7F5DD8BEEDF90E48056C5BBCAABAF"
#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8BD2002201776C271F7EBE00E754D9A9E188471"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,6 +43,14 @@ namespace Aucma.Core.PrintTo.Views {
public partial class PrintToDevView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Aucma.Core.PrintTo.Views.PrintToDevView window;
#line default
#line hidden
#line 66 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Suspend;
@ -53,7 +61,7 @@ namespace Aucma.Core.PrintTo.Views {
#line 67 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Cancel;
internal System.Windows.Controls.Button Close;
#line default
#line hidden
@ -70,7 +78,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/printtodevview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/printtodevview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\PrintToDevView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);
@ -89,10 +97,13 @@ namespace Aucma.Core.PrintTo.Views {
switch (connectionId)
{
case 1:
this.Suspend = ((System.Windows.Controls.Button)(target));
this.window = ((Aucma.Core.PrintTo.Views.PrintToDevView)(target));
return;
case 2:
this.Cancel = ((System.Windows.Controls.Button)(target));
this.Suspend = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Close = ((System.Windows.Controls.Button)(target));
return;
}
this._contentLoaded = true;

@ -113,7 +113,7 @@ namespace Aucma.Core.PrintTo.Views {
return;
}
_contentLoaded = true;
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;V1.0.0.0;component/views/supplementprintpageview.xaml", System.UriKind.Relative);
System.Uri resourceLocater = new System.Uri("/Aucma.Core.PrintTo;component/views/supplementprintpageview.xaml", System.UriKind.Relative);
#line 1 "..\..\..\..\Views\SupplementPrintPageView.xaml"
System.Windows.Application.LoadComponent(this, resourceLocater);

@ -1,4 +1,4 @@
#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D7CF668107A7F5DD8BEEDF90E48056C5BBCAABAF"
#pragma checksum "..\..\..\..\Views\PrintToDevView.xaml" "{ff1816ec-aa5e-4d10-87f7-6f4963833460}" "D8BD2002201776C271F7EBE00E754D9A9E188471"
//------------------------------------------------------------------------------
// <auto-generated>
// 此代码由工具生成。
@ -43,6 +43,14 @@ namespace Aucma.Core.PrintTo.Views {
public partial class PrintToDevView : System.Windows.Window, System.Windows.Markup.IComponentConnector {
#line 8 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Aucma.Core.PrintTo.Views.PrintToDevView window;
#line default
#line hidden
#line 66 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Suspend;
@ -53,7 +61,7 @@ namespace Aucma.Core.PrintTo.Views {
#line 67 "..\..\..\..\Views\PrintToDevView.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Button Cancel;
internal System.Windows.Controls.Button Close;
#line default
#line hidden
@ -89,10 +97,13 @@ namespace Aucma.Core.PrintTo.Views {
switch (connectionId)
{
case 1:
this.Suspend = ((System.Windows.Controls.Button)(target));
this.window = ((Aucma.Core.PrintTo.Views.PrintToDevView)(target));
return;
case 2:
this.Cancel = ((System.Windows.Controls.Button)(target));
this.Suspend = ((System.Windows.Controls.Button)(target));
return;
case 3:
this.Close = ((System.Windows.Controls.Button)(target));
return;
}
this._contentLoaded = true;

Loading…
Cancel
Save