liuwf 1 year ago
commit 174f60cc8c

@ -5741,6 +5741,126 @@
部门名称
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.BaseOrderInfoView">
<summary>
订单信息
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.ObjId">
<summary>
主键标识
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.OrderCode">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.SaleOrderCode">
<summary>
销售订单编号
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.SaleOrderLineNumber">
<summary>
销售订单行号
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.MaterialCode">
<summary>
物料编号
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.Matkl">
<summary>
物料组
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.OrderAmount">
<summary>
订单计划数量
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.CompleteAmount">
<summary>
完成数量
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.OrderType">
<summary>
ORDER_TYPE
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.OrderStatus">
<summary>
工单状态
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.BeginDate">
<summary>
开始日期
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.EndDate">
<summary>
结束日期
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.FactoryCode">
<summary>
工厂编码
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.IsFlag">
<summary>
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.PrintName">
<summary>
是否标识
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.CreatedBy">
<summary>
创建人
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.CreatedTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.UpdatedBy">
<summary>
更新人
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.UpdatedTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.CompleteDate">
<summary>
完成日期
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.IsRelease">
<summary>
是否已下达计划0-是1-否)
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.BaseOrderInfoView.ProductLineName">
<summary>
产线
</summary>
</member>
<member name="T:Admin.Core.Model.ViewModels.CodeBindCharts">
<summary>
条码绑定扫描类型统计
@ -6021,6 +6141,11 @@
产品编号
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.ProductLineName">
<summary>
产线
</summary>
</member>
<member name="P:Admin.Core.Model.ViewModels.PrintPlanInfoView.PlanAmount">
<summary>
订单数量

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
3c08b2a6f95957043123cba0d01dcd1675663fc7
b2f84f971a8aec41b0f1751c6b19215e6b58e1f53b994e31c5da935f50c71835

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Common
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Common\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Common\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
2af60005099f8dd0481f84ac0dfadb89cc4b6f1d
7a24981bbe7f00a048a23b0cc465b6cd8b5064dc08290337b159e8e3e2522340

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.EventBus
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.EventBus\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.EventBus\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
790ffd47e6e46a3c8a83558ad3550154a5c81377
23345160aa3ad64d7eae99fcdecbf4a96ab18a2f1cdee410e0367b155cc3cbd3

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Extensions
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Extensions\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Extensions\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88718f3b34f7734324ee7cf97223cb04de12229c")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
7d60a94dd38c10522cbfe4a021ccb6e9c5da0354
20767d7337a3656e5cd7e3434c747ce5e30a077ccc10b646dba8956b775fa268

@ -1,3 +1,9 @@
is_global = true
build_property.RootNamespace = Admin.Core.FrameWork
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.FrameWork\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.FrameWork\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -1,5 +1,6 @@
using Admin.Core.Model;
using Admin.Core.Model.Model_New;
using Admin.Core.Model.ViewModels;
using System.Collections.Generic;
using System.Threading.Tasks;
@ -10,7 +11,7 @@ namespace Admin.Core.IRepository
/// </summary>
public interface IBaseOrderInfoRepository : IBaseRepository<BaseOrderInfo>
{
Task<List<BaseOrderInfo>> GetOrderInfoData();
Task<List<BaseOrderInfoView>> GetOrderInfoData();
Task<bool> UpdatePrintName(BaseOrderInfo printName);
}
}

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
80bb097f76aa594dc58289065a284d1acbd8bdff
c803867dace4d1d3b8251fc18425f9ccac1d2b517c5bb9ff7c6c12cd96ed827b

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IRepository
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IRepository\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IRepository\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -12,7 +12,7 @@ namespace Admin.Core.IService
public interface IBaseOrderInfoServices : IBaseServices<BaseOrderInfo>
{
Task<List<PrintPlanInfoView>> QueryPrintInfo();
Task<List<BaseOrderInfo>> GetOrderInfoData();
Task<List<BaseOrderInfoView>> GetOrderInfoData();
/// <summary>
/// 更新打印名称
/// </summary>

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
51b8351ca3dc5fa8344fbf501d63c1eff37c8f9c
58bf56cbe45768ce96bb2e89a0bd5b66ec369ef5a5e9a38fc9482a549eb4cf84

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.IService
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.IService\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.IService\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -125,5 +125,6 @@ namespace Admin.Core.Model.Model_New
/// </summary>
[SugarColumn(ColumnName = "IS_RELEASE")]
public int IsRelease { get; set; }
}
}

@ -0,0 +1,136 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Admin.Core.Model.ViewModels
{
/// <summary>
/// 订单信息
/// </summary>
public class BaseOrderInfoView
{
/// <summary>
/// 主键标识
///</summary>
[SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)]
public int ObjId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
[SugarColumn(ColumnName = "ORDER_CODE")]
public string OrderCode { get; set; }
/// <summary>
/// 销售订单编号
/// </summary>
[SugarColumn(ColumnName = "SALEORDER_CODE")]
public string SaleOrderCode { get; set; }
/// <summary>
/// 销售订单行号
/// </summary>
[SugarColumn(ColumnName = "SALEORDER_LINENUMBER")]
public string SaleOrderLineNumber { 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 = "MATKL")]
public string Matkl { get; set; }
/// <summary>
/// 订单计划数量
/// </summary>
[SugarColumn(ColumnName = "ORDER_AMOUNT")]
public int OrderAmount { get; set; }
/// <summary>
/// 完成数量
/// </summary>
[SugarColumn(ColumnName = "COMPLETE_AMOUNT")]
public int CompleteAmount { get; set; }
/// <summary>
/// ORDER_TYPE
/// </summary>
[SugarColumn(ColumnName = "ORDER_TYPE")]
public string OrderType { get; set; }
/// <summary>
/// 工单状态
/// </summary>
[SugarColumn(ColumnName = "ORDER_STATUS")]
public string OrderStatus { get; set; }
/// <summary>
/// 开始日期
/// </summary>
[SugarColumn(ColumnName = "BEGIN_DATE")]
public DateTime BeginDate { get; set; }
/// <summary>
/// 结束日期
/// </summary>
[SugarColumn(ColumnName = "END_DATE")]
public DateTime EndDate { get; set; }
/// <summary>
/// 工厂编码
/// </summary>
[SugarColumn(ColumnName = "FACTORY_CODE")]
public string FactoryCode { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "IS_FLAG")]
public int IsFlag { get; set; }
/// <summary>
/// 是否标识
/// </summary>
[SugarColumn(ColumnName = "PRINT_NAME")]
public string PrintName { 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 = "COMPLETE_DATE")]
public DateTime CompleteDate { get; set; }
/// <summary>
/// 是否已下达计划0-是1-否)
/// </summary>
[SugarColumn(ColumnName = "IS_RELEASE")]
public int IsRelease { get; set; }
/// <summary>
/// 产线
/// </summary>
[SugarColumn(ColumnName = "PRODUCT_LINE_NAME")]
public string? ProductLineName { get; set; }
}
}

@ -20,6 +20,10 @@ namespace Admin.Core.Model.ViewModels
/// </summary>
public string ProductCode { get; set; }
/// <summary>
/// 产线
/// </summary>
public string ProductLineName { get; set; }
/// <summary>
/// 订单数量
/// </summary>
public int PlanAmount { get; set; } = 0;

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
ef9752cf3f9e33d53832c154eeba975830dced91
04d7d258a0c848e13c57e6f11d5074c8c05ea076312a43198d3e633e96c246dd

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88718f3b34f7734324ee7cf97223cb04de12229c")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
0868e6bde5b49a65a126b91d794e990427a11761
689391e9f973c5505f9f19ae7180cf35baa36d32cc9dacfb00d7905272e68934

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.RealTimeService
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.RealTimeService\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.RealTimeService\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -3,6 +3,7 @@ using Admin.Core.Model.Model_New;
using Admin.Core.IRepository;
using System.Collections.Generic;
using System.Threading.Tasks;
using Admin.Core.Model.ViewModels;
namespace Admin.Core.Repository
{
@ -15,10 +16,13 @@ namespace Admin.Core.Repository
{
}
public async Task<List<BaseOrderInfo>> GetOrderInfoData()
public async Task<List<BaseOrderInfoView>> GetOrderInfoData()
{
string sql = $"select DISTINCT o.* from (select r.* from BASE_ORDERINFO r left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID ";
return await Db.CopyNew().Ado.SqlQueryAsync<BaseOrderInfo>(sql);
string sql = @$" select DISTINCT o.* from (
select r.* from (select r.*,BP.PRODUCT_LINE_NAME from BASE_ORDERINFO r LEFT JOIN BASE_PRODUCTLINE BP on r.WORK_CENTER_CODE = BP.WORK_CENTER_CODE) r
left join BASE_MATERIALINFO m on r.MATERIAL_CODE=m.MATERIAL_CODE where MATERIAL_SUBCLASS='100') o left join BASE_BOMINFO b on o.MATERIAL_CODE=b.PARENT_ID
";
return await Db.CopyNew().Ado.SqlQueryAsync<BaseOrderInfoView>(sql);
}
public async Task<bool> UpdatePrintName(BaseOrderInfo printName)

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
046606c52f7e20e88e6dd5ffc01e33664c4b9ff8
6a6c491428483a984c3cac5dbc6631dd8fcbb879161ffc8f18dc73bf799f5480

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Repository
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Repository\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Repository\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
dbec6c73777a8ebf7006f00f1928199755951ac1
307c0001af8d22e34d91f9cc5e84971f77f62d421a8484bf33fcb08db05b8f4f

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Serilog.Es
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Serilog.Es\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Serilog.Es\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -46,7 +46,7 @@ namespace Admin.Core.Service
}
public async Task<List<BaseOrderInfo>> GetOrderInfoData()
public async Task<List<BaseOrderInfoView>> GetOrderInfoData()
{
return await _baseOrderInfoRepository.GetOrderInfoData();
}
@ -62,7 +62,7 @@ namespace Admin.Core.Service
List<PrintPlanInfoView> list = new List<PrintPlanInfoView>();
List<BaseBomInfo> baseBomList = await _baseBomInfoRepository.QueryAsync();
List<PrintBarCode> printBarCodeList = await _printBarCodeServices.QueryAsync();
List<BaseOrderInfo> orderList = await this.GetOrderInfoData();
List<BaseOrderInfoView> orderList = await this.GetOrderInfoData();
List<PrintOrderInfo> printOrderInfoList = await _printOrderInfoRepository.QueryAsync();
if (orderList == null) return null;
@ -78,6 +78,7 @@ namespace Admin.Core.Service
var objLiner = printBarCodeList.Where(d => d.PrintBarType == 2&& d.OrderCode == bb.OrderCode);
PrintPlanInfoView view = new PrintPlanInfoView();
view.ProductLineName = bb.ProductLineName;
view.OrderCode = bb.OrderCode;
view.ProductCode = bb.MaterialCode;
view.ProductName = bb.MaterialName;

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
ff8a17c10bdbb7dcf5bd28c26639be5ea4bbf542
992334000343f42f9bcd6757f7806a0b91621ca8fa8a14503f6542813560320d

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Service
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Service\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Service\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -67,8 +67,9 @@ namespace Admin.Core.Socket
client.Logger.Info($"{client.IP}:{client.Port} 客户端正在连接...");
return EasyTask.CompletedTask;
};//有客户端正在连接
service.Connected = (client, e) => { client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功!目前客户端连接数{service.Count}");
log.Info($"{client.IP}:{client.Port} 客户端连接成功!目前客户端连接数{service.Count}");
service.Connected = (client, e) => {
client.Logger.Info($"{client.IP}:{client.Port} 客户端连接成功!目前客户端连接数{service.Count}");
SetProdStoreClientId(client);
return EasyTask.CompletedTask;
@ -89,38 +90,38 @@ namespace Admin.Core.Socket
try
{
var mes = Encoding.UTF8.GetString(e.ByteBlock.Buffer, 0, e.ByteBlock.Len);//注意数据长度是byteBlock.Len
log.Info("原始报文:"+mes);
//心跳包
if (mes== "heartbeat")
if (mes.Contains("heartbeat"))
{
//扫码器心跳连接
client.Logger.Info($"已从{client.IP}:{client.Port}》接收到心跳信息:{mes}");
RefreshStateEvent?.Invoke(client.IP, true);
return EasyTask.CompletedTask;
}
else if (mes == "NoRead")
else if (mes.Contains("NoRead"))
{
NoReadReceiveEvent?.Invoke(client.IP);
client.Logger.Info($"未从{client.IP}:{client.Port}》接收到二维码信息{mes}");
return EasyTask.CompletedTask;
}
else
{
log.Info("条码报文:" + mes);
ReceiveCodeDelegateEvent?.Invoke(client.IP,mes);
client.Logger.Info($"已从{client.IP}:{client.Port}》接收到信息:{mes}");
}
}
catch (Exception ex)
{
client.Logger.Error($"异常:{ex.Message}");
log.Error($"异常:{ex.Message}");
}
return EasyTask.CompletedTask;
};
// service.Setup(new TouchSocketConfig()//载入配置
//service.Setup(new TouchSocketConfig()//载入配置
//.SetListenIPHosts(new IPHost[] { new IPHost($"0.0.0.0:5000") })
//.ConfigureContainer(a =>//容器的配置顺序应该在最前面
//{

@ -14,7 +14,7 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a2cd628e77d5c1a4ab182329ef387eb819edbc81")]
[assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

@ -1 +1 @@
da4240456d30e56fa6c5e71babf5565adb3e1436
f4f29f0272b6220f9b0b1162fe66def42667452c77b332a049c8625a879748e2

@ -8,4 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Admin.Core.Tasks
<<<<<<< HEAD
build_property.ProjectDir = E:\c#\AUCMA\最新代码整合\new\Admin.Core.Tasks\
=======
build_property.ProjectDir = D:\Project\gitea\AUCMA\SCADA\Admin.Core.Tasks\
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
>>>>>>> 97953438a8516959b94be7b8b7960a70eb343705

@ -160,12 +160,11 @@ namespace Aucma.Core.BoxFoam.Business
do
{
space = obj.plc.ReadInt16("DB200.438");//读取货道号大约1.5s 可以获取
Console.WriteLine($"物料入库货道:{space}");
} while (space==0);
Console.WriteLine($"物料MES码{materialBarCode}》入库货道:{space}");
logHelper.Info($"物料MES码{materialBarCode}》入库货道:{space}");
LogDelegateEvent?.Invoke($"物料MES码{materialBarCode}》物料码:{materialCode}", "White");
LogDelegateEvent?.Invoke($"物料MES码{materialBarCode}》物料码:{materialCode}》入库货道:{space}", "White");
//更新货道入库
await EnterStore(materialBarCode, space);
//更新过点数

@ -221,7 +221,7 @@
<DataGridTextColumn Binding="{Binding BarCodeCode}" Header="物料条码" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Binding="{Binding MaterialType}" Header="物料类型" Width="1*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding MaterialName}" Header="物料名称" Width="2*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" Visibility="Collapsed" />
<DataGridTextColumn Binding="{Binding SpaceCode}" Header="入库货道" Width="*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}" />
<DataGridTextColumn Binding="{Binding InStoreTime,StringFormat=\{0:yyyy-MM-dd HH:mm\}}" Header="创建时间" Width="1.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<!--<DataGridTextColumn Binding="{Binding TaskStatus}" Header="状态" Width="0.5*" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>-->
</DataGrid.Columns>

@ -28,7 +28,9 @@
<ItemGroup>
<EmbeddedResource Include="Assets\Images\favicon.ico" />
<EmbeddedResource Include="Assets\Images\log.png" />
<EmbeddedResource Include="Assets\Images\login-background.png" />
<Resource Include="Assets\Images\login-background.png">
<CopyToOutputDirectory></CopyToOutputDirectory>
</Resource>
</ItemGroup>
<ItemGroup>

@ -17,6 +17,10 @@ namespace Aucma.Core.PrintTo.Models
/// </summary>
public DateTime CreatedTime { get; set; }
/// <summary>
/// 产线
/// </summary>
public string ProductLineName { get; set; }
/// <summary>
/// 工单编码
/// </summary>
public string OrderCode { get; set; }

@ -61,6 +61,7 @@ namespace Aucma.Core.PrintTo.ViewModels
{
OrderInfo order = new OrderInfo();
order.CreatedTime = item.CreateTime;
order.ProductLineName = item.ProductLineName;
order.OrderCode = item.OrderCode;
order.ProductCode = item.ProductCode;
order.ProductName = item.ProductName;
@ -268,7 +269,7 @@ namespace Aucma.Core.PrintTo.ViewModels
///追打
/// </summary>
[RelayCommand]
private void AppendPrintPrint(string obj)
private void AppendPrint(string obj)
{
if (string.IsNullOrEmpty(obj))
{

@ -402,7 +402,7 @@ namespace Aucma.Core.PrintTo.ViewModels
log.Error($"打印出错:{ex.Message}\n{printBarCode.ToJson()}");
ErrorNum++;
}
Thread.Sleep(500);
Thread.Sleep(200);
Progress = i;
i++;
}

@ -179,8 +179,9 @@
ItemsSource="{Binding Datalist}" ColumnWidth="*" AutoGenerateColumns="False" IsReadOnly="True" CanUserAddRows="False" SelectionMode="Single"
SelectedItem="{Binding SelectedCells, Mode=OneWayToSource}">
<DataGrid.Columns>
<DataGridTextColumn Width="1.2*" Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd\}}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1.2*" Binding="{Binding OrderCode}" Header="SAP订单编号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1*" Binding="{Binding CreatedTime, StringFormat=\{0:yyy-MM-dd\}}" Header="订单日期" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="0.5*" Binding="{Binding ProductLineName}" Header="产线" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1*" Binding="{Binding OrderCode}" Header="SAP订单编号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="1.2*" Binding="{Binding ProductCode}" Header="产品编码" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="3*" Binding="{Binding ProductName}" Header="产品型号" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
<DataGridTextColumn Width="*" Binding="{Binding PlanAmount}" Header="订单数量" ElementStyle="{StaticResource DataGridTextColumnCenterSytle}"/>
@ -257,7 +258,7 @@
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE" Height="40"
Content="追加" Margin="5 10 0 0" Width="100" Command="{Binding AppendPrintPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
Content="追加" Margin="5 10 0 0" Width="100" Command="{Binding AppendPrintCommand}" CommandParameter="{Binding ElementName=ProductNo,Path=Text}"
IsEnabled="{Binding DataContext.ControlsEnabled, RelativeSource={RelativeSource FindAncestor, AncestorType=Window}}"/>
<Button
Background="#4285DE" Height="40"

@ -3,13 +3,61 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
xmlns:local="clr-namespace:Aucma.Core.PrintTo.Views"
mc:Ignorable="d"
Title="LoginPageView" Height="450" Width="800">
Title="登录"
FontFamily="Microsoft YaHei"
WindowStartupLocation="CenterScreen"
WindowStyle="ToolWindow" WindowState="Normal" ResizeMode="NoResize"
Height="600" Width="800">
<Window.Background>
<ImageBrush ImageSource="/Assets/images/login-background.png" />
<ImageBrush ImageSource="/Assets/Images/login-background.png" />
</Window.Background>
<Grid>
</Grid>
<Border Margin="5" Background="Transparent" CornerRadius="10" >
<Border.Effect>
<DropShadowEffect Color="Gray" ShadowDepth="0" BlurRadius="5" Opacity="0.3" Direction="0"></DropShadowEffect>
</Border.Effect>
<Canvas>
<StackPanel >
<Image Source="/Assets/Images/Newlog.png" Width="100" />
</StackPanel>
<materialDesign:Card Background="#fff" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="200 100"
UniformCornerRadius="15" Width="400" Height="300"
>
<materialDesign:DialogHost CloseOnClickAway="True" x:Name="DialogHost">
<StackPanel>
<TextBox Margin="0 50 0 0"
x:Name="txtUserName"
Width="300"
FontSize="12"
materialDesign:HintAssist.Hint="账号"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
Style="{StaticResource MaterialDesignOutlinedTextBox}"
>
</TextBox>
<PasswordBox
Margin="0 10 0 0"
x:Name="txtPassword"
Width="300"
FontSize="12"
materialDesign:HintAssist.Hint="密码"
BorderThickness="1"
BorderBrush="{StaticResource MaterialDesignDivider}"
Style="{StaticResource MaterialDesignOutlinedPasswordBox}"
></PasswordBox>
<Button Margin="0 20 0 0"
x:Name="loginBtn"
Style="{StaticResource MaterialDesignFlatMidBgButton}"
Width="300"
Height="53"
materialDesign:ButtonAssist.CornerRadius="10"
Content="登录"/>
</StackPanel>
</materialDesign:DialogHost>
</materialDesign:Card>
</Canvas>
</Border>
</Window>

Loading…
Cancel
Save