diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache index 0ec624ba..da936fdf 100644 Binary files a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache and b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.FileListAbsolute.txt b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.FileListAbsolute.txt index 9ea0d91e..d96f936f 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.FileListAbsolute.txt +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.csproj.FileListAbsolute.txt @@ -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 diff --git a/Admin.Core.IRepository/BASE/IBaseRepository.cs b/Admin.Core.IRepository/BASE/IBaseRepository.cs index 0868fb15..1bf5738e 100644 --- a/Admin.Core.IRepository/BASE/IBaseRepository.cs +++ b/Admin.Core.IRepository/BASE/IBaseRepository.cs @@ -89,6 +89,18 @@ namespace Admin.Core.IRepository /// Task UpdateAsync(TEntity entity, List lstColumns = null, List lstIgnoreColumns = null, string strWhere = ""); + /// + /// 正序查询第一条数据 + /// + /// + Task FirstAsync(); + /// + /// 根据条件查询查询第一条数据 + /// + /// + /// + Task FirstAsync(Expression> whereExpression); + /// /// 查询 /// diff --git a/Admin.Core.IRepository/IRepository_New/IOrderBomInfoRepository.cs b/Admin.Core.IRepository/IRepository_New/IOrderBomInfoRepository.cs new file mode 100644 index 00000000..421581f4 --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IOrderBomInfoRepository.cs @@ -0,0 +1,12 @@ +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.IRepository +{ + /// + /// IOrderBomInfoRepository + /// + public interface IOrderBomInfoRepository : IBaseRepository + { + } +} \ No newline at end of file diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll index de15eaef..72433867 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index b008660f..4929dde0 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IRepository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache index 29c9421f..21f4b4c5 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache index 63fe65b8..0d52dcf7 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -48f6582ad412a7c32e9164c6a334fbdc03be69d3 +d03ec43faaf2fe4c1db357961d9ae12202991526 diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll index de15eaef..72433867 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb index b008660f..4929dde0 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll index c2839376..283bd39a 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/ref/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll b/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll index c2839376..283bd39a 100644 Binary files a/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll and b/Admin.Core.IRepository/obj/Debug/net6.0/refint/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.IService/IService_New/IOrderBomInfoServices.cs b/Admin.Core.IService/IService_New/IOrderBomInfoServices.cs new file mode 100644 index 00000000..c317576b --- /dev/null +++ b/Admin.Core.IService/IService_New/IOrderBomInfoServices.cs @@ -0,0 +1,13 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.IService +{ + /// + /// IOrderBomInfoServices + /// + public interface IOrderBomInfoServices : IBaseServices + { + } +} \ No newline at end of file diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll index 9976f625..61b90290 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb index f2baf791..b541b149 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.IService/bin/Debug/net6.0/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache index 29c9421f..21f4b4c5 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache index 29d34aa6..ae62ecf6 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -e2c44537c66dd97efdfc9fe5dc384fd6bcd269ce +055d438d8e925c98b75dee9ba62a44c57a025f50 diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll index 9976f625..61b90290 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb index f2baf791..b541b149 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll index 6f17a741..651fe4f2 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/ref/Admin.Core.IService.dll differ diff --git a/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll b/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll index 6f17a741..651fe4f2 100644 Binary files a/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll and b/Admin.Core.IService/obj/Debug/net6.0/refint/Admin.Core.IService.dll differ diff --git a/Admin.Core.Model/Model_New/BaseBomInfo.cs b/Admin.Core.Model/Model_New/BaseBomInfo.cs index b35dffd1..e64086cd 100644 --- a/Admin.Core.Model/Model_New/BaseBomInfo.cs +++ b/Admin.Core.Model/Model_New/BaseBomInfo.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace Admin.Core.Model { /// - /// SAP BOM 信息 + /// 拆分的SAP BOM 信息 /// [SugarTable("BASE_BOMINFO", "AUCMA_MES")] public class BaseBomInfo @@ -72,5 +72,53 @@ namespace Admin.Core.Model /// [SugarColumn(ColumnName = "IS_FLAG")] public int IsFlag { get; set; } + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public DateTime CreatedTime { get; set; } + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public DateTime UpdatedTime { get; set; } + + /// + /// 工厂编码 + /// + [SugarColumn(ColumnName = "FACTORY_CODE")] + public string FactoryCode { get; set; } + /// + /// 排序 + /// + [SugarColumn(ColumnName = "SORT")] + public string Sort { get; set; } + /// + /// 销售凭证 + /// + [SugarColumn(ColumnName = "VBELN")] + public string Vbeln { get; set; } + /// + /// 销售单据项目 + /// + [SugarColumn(ColumnName = "VBPOS")] + public string Vbpos { get; set; } + /// + /// 祖级列表 + /// + [SugarColumn(ColumnName = "ANCESTORS")] + public string Ancestors { get; set; } + + } } diff --git a/Admin.Core.Model/Model_New/OrderBomInfo.cs b/Admin.Core.Model/Model_New/OrderBomInfo.cs new file mode 100644 index 00000000..8b516cb5 --- /dev/null +++ b/Admin.Core.Model/Model_New/OrderBomInfo.cs @@ -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 +{ + /// + /// SAP BOM 信息 + /// + [SugarTable("BASE_BOMINFO", "AUCMA_MES")] + public class OrderBomInfo + { /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)] + public int ObjId { get; set; } + + /// + /// BOM编号 + /// + [SugarColumn(ColumnName = "BOM_CODE")] + public string BomCode { get; set; } + + /// + /// 物料编号 + /// + [SugarColumn(ColumnName = "MATERIAL_CODE")] + public string MaterialCode { get; set; } + + /// + /// 物料名称 + /// + [SugarColumn(ColumnName = "MATERIAL_NAME")] + public string MaterialName { get; set; } + + /// + /// 物料类别 + /// + [SugarColumn(ColumnName = "MATERIAL_TYPE")] + public string MaterialType { get; set; } + + /// + /// 标准数量 + /// + [SugarColumn(ColumnName = "STANDARD_AMOUNT")] + public int StandardAmount { get; set; } + + /// + /// 父级编号 + /// + [SugarColumn(ColumnName = "PARENT_ID")] + public string ParentId { get; set; } + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "IS_FLAG")] + public int IsFlag { get; set; } + + } +} diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Model/bin/Debug/net6.0/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.CoreCompileInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.CoreCompileInputs.cache index d58a107b..6b126cde 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.CoreCompileInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -03a2929c8d74aec595b1ed4105ee7bf97aadcc8e +24c58aad4fe4f7fc0488429094aa0cd54a6cb1a5 diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll index decfe56d..63a1ef61 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/ref/Admin.Core.Model.dll differ diff --git a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll index decfe56d..63a1ef61 100644 Binary files a/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll and b/Admin.Core.Model/obj/Debug/net6.0/refint/Admin.Core.Model.dll differ diff --git a/Admin.Core.Repository/BASE/BaseRepository.cs b/Admin.Core.Repository/BASE/BaseRepository.cs index 31cd3d4b..696bb4c0 100644 --- a/Admin.Core.Repository/BASE/BaseRepository.cs +++ b/Admin.Core.Repository/BASE/BaseRepository.cs @@ -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(); } - + /// + /// 正序查询第一条数据 + /// + /// + public async Task FirstAsync() + { + return await _db.Queryable().FirstAsync(); + } + /// + /// 查询第一条数据 + /// + /// + /// + public async Task FirstAsync(Expression> whereExpression) + { + return await _db.Queryable().WhereIF(whereExpression != null, whereExpression).FirstAsync(); + } /// /// 根据实体删除一条数据 /// diff --git a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository - 复制.cs b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository - 复制.cs new file mode 100644 index 00000000..aeea537c --- /dev/null +++ b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository - 复制.cs @@ -0,0 +1,16 @@ +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Repository; + +namespace Admin.Core.IRepository +{ + /// + /// BaseBomInfoRepository + /// + public class BaseBomInfoRepository : BaseRepository, IBaseBomInfoRepository + { + public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs index aeea537c..390c065f 100644 --- a/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseBomInfoRepository.cs @@ -5,11 +5,11 @@ using Admin.Core.Repository; namespace Admin.Core.IRepository { /// - /// BaseBomInfoRepository + /// OrderBomInfoRepository /// - public class BaseBomInfoRepository : BaseRepository, IBaseBomInfoRepository + public class OrderBomInfoRepository : BaseRepository, IOrderBomInfoRepository { - public BaseBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + public OrderBomInfoRepository(IUnitOfWork unitOfWork) : base(unitOfWork) { } } diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll index de15eaef..72433867 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb index b008660f..4929dde0 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll index af094f4a..245962b5 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb index 26c4c9f3..22dfbe0d 100644 Binary files a/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/bin/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache index 5bed6339..4602e25d 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache index e199af30..e8b56aed 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -716a5f290029da783d21656a80fb12d097b68d9c +9b81b00b46eb03d7442abcb13b5c4d0e4eb8060a diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll index af094f4a..245962b5 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb index 26c4c9f3..22dfbe0d 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb and b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.pdb differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll index 51f643e4..a2630dd8 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/ref/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll b/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll index 51f643e4..a2630dd8 100644 Binary files a/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll and b/Admin.Core.Repository/obj/Debug/net6.0/refint/Admin.Core.Repository.dll differ diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index bfaa9f52..d151129d 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -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 bbinfolist=new List(); - public BaseOrderInfoServices(IBaseRepository dal,IBaseBomInfoRepository baseBomInfoRepository, IBaseOrderInfoRepository baseOrderInfoRepository, IPrintOrderInfoRepository printOrderInfoRepository) + private readonly IOrderBomInfoRepository _orderBomInfoRepository; + List bbinfolist=new List(); + public BaseOrderInfoServices(IBaseRepository dal,IBaseBomInfoRepository baseBomInfoRepository, + IBaseOrderInfoRepository baseOrderInfoRepository, IPrintOrderInfoRepository printOrderInfoRepository, + IOrderBomInfoRepository orderBomInfoRepository) { this._dal = dal; base.BaseDal = dal; _baseBomInfoRepository = baseBomInfoRepository; _baseOrderInfoRepository = baseOrderInfoRepository; _printOrderInfoRepository = printOrderInfoRepository; + _orderBomInfoRepository = orderBomInfoRepository; } /// - /// 获取打印订单信息 + /// 获取打印订单信息- /// /// public async Task> QueryPrintInfo() { - List list = new List(); + List list= new List(); List orderList = await _baseOrderInfoRepository.QueryAsync(); - List bomInfoList = await _baseBomInfoRepository.QueryAsync(); + List orderBomInfoList = await _orderBomInfoRepository.QueryAsync(); + //List bomInfoList = await _baseBomInfoRepository.QueryAsync(); List 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 bbList = RecursionFn(bomInfoList, bom.MaterialCode); - if (bbList != null) + List 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> QueryPrintInfo(string query){ + List list = new List(); + List list2 = new List(); + List orderList = await _baseOrderInfoRepository.QueryAsync(); + List orderBomInfoList = await _orderBomInfoRepository.QueryAsync(); + //List bomInfoList = await _baseBomInfoRepository.QueryAsync(); + List 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 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 递归列表 /// /// 递归列表 /// - public List RecursionFn(List list, string materialCode) + public List RecursionFn(List list, string materialCode) { // 得到子节点列表 - List childList = GetChildList(list, materialCode); + List childList = GetChildList(list, materialCode); childList.ForEach(c => bbinfolist.Add(c)); foreach (var tChild in childList) { @@ -123,13 +178,13 @@ namespace Admin.Core.Service /// /// /// - public List GetChildList(List list, string materialCode) + public List GetChildList(List list, string materialCode) { - List tlist = new List(); - IEnumerator it = list.Where(d => d.ParentId == materialCode).GetEnumerator(); + List tlist = new List(); + IEnumerator 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 /// /// /// - public bool HasChild(List list, string materialCode) + public bool HasChild(List list, string materialCode) { return IsExist(list, materialCode).Count > 0 ? true : false; } - public List IsExist(List list, string materialCode) + public List IsExist(List list, string materialCode) { - List tlist = list.Where(d => d.ParentId == materialCode).ToList(); + List tlist = list.Where(d => d.ParentId == materialCode).ToList(); return tlist; } #endregion diff --git a/Admin.Core.Service/Service_New/OrderBomInfoServices.cs b/Admin.Core.Service/Service_New/OrderBomInfoServices.cs new file mode 100644 index 00000000..f04ac1ca --- /dev/null +++ b/Admin.Core.Service/Service_New/OrderBomInfoServices.cs @@ -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, IOrderBomInfoServices + { + private readonly IBaseRepository _dal; + public OrderBomInfoServices(IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + } + } +} \ No newline at end of file diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll index de15eaef..72433867 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb index b008660f..4929dde0 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IRepository.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll index 9976f625..61b90290 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb index f2baf791..b541b149 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.IService.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll index a8e3e26b..c67060d0 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb index 50a70ce1..b410e9a4 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.pdb differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml index 75a76d1c..d1c58bba 100644 --- a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml +++ b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Model.xml @@ -223,7 +223,7 @@ - SAP BOM 信息 + 拆分的SAP BOM 信息 @@ -276,6 +276,51 @@ 是否标识 + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 工厂编码 + + + + + 排序 + + + + + 销售凭证 + + + + + 销售单据项目 + + + + + 祖级列表 + + SAP订单信息 @@ -426,6 +471,51 @@ 完成时间 + + + SAP BOM 信息 + + + + + 主键标识 + + + + + BOM编号 + + + + + 物料编号 + + + + + 物料名称 + + + + + 物料类别 + + + + + 标准数量 + + + + + 父级编号 + + + + + 是否标识 + + 打印条码信息 diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll index 2784ab08..d1f97d96 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb index 83882dda..d0cb81a7 100644 Binary files a/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/bin/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache index 1d3647c3..f586324b 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache index ad19fa97..4d106f7a 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -007df8ac751dc1aa88229653084844c8c834427a +6f909fda7d80d8f529de8b1193a90d62679a77b4 diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll index 2784ab08..d1f97d96 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb index 83882dda..d0cb81a7 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb and b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.pdb differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll index d3839199..d2aa48cc 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/ref/Admin.Core.Service.dll differ diff --git a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll index d3839199..d2aa48cc 100644 Binary files a/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll and b/Admin.Core.Service/obj/Debug/net6.0/refint/Admin.Core.Service.dll differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache index 2c310e0d..fcb5f750 100644 Binary files a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache and b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.AssemblyReference.cache differ diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.FileListAbsolute.txt b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.FileListAbsolute.txt index 2990102b..54825fdb 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.FileListAbsolute.txt +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.csproj.FileListAbsolute.txt @@ -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 diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache index dd5b304b..1ccd27b8 100644 Binary files a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache and b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.csproj.AssemblyReference.cache differ diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.deps.json b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.deps.json index eb5d7e62..2b393a03 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.deps.json +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.deps.json @@ -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", diff --git a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.runtimeconfig.json b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.runtimeconfig.json index 0571605e..1152362e 100644 --- a/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.runtimeconfig.json +++ b/Aucma.Core.BoxFoam/obj/Debug/net6.0-windows/Aucma.Core.BoxFoam.designer.runtimeconfig.json @@ -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 diff --git a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj index c049aac6..e6b4841f 100644 --- a/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj +++ b/Aucma.Core.PrintTo/Aucma.Core.PrintTo.csproj @@ -1,7 +1,7 @@  - WinExe + Exe net6.0-windows enable true diff --git a/Aucma.Core.PrintTo/Common/Item.cs b/Aucma.Core.PrintTo/Common/Item.cs new file mode 100644 index 00000000..b64a38bf --- /dev/null +++ b/Aucma.Core.PrintTo/Common/Item.cs @@ -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; + } + } +} diff --git a/Aucma.Core.PrintTo/Common/PrintHelper.cs b/Aucma.Core.PrintTo/Common/PrintHelper.cs index f666fb6d..d4892eee 100644 --- a/Aucma.Core.PrintTo/Common/PrintHelper.cs +++ b/Aucma.Core.PrintTo/Common/PrintHelper.cs @@ -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; } diff --git a/Aucma.Core.PrintTo/Common/PrintState.cs b/Aucma.Core.PrintTo/Common/PrintState.cs new file mode 100644 index 00000000..1dac97b0 --- /dev/null +++ b/Aucma.Core.PrintTo/Common/PrintState.cs @@ -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 + } +} diff --git a/Aucma.Core.PrintTo/Common/PrintStateColor.cs b/Aucma.Core.PrintTo/Common/PrintStateColor.cs new file mode 100644 index 00000000..5638f180 --- /dev/null +++ b/Aucma.Core.PrintTo/Common/PrintStateColor.cs @@ -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; + } +} diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index 553e9128..dd6e28ac 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -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(); _=LoadData(); + PrintIsEnabled = "True"; + WeakReferenceMessenger.Default.Register(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 刷新列表-其他界面刷新该方法 + /// + /// 刷新列表 + /// + /// + /// + private void Recive(object recipient, object message) + { + PrintIsEnabled = "True"; + Datalist.Clear(); + _=LoadData(); + } + #endregion } - } diff --git a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs index d7842620..f7587ea1 100644 --- a/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/PrintToDevViewModel.cs @@ -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 items { get; } + private Queue BarcodesUnprinted { get; } = new Queue(); + private Queue BarcodesPrinted { get; } = new Queue(); + 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(); + 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("Refresh");//刷新窗口 + window.Close(); } } #endregion @@ -85,17 +198,131 @@ namespace Aucma.Core.PrintTo.ViewModels /// /// /// - 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 暂停 + /// + /// 暂停 + /// + private void SetPaused() + { + printState = PrintState.Paused; + + State = "yellow"; + StopOrStart = "继续"; + isPrint = false; } #endregion + #region 完成 + /// + /// 暂停 + /// + private void SetCompletetd() + { + printState = PrintState.Completetd; + State = "Green"; + StopOrStart = "已完成"; + isPrint = false; + OperateEnabled = "True"; + } + #endregion } } diff --git a/Aucma.Core.PrintTo/Views/IndexPage.xaml b/Aucma.Core.PrintTo/Views/IndexPage.xaml index 46fc515b..abc581e8 100644 --- a/Aucma.Core.PrintTo/Views/IndexPage.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPage.xaml @@ -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">