diff --git a/Admin.Core.Api/Admin.Core.Model.xml b/Admin.Core.Api/Admin.Core.Model.xml index 9408fbfb..d88db4ca 100644 --- a/Admin.Core.Api/Admin.Core.Model.xml +++ b/Admin.Core.Api/Admin.Core.Model.xml @@ -491,6 +491,76 @@ 是否已下达计划（0-是，1-否） + + + 班组信息 + + + + + 主键标识 + + + + + 班组编号 + + + + + 班组名称 + + + + + 班组负责人 + + + + + 所属产线/工位 + + + + + 是否标识 + + + + + 创建人 + + + + + 创建时间 + + + + + 更新人 + + + + + 更新时间 + + + + + 开始时间 + + + + + 结束时间 + + + + + 吃饭时间 + + 接收从条码系统获取的校验字符串 @@ -6226,6 +6296,11 @@ 创建时间 + + + 订单开始时间 + + 分舵获取成品下线所有类型 @@ -6321,11 +6396,6 @@ 返修措施 - - - 返修结果 - - 检验班组 @@ -6346,21 +6416,6 @@ 工位编码 - - - 返工编码 - - - - - 完成时间 - - - - - 完成标识 - - 完成时间 diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs index 18bf8b1e..10c203b5 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Common")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache index 995ca22e..4aa396ca 100644 --- a/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache +++ b/Admin.Core.Common/obj/Debug/net6.0/Admin.Core.Common.AssemblyInfoInputs.cache @@ -1 +1 @@ -fcc46a057f74d4423aec30334d3ddd5e97836b3d033f03b2c5595ccb518c54d1 +710cc7789d792a7b8161878623ee988ba7cb8242bc99df7e3be1fe877fdd0cc0 diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs index 9ece6d83..7043155c 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.EventBus")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache index e771546d..9885be0a 100644 --- a/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache +++ b/Admin.Core.EventBus/obj/Debug/net6.0/Admin.Core.EventBus.AssemblyInfoInputs.cache @@ -1 +1 @@ -db0ec7b97f8779665e1ec08cc714382e10cfd45db264244ce5d0133feee1686e +d98cc14f8bd822d72d804b2554f56ec60713f4f4561d2fbbf5e5e0b21d74633a diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs index 4ea04948..6de6b6c8 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Extensions")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache index d4af6c52..660ff386 100644 --- a/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache +++ b/Admin.Core.Extensions/obj/Debug/net6.0/Admin.Core.Extensions.AssemblyInfoInputs.cache @@ -1 +1 @@ -afc6469c2cf36aee15a6f573d13a18a2a3bc6651c31f1b0e56a41ef757faf3fc +8a9f89bda8e5afd54106e50f45b822b221777b6a2a2d8effbc99c95f74a3d66e diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs index da7a0d1f..bbc0b83e 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.FrameWork")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache index 232df838..30a1cd46 100644 --- a/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache +++ b/Admin.Core.FrameWork/obj/Debug/netcoreapp3.1/Admin.Core.FrameWork.AssemblyInfoInputs.cache @@ -1 +1 @@ -498bcbd8bc47ba72111fad9a44918162edd56a33e0dd90e98dc3393bcc551bc9 +88206fa803182f9a1db66b51ed570f797407da9eb9156f545e8a48f7790eafa8 diff --git a/Admin.Core.IRepository/IRepository_New/IBaseTeamMembersRepository.cs b/Admin.Core.IRepository/IRepository_New/IBaseTeamMembersRepository.cs new file mode 100644 index 00000000..f6b7f61e --- /dev/null +++ b/Admin.Core.IRepository/IRepository_New/IBaseTeamMembersRepository.cs @@ -0,0 +1,13 @@ +using Admin.Core.Model.Model_New; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.IRepository.IRepository_New +{ + public interface IBaseTeamMembersRepository : IBaseRepository + { + } +} diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs index 2f9bc9ae..586c49bc 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache index b489aa31..8aca6d4c 100644 --- a/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache +++ b/Admin.Core.IRepository/obj/Debug/net6.0/Admin.Core.IRepository.AssemblyInfoInputs.cache @@ -1 +1 @@ -29ef1467794079bbd76fd0bae6e8c42700c15a70abd6b0da13de940a0e65c91c +f98e4b67bad7fcc3b681493fdef3ee63574c10b03944d9084c9aee617b67a371 diff --git a/Admin.Core.IService/IService_New/IBaseTeamMembersServices.cs b/Admin.Core.IService/IService_New/IBaseTeamMembersServices.cs new file mode 100644 index 00000000..d2f8ca79 --- /dev/null +++ b/Admin.Core.IService/IService_New/IBaseTeamMembersServices.cs @@ -0,0 +1,17 @@ +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Admin.Core.IService +{ + /// + /// IBaseBomInfoServices + /// + public interface IBaseTeamMembersServices : IBaseServices + { + + } +} \ No newline at end of file diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs index 7f22fb9b..10f24a66 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.IService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache index 64a5a3e3..f46ba67b 100644 --- a/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache +++ b/Admin.Core.IService/obj/Debug/net6.0/Admin.Core.IService.AssemblyInfoInputs.cache @@ -1 +1 @@ -ea5d693d67f16b80f472915c7421f247c159f2a887da000d8ed99161bf3e9660 +40b85944d2b7cb9c168e58ea550c96df1adc14326092bea67d27965860a6fcdc diff --git a/Admin.Core.Model/Model_New/BaseTeamMembers.cs b/Admin.Core.Model/Model_New/BaseTeamMembers.cs new file mode 100644 index 00000000..d81f2c37 --- /dev/null +++ b/Admin.Core.Model/Model_New/BaseTeamMembers.cs @@ -0,0 +1,92 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Admin.Core.Model.Model_New +{ + /// + /// 班组信息 + /// + [SugarTable("BASE_TEAMMEMBERS", "AUCMA_MES")] + public class BaseTeamMembers + { + /// + /// 主键标识 + /// + [SugarColumn(ColumnName = "OBJ_ID", IsPrimaryKey = true, IsIdentity = true)] + public int ObjId { get; set; } + + /// + /// 班组编号 + /// + [SugarColumn(ColumnName = "TEAM_CODE")] + public string TeamCode { get; set; } + + /// + /// 班组名称 + /// + [SugarColumn(ColumnName = "TEAM_NAME")] + public string TeamName { get; set; } + + /// + /// 班组负责人 + /// + [SugarColumn(ColumnName = "TEAM_HEAD")] + public string TeamHead { get; set; } + + /// + /// 所属产线/工位 + /// + [SugarColumn(ColumnName = "PRODUCT_LINE_CODE")] + public string ProductLineCode { get; set; } + + /// + /// 是否标识 + /// + [SugarColumn(ColumnName = "IS_FLAG")] + public int IsFlag { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "CREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "CREATED_TIME")] + public string CreatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "UPDATED_BY")] + public string UpdatedBy { get; set; } + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "UPDATED_TIME")] + public string UpdatedTime { get; set; } + /// + /// 开始时间 + /// + [SugarColumn(ColumnName = "START_TIME")] + public string StartTime { get; set; } + /// + /// 结束时间 + /// + [SugarColumn(ColumnName = "END_TIME")] + public string EndTime { get; set; } + /// + /// 吃饭时间 + /// + [SugarColumn(ColumnName = "DINE_TIME")] + public string DingTime { get; set; } + + + } +} diff --git a/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs index 14463e2e..bd738879 100644 --- a/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs +++ b/Admin.Core.Model/ViewModels/PrintPlanInfoView.cs @@ -79,5 +79,10 @@ namespace Admin.Core.Model.ViewModels /// 创建时间 /// public DateTime CreateTime { get; set; } + /// + /// 订单开始时间 + /// + public DateTime BeginDate { get; set; } + } } diff --git a/Admin.Core.Model/ViewModels/QualityView.cs b/Admin.Core.Model/ViewModels/QualityView.cs index ace5b097..5d031dd7 100644 --- a/Admin.Core.Model/ViewModels/QualityView.cs +++ b/Admin.Core.Model/ViewModels/QualityView.cs @@ -55,8 +55,8 @@ namespace Admin.Core.Model.ViewModels /// /// 返修结果 /// - [SugarColumn(ColumnName = "PROCESS_RESULT")] - public string ProcessResult { get; set; } + //[SugarColumn(ColumnName = "PROCESS_RESULT")] + //public string ProcessResult { get; set; } /// /// 检验班组 /// @@ -76,22 +76,22 @@ namespace Admin.Core.Model.ViewModels /// 工位编码 /// [SugarColumn(ColumnName = "STATION_CODE")] - public string StationCode { get; set; } + public string? StationCode { get; set; } /// /// 返工编码 /// - [SugarColumn(ColumnName = "REWORK_NUMBER")] - public int ReworkNumber { get; set; } + //[SugarColumn(ColumnName = "REWORK_NUMBER")] + //public int ReworkNumber { get; set; } /// /// 完成时间 /// - [SugarColumn(ColumnName = "FINISH_TIME")] - public DateTime FinishTime { get; set; } + //[SugarColumn(ColumnName = "FINISH_TIME")] + //public DateTime? FinishTime { get; set; } /// /// 完成标识 /// - [SugarColumn(ColumnName = "IS_FLAG")] - public int IsFlag { get; set; } + //[SugarColumn(ColumnName = "IS_FLAG")] + //public int IsFlag { get; set; } /// /// 完成时间 /// diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs index 50c19dc3..41195c21 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Model")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache index 791f38c3..0f80fa78 100644 --- a/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache +++ b/Admin.Core.Model/obj/Debug/net6.0/Admin.Core.Model.AssemblyInfoInputs.cache @@ -1 +1 @@ -72c9e287ad91d51e5aace170d0e7fe6ab88a43a94b1dd2293e14899745eb0c73 +cbfeb6f99c47ecc0d95bd63de9f865bb8070a09233dde051c5116b32ef7bd248 diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs index ab8df71b..160b6a57 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.RealTimeService")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache index 29dd9327..f7e59b13 100644 --- a/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache +++ b/Admin.Core.RealTimeService/obj/Debug/net6.0/Admin.Core.RealTimeService.AssemblyInfoInputs.cache @@ -1 +1 @@ -5143821d938a2fda9c50266408abc0e24feaedff2f8e64382cbf8979b61e232b +5c415a7f642151a4538f09537b0a7e4396e646b552652f9fa1cf5bc49761ab3b diff --git a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs index 3270eeda..45adb539 100644 --- a/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs +++ b/Admin.Core.Repository/Repository_New/BaseOrderInfoRepository.cs @@ -20,7 +20,8 @@ namespace Admin.Core.Repository { 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 WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' + 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 + WHERE SUBSTR(o.ORDER_STATUS, 0, 4)!='CLSD' and SUBSTR(o.ORDER_STATUS, 0, 4)!='TECO' and PRODUCT_LINE_NAME!='一线' "; return await Db.CopyNew().Ado.SqlQueryAsync(sql); } diff --git a/Admin.Core.Repository/Repository_New/IBaseTeamMembersRepository.cs b/Admin.Core.Repository/Repository_New/IBaseTeamMembersRepository.cs new file mode 100644 index 00000000..baf732f8 --- /dev/null +++ b/Admin.Core.Repository/Repository_New/IBaseTeamMembersRepository.cs @@ -0,0 +1,17 @@ +using Admin.Core.IRepository; +using Admin.Core.IRepository.IRepository_New; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; + +namespace Admin.Core.Repository +{ + /// + /// BaseBomInfoRepository + /// + public class BaseTeamMembersRepository : BaseRepository, IBaseTeamMembersRepository + { + public BaseTeamMembersRepository(IUnitOfWork unitOfWork) : base(unitOfWork) + { + } + } +} \ No newline at end of file diff --git a/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs b/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs index 436bda26..02eb3234 100644 --- a/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs +++ b/Admin.Core.Repository/Repository_New/TemperatureHistoryRepository.cs @@ -19,28 +19,26 @@ namespace Admin.Core.Repository public async Task> GetAllIsFlag(int objId) { - string sql = @$"SELECT TH.OBJ_ID, TH.CPNO BAR_CODE, - ML.MATERIAL_NAME, - PS.PROCESS_CODE PROCESS_CODE, - CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '2009' END TEST_ITEM_CODE, - QI.QUALITY_DEFECT_CODE, - QI.QUALITY_DEFECT_NAME, - CASE WHEN TH.CPRESULT = 'OK' THEN '3' ELSE '1' END TREATMENT_MEASURE, - CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '返修合格' END PROCESS_RESULT, - 'ZLJY-01' GROUP_CODE, - 'cwjy02' INSPECTOR_CODE, - TH.ENDDATETIME INSPECTOR_TIME, - '2009' STATION_CODE, - CASE WHEN TH.CPRESULT = 'OK' THEN 0 ELSE 1 END REWORK_NUMBER, - CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE TH.ENDDATETIME END FINISH_TIME, - 1 IS_FLAG, - SYSDATE UPDATED_TIME - FROM BOX_TEMPERATUREHISTORY TH - JOIN PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = TH.CPNO - JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE - JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2009%' - LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_NAME = TH.CPRESULT - WHERE TH.OBJ_ID = {objId}"; + string sql = @$"SELECT TH.OBJ_ID, + TH.CPNO BAR_CODE, + ML.MATERIAL_NAME, + PS.PROCESS_CODE PROCESS_CODE, + CASE WHEN TH.CPRESULT = 'OK' THEN NULL ELSE '2009' END TEST_ITEM_CODE, + QI.QUALITY_DEFECT_CODE, + QI.QUALITY_DEFECT_NAME, + CASE WHEN TH.CPRESULT = 'OK' THEN '3' ELSE '1' END TREATMENT_MEASURE, + + 'ZLJY-01' GROUP_CODE, + 'cwjy02' INSPECTOR_CODE, + TH.ENDDATETIME INSPECTOR_TIME, + '2009' STATION_CODE, + SYSDATE UPDATED_TIME +FROM BOX_TEMPERATUREHISTORY TH + JOIN PRINT_BARCODE PB ON PB.MATERIAL_BARCODE = TH.CPNO + JOIN C##AUCMA_MES.BASE_MATERIALINFO ML ON PB.MATERIAL_CODE = ML.MATERIAL_CODE + JOIN C##AUCMA_MES.BASE_PROCESS_STATION PS ON PROCESS_TYPE = 2 AND PS.PARENT_ID LIKE '%2009%' + LEFT JOIN C##AUCMA_MES.BASE_QUALITY_INSPECTION_ITEM QI ON QI.QUALITY_DEFECT_NAME = TH.CPRESULT +WHERE TH.OBJ_ID = {objId}"; return await Db.CopyNew().Ado.SqlQueryAsync(sql); } diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs index c1c1279b..954b1349 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Repository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache index 5302f1ec..4dd54153 100644 --- a/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache +++ b/Admin.Core.Repository/obj/Debug/net6.0/Admin.Core.Repository.AssemblyInfoInputs.cache @@ -1 +1 @@ -8e6cb460b9342722b005c4abba5c9c4d0eabc6f3312fccb92b2347e8fec5d042 +eb5fd61de5afc4a32fb59408f414f145351b7b3d825b7b468cc2d281d502195e diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs index 53784580..8cccb8cf 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Serilog.Es")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache index 0a5963b6..7a4d6a4d 100644 --- a/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache +++ b/Admin.Core.Serilog.Es/obj/Debug/net6.0/Admin.Core.Serilog.Es.AssemblyInfoInputs.cache @@ -1 +1 @@ -04a64d20793f571022f15e71c7a9da81adbb18f732243ae7a8ca468ef044b347 +3eb24d15e33e21def9c2c9dc2fe26b0702ddabb2012159abbededb38ec9baf2b diff --git a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs index aa425b9d..3705f181 100644 --- a/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs +++ b/Admin.Core.Service/Service_New/BaseOrderInfoServices.cs @@ -83,6 +83,7 @@ namespace Admin.Core.Service view.ProductCode = bb.MaterialCode; view.ProductName = bb.MaterialName; view.PlanAmount = bb.OrderAmount; + view.CompleteAmount = bb.CompleteAmount; //view.MaterialCode = bomInfo.MaterialCode; //view.MaterialName = bomInfo.MaterialName; //view.LinerAmount = bomInfo.StandardAmount; @@ -105,7 +106,7 @@ namespace Admin.Core.Service //view.StandardAmount = bomInfo.StandardAmount; view.PrintName = bb.PrintName; - view.CreateTime = bb.CreatedTime; + view.BeginDate = bb.BeginDate; list.Add(view); // } // tmpList.Clear(); diff --git a/Admin.Core.Service/Service_New/BaseTeamMembersServices.cs b/Admin.Core.Service/Service_New/BaseTeamMembersServices.cs new file mode 100644 index 00000000..1719cd72 --- /dev/null +++ b/Admin.Core.Service/Service_New/BaseTeamMembersServices.cs @@ -0,0 +1,32 @@ +using Admin.Core.IRepository; +using Admin.Core.IRepository.IRepository_New; +using Admin.Core.IService; +using Admin.Core.Model; +using Admin.Core.Model.Model_New; +using Admin.Core.Model.ViewModels; +using log4net; +using Microsoft.AspNetCore.Razor.TagHelpers; +using Microsoft.IdentityModel.Logging; +using NPOI.XSSF.UserModel; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace Admin.Core.Service +{ + public class BaseTeamMembersServices : BaseServices, IBaseTeamMembersServices + { + private static readonly log4net.ILog logHelper = LogManager.GetLogger(typeof(BaseTeamMembersServices)); + private readonly IBaseRepository _dal; + private readonly IBaseTeamMembersRepository _baseTeamMembersRepository; + + public BaseTeamMembersServices(IBaseRepository dal, IBaseTeamMembersRepository baseTeamMembersRepository) + { + this._dal = dal; + base.BaseDal = dal; + _baseTeamMembersRepository = baseTeamMembersRepository; + } + + } +} \ No newline at end of file diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs index 1029967e..b1028da8 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Service")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache index 2593e302..3fb47187 100644 --- a/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache +++ b/Admin.Core.Service/obj/Debug/net6.0/Admin.Core.Service.AssemblyInfoInputs.cache @@ -1 +1 @@ -44d794f0c0f6a3a0dd1c040f610c799dd1499bb06c18e0f51f48136d68feeaf9 +20586157a686248d32803e650cca9c7ada3f134ed0f97e5785f80cb2649b79b3 diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs index fe8b256a..fd6fb76a 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfo.cs @@ -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+70418500de012847aaf9a0c60e06e6b4718093b7")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+88c92776383e5fd96142ad9430d2938c2e66e194")] [assembly: System.Reflection.AssemblyProductAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyTitleAttribute("Admin.Core.Tasks")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache index 4c6ecad3..915c3da2 100644 --- a/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache +++ b/Admin.Core.Tasks/obj/Debug/net6.0/Admin.Core.Tasks.AssemblyInfoInputs.cache @@ -1 +1 @@ -50c9207d2a9cf6f934c65d914bed76058be2c858f76b32058690f13b362356f4 +5c1503dedb89991bd2182e1bc2b145043b968cf956d02765367b1c3b30262afd diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index 07e65caa..bb3b5b66 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -238,7 +238,7 @@ } ], "StoreInfo": { - "StationCode": "1004", //泡前库 + "StationCode": "1004", "ShellInventoryStoreCode": "XKK-001", "LinerInventory": "NDK-001", "AfterStoreCode": "PHK-001", @@ -246,7 +246,7 @@ "ProductlineCode": "CX_02" }, "StationInfo": { - "StationCode": "1005"//箱体发泡工位 + "StationCode": "1005" }, "IpRateLimiting": { "EnableEndpointRateLimiting": false, //False: globally executed, true: executed for each diff --git a/Aucma.Core.PrintTo/App.xaml.cs b/Aucma.Core.PrintTo/App.xaml.cs index 0793518f..58a1f7b1 100644 --- a/Aucma.Core.PrintTo/App.xaml.cs +++ b/Aucma.Core.PrintTo/App.xaml.cs @@ -25,7 +25,7 @@ namespace Aucma.Core.PrintTo var host = CreateHostBuilder(e.Args).Build();//生成宿主。 ServiceProvider = host.Services; - host.Services.GetRequiredService()?.Show(); + host.Services.GetRequiredService()?.Show(); await host.StartAsync(); } diff --git a/Aucma.Core.PrintTo/Models/OrderInfo.cs b/Aucma.Core.PrintTo/Models/OrderInfo.cs index c97157f1..1e9bfd16 100644 --- a/Aucma.Core.PrintTo/Models/OrderInfo.cs +++ b/Aucma.Core.PrintTo/Models/OrderInfo.cs @@ -16,6 +16,11 @@ namespace Aucma.Core.PrintTo.Models /// 订单日期 /// public DateTime CreatedTime { get; set; } + /// + /// 订单开始 + /// + public DateTime BeginDate { get; set; } + /// /// 产线 /// diff --git a/Aucma.Core.PrintTo/Models/Result.cs b/Aucma.Core.PrintTo/Models/Result.cs new file mode 100644 index 00000000..fba767e6 --- /dev/null +++ b/Aucma.Core.PrintTo/Models/Result.cs @@ -0,0 +1,27 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Aucma.Core.PrintTo.Models +{ + /** + * 登录返回结果 + * */ + public class Result + { + /// + /// 返回结果 + /// + public string msg { get; set; } + /// + /// 返回状态 + /// + public int code { get; set; } + /// + /// 返回令牌 + /// + public string token { get; set; } + } +} diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs index 42e6bea8..5aec517e 100644 --- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs @@ -17,7 +17,7 @@ using System.Linq; using System.Threading.Tasks; using System.Windows; -/* +/** * 首页信息 * */ @@ -29,6 +29,7 @@ namespace Aucma.Core.PrintTo.ViewModels protected readonly IBaseOrderInfoServices _baseOrderInfoServices; protected readonly IPrintBarCodeServices _printBarCodeServices; List treeNodes =new List(); + /// /// 打印类型 /// @@ -40,6 +41,7 @@ namespace Aucma.Core.PrintTo.ViewModels _printBarCodeServices = App.ServiceProvider.GetService(); PrintIsEnabled = "True"; + AppendPrintEnabled = "False"; WeakReferenceMessenger.Default.Register(this, Recive); PrintAmount = 0; LoadData(); @@ -55,12 +57,12 @@ namespace Aucma.Core.PrintTo.ViewModels if (list == null) return; list= list.Where(d=>d.PlanAmount>d.CompleteAmount).ToList(); if (list == null) return; - list = list.OrderBy(d => d.CreateTime).ToList(); + list = list.OrderByDescending(d => d.BeginDate).ToList(); var printBarCode = await _printBarCodeServices.QueryAsync(); foreach (var item in list) { OrderInfo order = new OrderInfo(); - order.CreatedTime = item.CreateTime; + order.BeginDate = item.BeginDate; order.ProductLineName = item.ProductLineName; order.OrderCode = item.OrderCode; order.ProductCode = item.ProductCode; @@ -76,6 +78,7 @@ namespace Aucma.Core.PrintTo.ViewModels order.LinerCodeNum = item.LinerAmount; order.BoxCodeNum = item.BoxAmount; order.PrintName = item.PrintName; + order.CompleteAmount = item.CompleteAmount; datalist.Add(order); } } @@ -93,7 +96,7 @@ namespace Aucma.Core.PrintTo.ViewModels foreach (var item in pintList) { OrderInfo order = new OrderInfo(); - order.CreatedTime = item.CreateTime; + order.BeginDate = item.BeginDate; order.OrderCode = item.OrderCode; order.ProductCode = item.ProductCode; order.ProductName = item.ProductName; @@ -145,6 +148,17 @@ namespace Aucma.Core.PrintTo.ViewModels #endregion + #region radio按产线查询按钮 + /// + /// 查询 + /// + [RelayCommand] + private void ProductRadioQuery(string productOne) + { + + } + #endregion + #region radio查询按钮 /// /// 查询 @@ -358,7 +372,20 @@ namespace Aucma.Core.PrintTo.ViewModels printAmount = value; SetProperty(ref printAmount, value); } - } + } + #endregion + + #region 是否启用追打按钮 + private string appendPrintEnabled; + public string AppendPrintEnabled + { + get { return appendPrintEnabled; } + set + { + appendPrintEnabled = value; + SetProperty(ref appendPrintEnabled, value); + } + } #endregion #region 常规打印按钮状态 diff --git a/Aucma.Core.PrintTo/ViewModels/LoginPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/LoginPageViewModel.cs new file mode 100644 index 00000000..64dde80c --- /dev/null +++ b/Aucma.Core.PrintTo/ViewModels/LoginPageViewModel.cs @@ -0,0 +1,114 @@ +using CommunityToolkit.Mvvm.ComponentModel; +using CommunityToolkit.Mvvm.Input; +using log4net; +using System.Windows; +using Admin.Core.Common; +using Admin.Core.IService; +using Admin.Core.Service; +using Microsoft.Extensions.DependencyInjection; +using System.Collections.ObjectModel; +using Admin.Core.Model.Model_New; +using StackExchange.Profiling.Internal; +using System; +using System.Text.Json; +using Aucma.Core.PrintTo.Models; +using System.Windows.Input; + +namespace Aucma.Core.PrintTo.ViewModels +{ + public partial class LoginPageViewModel : ObservableObject + { + private static readonly log4net.ILog log = LogManager.GetLogger(typeof(LoginPageViewModel)); + protected readonly IBaseTeamMembersServices _baseTeamMembersServices; + public LoginPageViewModel() { + _baseTeamMembersServices = App.ServiceProvider.GetService(); + AddTeamData(); + } + + #region 登录 + /// + /// 登录 + /// + /// 选择的班组信息 + /// 用户名 + /// 密码 + public void Login(BaseTeamMembers team, string userName, string passWord) + { + //获取Token + string url = $"http://10.100.72.10:8080/login"; + var content = new + { + username = userName, + password = passWord + }; + + var loginResult = HttpHelper.Post(url, content.ToJson());//发送用户名密码给API + Result result = JsonSerializer.Deserialize(loginResult); + if (result == null) + { + MessageBox.Show("登录失败！","系统提醒"); + return ; + } + if (result.code == 200) + { + //跳转 + MessageBox.Show("登录成功！", "系统提醒"); + //new MainWindowViewModel().ShowDialog(); + + return; + } + else + { + MessageBox.Show($"登录失败！{result.msg}", "系统提醒"); + return; + } + } + #endregion + + #region 关闭当前界面 + /// + /// 关闭当前界面 + /// + /// + [RelayCommand] + public void CloseWindow(object parameter) + { + var window = parameter as Window; + if (window == null) return; + + window.Close(); + } + + #endregion + + #region 班组数据 + /// + /// 班组数据 + /// + private ObservableCollection _teamMembersList = new ObservableCollection(); + public ObservableCollection TeamMembersList + { + get + { + return this._teamMembersList; + } + set + { + SetProperty(ref _teamMembersList, value); + } + } + #endregion + + #region 班组添加到集合中 + public void AddTeamData() + { + var baseTeamMembersList = _baseTeamMembersServices.QueryAsync(d => d.ProductLineCode.Contains("CX_02")).Result; + foreach (var item in baseTeamMembersList) + { + TeamMembersList.Add(item); + } + } + + #endregion + } +} \ No newline at end of file diff --git a/Aucma.Core.PrintTo/Views/IndexPageView.xaml b/Aucma.Core.PrintTo/Views/IndexPageView.xaml index f8917614..86ea1620 100644 --- a/Aucma.Core.PrintTo/Views/IndexPageView.xaml +++ b/Aucma.Core.PrintTo/Views/IndexPageView.xaml @@ -166,7 +166,10 @@