iWara.SCADA.Code/iWare.Wms.Application/Service/Pda/PdaService.cs
@@ -667,7 +667,7 @@ return "ä¸çº¿æå"; } /// <summary> @@ -694,6 +694,12 @@ && w.UnLineStage == PieceUnLineStage.å·²ä¸çº¿ && w.IsDeleted == false).ToListAsync(); if (db_WorkPieceOutboundList?.Count == 0) { throw Oops.Oh("没æå¯åºåºçæ°æ®ï¼"); } var queryOP80NewCodeList = db_WorkPieceOutboundList.Select(x => x.OP80NewCode).ToList(); List<WorkPieceInfo> db_WorkPieceInfoList = await _workPieceInfoRep.Where(w => queryOP80NewCodeList.Contains(w.OP80NewCode) && w.IsDeleted == false).ToListAsync(); iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/Dto/QueryWorkPieceLogYieldOutput.cs
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,193 @@ using Furion.TaskScheduler; using iWare.Wms.Core.Enum; using iWare.Wms.Core.Util.LowCode.Dto; using Microsoft.EntityFrameworkCore; using System; using System.ComponentModel; namespace iWare.Wms.Application { public class QueryWorkPieceLogYieldOutput : ExportYQueryWorkPieceLogYieldOutput { /// <summary> /// å½åè®¾å¤ /// </summary> public string EquipmentID { get; set; } //private DateTime? m_EndTime = null; ///// <summary> ///// å·¥åºä¸çº¿æ¶é´ ///// </summary> //public DateTime? EndTime //{ // get // { // if (m_EndTime == null) // { // return null; // } // if (m_EndTime == Convert.ToDateTime("0001-01-01")) // { // return null; // } // else // { // return m_EndTime; // } // } // set { m_EndTime = value; } //} ///// <summary> ///// å å·¥æ¶é¿ ///// </summary> //public string TimeSceonds //{ // get // { // if (EndTime == null || StartTime == null || EndTime == Convert.ToDateTime("0001-01-01") || StartTime == Convert.ToDateTime("0001-01-01")) // { // return ""; // } // TimeSpan ts = Convert.ToDateTime(EndTime) - Convert.ToDateTime(StartTime); // return Convert.ToInt32(ts.TotalMinutes).ToString() + "min"; // } //} ///// <summary> ///// è´¨éç¶æ ///// </summary> //public int QualityState { get; set; } ///// <summary> ///// è´¨éç¶æåå ///// </summary> //public string QualityStateName //{ // get // { // if (1 == QualityState) // { // return "åæ ¼"; // } // else if (2 == QualityState) // { // return "ä¸åæ ¼"; // } // else if (3 == QualityState) // { // return "çä¼¼"; // } // else // { // return ""; // } // } //} ///// <summary> ///// æä½ç±»åï¼SPC/çäº§ï¼ ///// </summary> //public string OperationType { get; set; } ///// <summary> ///// æä½ç±»å ///// </summary> //public string OperationTypeHand //{ // get // { // string str = ""; // if (string.IsNullOrEmpty(OperationType)) // { // str = "å ¶ä»"; // } // else // { // str = OperationType; // } // return str; // } //} ///// <summary> ///// è´¨éä¿¡æ¯id ///// </summary> //public long QualityDataInfoID { get; set; } ///// <summary> ///// Idä¸»é® ///// </summary> //public long Id { get; set; } ///// <summary> ///// å建人 ///// </summary> //public string CreateUserName { get; set; } } [Description("工件ééæ¥å¿æ¥è¯¢")] public class ExportYQueryWorkPieceLogYieldOutput { ///// <summary> ///// 设å¤å称 ///// </summary> //[Description("å½å设å¤")] //public string EquipmentName { get; set; } /// <summary> /// å½åå·¥åº /// </summary> [Description("å½åå·¥åº")] public string WorkingProcedure { get; set; } /// <summary> /// å·¥ä»¶å· /// </summary> [Description("工件å·")] public string WorkPieceID { get; set; } [Description("å¤æ³¨")] public string Remarks { get; set; } [Description("å建人")] public virtual string CreatedUserName { get; set; } /// <summary> /// å建æ¶é´ /// </summary> [Description("å建æ¶é´")] public virtual DateTimeOffset? CreatedTime { get; set; } } }
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,88 @@ using iWare.Wms.Core; using iWare.Wms.Core.Service; using System.ComponentModel.DataAnnotations; namespace iWare.Wms.Application { public class WorkPieceLogYieldInput : PageInputBase { /// <summary> /// å·¥ä»¶å· /// </summary> public virtual string WorkPieceID { get; set; } /// <summary> /// æåç /// </summary> public virtual string OP80NewCode { get; set; } /// <summary> /// å½åè®¾å¤ /// </summary> public virtual string EquipmentID { get; set; } /// <summary> /// æä½ç±»åï¼SPC/çäº§ï¼ /// </summary> public string OperationType { get; set; } /// <summary> /// å½åå·¥åº /// </summary> public virtual string workingProcedure { get; set; } public virtual string createdUserName { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´ /// </summary> public virtual DateTime? StartTime { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´å¼å§ /// </summary> public virtual DateTime? StartTimeBeginTime { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´ç»ææ¶é´ /// </summary> public virtual DateTime? StartTimeEndTime { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´ /// </summary> public virtual DateTime? EndTime { get; set; } /// <summary> /// 工件ç¶æ /// </summary> public virtual int? WorkPieceState { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´å¼å§æ¶é´(æ£ç´¢ä½¿ç¨) /// </summary> public virtual DateTime? OnlineTimeBeginTime { get; set; } /// <summary> /// å·¥åºä¸çº¿æ¶é´ç»ææ¶é´(æ£ç´¢ä½¿ç¨) /// </summary> public virtual DateTime? OnlineTimeEndTime { get; set; } /// <summary> /// è´¨éç¶æ /// </summary> public virtual int? QualityState { get; set; } /// <summary> /// è´¨éä¿¡æ¯id /// </summary> public virtual int? QualityDataInfoID { get; set; } } } iWara.SCADA.Code/iWare.Wms.Application/Service/WorkPieceProcess/WorkPieceProcessService.cs
@@ -35,6 +35,7 @@ private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep; private readonly IRepository<SysDictType, MasterDbContextLocator> _sysDictTypeRep; private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep; private readonly IRepository<WorkPieceLog, MasterDbContextLocator> _workPieceLogRep; /// <summary> @@ -46,6 +47,7 @@ /// <param name="sysDictTypeRep"></param> /// <param name="sysDictDataRep"></param> public WorkPieceProcessService( IRepository<WorkPieceLog, MasterDbContextLocator> workPieceLogRep, IRepository<WorkPieceProcess, MasterDbContextLocator> workPieceProcessRep, IRepository<WorkPieceInfo, MasterDbContextLocator> workPieceInfoRep, IRepository<EquipmentBaseInfo, MasterDbContextLocator> equipmentBaseInfoRep, @@ -53,6 +55,7 @@ IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep ) { _workPieceLogRep = workPieceLogRep; _workPieceInfoRep = workPieceInfoRep; _workPieceProcessRep = workPieceProcessRep; _equipmentBaseInfoRep = equipmentBaseInfoRep; @@ -332,6 +335,60 @@ #endregion #region ééæ¥å¿æ¥è¯¢ [Editby shaocx,2024-06-08] /// <summary> /// ééæ¥å¿æ¥è¯¢ /// </summary> /// <param name="input"></param> /// <returns></returns> [HttpGet("queryWorkPieceLogYield")] public async Task<PageResult<QueryWorkPieceLogYieldOutput>> QueryWorkPieceLogYield([FromQuery] WorkPieceLogYieldInput input) { var resutlt = await _workPieceLogRep.DetachedEntities .Where(!string.IsNullOrEmpty(input.WorkPieceID), u => u.WorkPieceID.Contains(input.WorkPieceID)) .Where(!string.IsNullOrEmpty(input.workingProcedure), u => u.WorkingProcedure.Contains(input.workingProcedure)) .Where(!string.IsNullOrEmpty(input.createdUserName), u => u.CreatedUserName.Contains(input.createdUserName)) .Where(!string.IsNullOrEmpty(input.StartTimeBeginTime.ToString()), u => u.CreatedTime >= input.StartTimeBeginTime) .Where(!string.IsNullOrEmpty(input.StartTimeEndTime.ToString()), u => u.CreatedTime <= input.StartTimeEndTime) .OrderBy(PageInputOrder.OrderBuilder<WorkPieceLogYieldInput>(input)) .ProjectToType<QueryWorkPieceLogYieldOutput>() .ToADPagedListAsync(input.PageNo, input.PageSize); return resutlt; } /// <summary> /// 导åºééæ¥å¿æ¥è¯¢ /// </summary> /// <param name="input"></param> /// <returns>导åºçExcelæ件</returns> [HttpGet("exportWorkPieceLogYield")] public async Task<IActionResult> ExportWorkPieceLogYield([FromQuery] WorkPieceLogYieldInput input) { input.PageNo = 1; input.PageSize = 1000000; var workPieceMachiningInfos2 = QueryWorkPieceLogYield(input); var workPieceMachiningInfos = workPieceMachiningInfos2.Result.Rows.ToList(); var daList = workPieceMachiningInfos.Adapt<List<ExportYQueryWorkPieceLogYieldOutput>>(); MemoryStream ms = new(); DataConvertUtil.ToExcelData(daList, _sysDictTypeRep, _sysDictDataRep, out List<string> headers, out List<List<object>> data, out string sheetName); ExcelUtil.ToExcel(headers, data, sheetName, ms); ms.Position = 0; var fileName = HttpUtility.UrlEncode($"{sheetName}[{DateTimeOffset.Now:yyyy-MM-dd}].xlsx", Encoding.GetEncoding("UTF-8")); return new FileStreamResult(ms, "application/octet-stream") { FileDownloadName = fileName }; } #endregion /// <summary> /// å页æ¥è¯¢å·¥ä»¶å å·¥(工件信æ¯è¡¨) /// </summary> iWara.SCADA.Code/iWare.Wms.Application/iWare.Wms.Application.xml
@@ -15149,6 +15149,26 @@ <param name="input"></param> <returns></returns> </member> <member name="P:iWare.Wms.Application.QueryWorkPieceLogYieldOutput.EquipmentID"> <summary> å½åè®¾å¤ </summary> </member> <member name="P:iWare.Wms.Application.ExportYQueryWorkPieceLogYieldOutput.WorkingProcedure"> <summary> å½åå·¥åº </summary> </member> <member name="P:iWare.Wms.Application.ExportYQueryWorkPieceLogYieldOutput.WorkPieceID"> <summary> å·¥ä»¶å· </summary> </member> <member name="P:iWare.Wms.Application.ExportYQueryWorkPieceLogYieldOutput.CreatedTime"> <summary> å建æ¶é´ </summary> </member> <member name="T:iWare.Wms.Application.QueryYieldOutput"> <summary> 产éæ¥è¯¢è¾åºåæ° @@ -15177,6 +15197,76 @@ <member name="P:iWare.Wms.Application.ExportYieldOutput.YieldCount"> <summary> 产éæ±æ» ãEditby shaocx,2024-06-11ã </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.WorkPieceID"> <summary> å·¥ä»¶å· </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.OP80NewCode"> <summary> æåç </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.EquipmentID"> <summary> å½åè®¾å¤ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.OperationType"> <summary> æä½ç±»åï¼SPC/çäº§ï¼ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.workingProcedure"> <summary> å½åå·¥åº </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.StartTime"> <summary> å·¥åºä¸çº¿æ¶é´ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.StartTimeBeginTime"> <summary> å·¥åºä¸çº¿æ¶é´å¼å§ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.StartTimeEndTime"> <summary> å·¥åºä¸çº¿æ¶é´ç»ææ¶é´ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.EndTime"> <summary> å·¥åºä¸çº¿æ¶é´ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.WorkPieceState"> <summary> 工件ç¶æ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.OnlineTimeBeginTime"> <summary> å·¥åºä¸çº¿æ¶é´å¼å§æ¶é´(æ£ç´¢ä½¿ç¨) </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.OnlineTimeEndTime"> <summary> å·¥åºä¸çº¿æ¶é´ç»ææ¶é´(æ£ç´¢ä½¿ç¨) </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.QualityState"> <summary> è´¨éç¶æ </summary> </member> <member name="P:iWare.Wms.Application.WorkPieceLogYieldInput.QualityDataInfoID"> <summary> è´¨éä¿¡æ¯id </summary> </member> <member name="T:iWare.Wms.Application.WorkPieceProcessDto"> @@ -15832,7 +15922,7 @@ 工件å 工追溯æå¡ </summary> </member> <member name="M:iWare.Wms.Application.WorkPieceProcessService.#ctor(Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.WorkPieceProcess,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.WorkPieceInfo,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.EquipmentBaseInfo,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator})"> <member name="M:iWare.Wms.Application.WorkPieceProcessService.#ctor(Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.WorkPieceLog,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.WorkPieceProcess,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.WorkPieceInfo,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.EquipmentBaseInfo,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.SysDictType,Furion.DatabaseAccessor.MasterDbContextLocator},Furion.DatabaseAccessor.IRepository{iWare.Wms.Core.SysDictData,Furion.DatabaseAccessor.MasterDbContextLocator})"> <summary> 工件å 工追溯æé </summary> @@ -15870,6 +15960,20 @@ <param name="input"></param> <returns>导åºçExcelæ件</returns> </member> <member name="M:iWare.Wms.Application.WorkPieceProcessService.QueryWorkPieceLogYield(iWare.Wms.Application.WorkPieceLogYieldInput)"> <summary> ééæ¥å¿æ¥è¯¢ </summary> <param name="input"></param> <returns></returns> </member> <member name="M:iWare.Wms.Application.WorkPieceProcessService.ExportWorkPieceLogYield(iWare.Wms.Application.WorkPieceLogYieldInput)"> <summary> 导åºééæ¥å¿æ¥è¯¢ </summary> <param name="input"></param> <returns>导åºçExcelæ件</returns> </member> <member name="M:iWare.Wms.Application.WorkPieceProcessService.WorkPieceInfoMachiningPage(iWare.Wms.Application.WorkPieceProcessSearch)"> <summary> å页æ¥è¯¢å·¥ä»¶å å·¥(工件信æ¯è¡¨) iWara.SCADA.Code/iWare.Wms.Database.Migrations/Migrations/20240830014836_v1.0.2.Designer.cs
ÎļþÃû´Ó iWara.SCADA.Code/iWare.Wms.Database.Migrations/Migrations/20240112013535_v1.0.1.Designer.cs ÐÞ¸Ä @@ -12,8 +12,8 @@ namespace iWare.Wms.Database.Migrations.Migrations { [DbContext(typeof(DefaultDbContext))] [Migration("20240112013535_v1.0.1")] partial class v101 [Migration("20240830014836_v1.0.2")] partial class v102 { protected override void BuildTargetModel(ModelBuilder modelBuilder) { @@ -683,6 +683,10 @@ .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<DateTime?>("CuttingFluidAddTime") .HasColumnType("datetime2") .HasComment("åå液添å æ¶é´"); b.Property<int>("CuttingFluidChangeAlertThreshold") .HasColumnType("int") .HasComment("åå液é¢è¦éå¼"); @@ -690,6 +694,10 @@ b.Property<DateTime?>("CuttingFluidChangeTime") .HasColumnType("datetime2") .HasComment("åå液æ´æ¢æ¶é´"); b.Property<DateTime?>("DetergentAddtime") .HasColumnType("datetime2") .HasComment("æ¸ æ´æ¶²æ·»å æ¶é´"); b.Property<int>("DetergentChangeAlertThreshold") .HasColumnType("int") @@ -783,6 +791,78 @@ b.ToTable("EquipmentBaseInfo"); b.HasComment("设å¤åºç¡ä¿¡æ¯è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.Equipmentbaseinfolog", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<long>("EquipmentBaseInfoId") .HasColumnType("bigint") .HasComment("设å¤ID"); b.Property<string>("EquipmentID") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("设å¤ç¼å·"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OperatorContent") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æä½å 容"); b.Property<int>("OperatorType") .HasColumnType("int") .HasComment("æä½ç±»åID"); b.Property<string>("OperatorTypeName") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æä½ç±»å"); b.Property<string>("Remark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.HasKey("Id"); b.ToTable("equipmentbaseinfolog"); b.HasComment("设å¤ç»´æ¤è®°å½"); }); modelBuilder.Entity("iWare.Wms.Core.EquipmentCurrentMonitor", b => @@ -2252,6 +2332,51 @@ .HasColumnType("nvarchar(32)") .HasComment("ééç»å«;OP80"); b.Property<string>("QualityOP80_DTKYZD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_Houdu") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTSMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTXMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_ZXJ") .HasColumnType("nvarchar(max)"); b.Property<DateTime>("QualityReceiveTime") .HasColumnType("datetime2") .HasComment("è´¨éæ¥æ¶æ¶é´"); @@ -2577,6 +2702,51 @@ .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ééç»å«;OP80"); b.Property<string>("QualityOP80_DTKYZD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_Houdu") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTSMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTXMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_ZXJ") .HasColumnType("nvarchar(max)"); b.Property<DateTime>("QualityReceiveTime") .HasColumnType("datetime2") @@ -13372,6 +13542,10 @@ .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<bool?>("IsOut") .HasColumnType("bit") .HasComment("æ¯å¦åºåº"); b.Property<string>("LogAddRemark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") @@ -13387,10 +13561,22 @@ .HasComment("æ°é"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasColumnType("nvarchar(max)") .HasComment("工件OP80ç "); b.Property<string>("OutPerson") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("åºåºäºº"); b.Property<string>("OutRemark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("åºåºå¤æ³¨"); b.Property<DateTime?>("OutTime") .HasColumnType("datetime2") .HasComment("åºåºæ¶é´"); b.Property<int?>("ProcessingDurationForCurrent") .HasColumnType("int") @@ -13404,6 +13590,12 @@ .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("è´¨éä¸åæ ¼åå "); b.Property<int?>("QualityNoOk") .HasColumnType("int"); b.Property<string>("QualityNoOkReason") .HasColumnType("nvarchar(max)"); b.Property<int?>("QualityState") .HasColumnType("int") @@ -13427,6 +13619,14 @@ .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("å¤æ³¨"); b.Property<int?>("UnLineStage") .HasColumnType("int") .HasComment("ä¸çº¿é¶æ®µ"); b.Property<string>("UnLineStageName") .HasColumnType("nvarchar(max)") .HasComment("ä¸çº¿é¶æ®µå称"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") @@ -13498,6 +13698,19 @@ b.Property<int?>("WorkPieceState") .HasColumnType("int") .HasComment("工件ç¶æ"); b.Property<DateTime?>("WorkPieceUnLineTime") .HasColumnType("datetime2") .HasComment("ä¸çº¿æ¶é´"); b.Property<long?>("WorkPieceUnLineUserId") .HasColumnType("bigint") .HasComment("ä¸çº¿äººId"); b.Property<string>("WorkPieceUnLineUserName") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ä¸çº¿äººå称"); b.Property<DateTime?>("WorkPieceinitOnlineTime") .HasColumnType("datetime2") @@ -13940,6 +14153,11 @@ .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); @@ -13963,6 +14181,19 @@ .HasColumnType("nvarchar(255)") .HasComment("OP80æç "); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<int?>("UnLineStage") .HasColumnType("int") .HasComment("é¶æ®µ"); b.Property<string>("UnLineStageName") .HasColumnType("nvarchar(max)") .HasComment("é¶æ®µå称"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); @@ -13977,33 +14208,109 @@ .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasColumnType("nvarchar(max)") .HasComment("工件å·"); b.Property<DateTime?>("WorkPieceOutboundTime") .IsRequired() .HasColumnType("datetime2") .HasComment("åºåºæ¶é´"); b.Property<long?>("WorkPieceOutboundUserId") .IsRequired() .HasMaxLength(32) .HasColumnType("bigint") .HasComment("åºåºäººId"); b.Property<string>("WorkPieceOutboundUserName") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("åºåºäººå称"); b.Property<DateTime?>("WorkPieceUnLineTime") .HasColumnType("datetime2") .HasComment("ä¸çº¿æ¶é´"); b.Property<long?>("WorkPieceUnLineUserId") .HasColumnType("bigint") .HasComment("ä¸çº¿äººId"); b.Property<string>("WorkPieceUnLineUserName") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ä¸çº¿äººå称"); b.HasKey("Id"); b.ToTable("WorkPieceOutbound"); b.HasComment("工件åºåºè¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceOutboundRecord", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æåç "); b.Property<string>("OperationType") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("æä½ç±»å"); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("工件å·"); b.HasKey("Id"); b.ToTable("WorkPieceOutboundRecord"); b.HasComment("工件åºåºè®°å½è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceProcess", b => @@ -14047,6 +14354,12 @@ .HasColumnType("bigint") .HasComment("è´¨éä¿¡æ¯id"); b.Property<int?>("QualityNoOk") .HasColumnType("int"); b.Property<string>("QualityNoOkReason") .HasColumnType("nvarchar(max)"); b.Property<int>("QualityState") .HasColumnType("int") .HasComment("è´¨éç¶æ"); @@ -14090,6 +14403,70 @@ b.HasComment("工件å 工履å表"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceUnLine", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æåç "); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("工件å·"); b.HasKey("Id"); b.ToTable("WorkPieceUnLine"); b.HasComment("工件ä¸çº¿è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.YieldAnalysis", b => { b.Property<long>("Id") iWara.SCADA.Code/iWare.Wms.Database.Migrations/Migrations/20240830014836_v1.0.2.cs
ÎļþÃû´Ó iWara.SCADA.Code/iWare.Wms.Database.Migrations/Migrations/20240112013535_v1.0.1.cs ÐÞ¸Ä @@ -5,20 +5,20 @@ namespace iWare.Wms.Database.Migrations.Migrations { public partial class v101 : Migration public partial class v102 : Migration { protected override void Up(MigrationBuilder migrationBuilder) { migrationBuilder.CreateTable( name: "WorkPieceOutbound", name: "WorkPieceOutboundRecord", columns: table => new { Id = table.Column<long>(type: "bigint", nullable: false, comment: "Id主é®"), WorkPieceID = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false, comment: "工件å·"), OP80NewCode = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: false, comment: "OP80æç "), WorkPieceOutboundTime = table.Column<DateTime>(type: "datetime2", nullable: false, comment: "åºåºæ¶é´"), WorkPieceOutboundUserId = table.Column<long>(type: "bigint", maxLength: 32, nullable: false, comment: "åºåºäººId"), WorkPieceOutboundUserName = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: false, comment: "åºåºäººå称"), OperationType = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true, comment: "æä½ç±»å"), OP80NewCode = table.Column<string>(type: "nvarchar(255)", maxLength: 255, nullable: false, comment: "æåç "), WorkPieceID = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true, comment: "工件å·"), CarNo = table.Column<string>(type: "nvarchar(32)", maxLength: 32, nullable: true, comment: "å°è½¦ç "), Remark = table.Column<string>(type: "nvarchar(500)", maxLength: 500, nullable: true, comment: "å¤æ³¨"), CreatedTime = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true, comment: "å建æ¶é´"), UpdatedTime = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true, comment: "æ´æ°æ¶é´"), CreatedUserId = table.Column<long>(type: "bigint", nullable: true, comment: "å建è Id"), @@ -29,15 +29,15 @@ }, constraints: table => { table.PrimaryKey("PK_WorkPieceOutbound", x => x.Id); table.PrimaryKey("PK_WorkPieceOutboundRecord", x => x.Id); }, comment: "工件åºåºè¡¨"); comment: "工件åºåºè®°å½è¡¨"); } protected override void Down(MigrationBuilder migrationBuilder) { migrationBuilder.DropTable( name: "WorkPieceOutbound"); name: "WorkPieceOutboundRecord"); } } } iWara.SCADA.Code/iWare.Wms.Database.Migrations/Migrations/DefaultDbContextModelSnapshot.cs
@@ -681,6 +681,10 @@ .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<DateTime?>("CuttingFluidAddTime") .HasColumnType("datetime2") .HasComment("åå液添å æ¶é´"); b.Property<int>("CuttingFluidChangeAlertThreshold") .HasColumnType("int") .HasComment("åå液é¢è¦éå¼"); @@ -688,6 +692,10 @@ b.Property<DateTime?>("CuttingFluidChangeTime") .HasColumnType("datetime2") .HasComment("åå液æ´æ¢æ¶é´"); b.Property<DateTime?>("DetergentAddtime") .HasColumnType("datetime2") .HasComment("æ¸ æ´æ¶²æ·»å æ¶é´"); b.Property<int>("DetergentChangeAlertThreshold") .HasColumnType("int") @@ -781,6 +789,78 @@ b.ToTable("EquipmentBaseInfo"); b.HasComment("设å¤åºç¡ä¿¡æ¯è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.Equipmentbaseinfolog", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<long>("EquipmentBaseInfoId") .HasColumnType("bigint") .HasComment("设å¤ID"); b.Property<string>("EquipmentID") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("设å¤ç¼å·"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OperatorContent") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æä½å 容"); b.Property<int>("OperatorType") .HasColumnType("int") .HasComment("æä½ç±»åID"); b.Property<string>("OperatorTypeName") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æä½ç±»å"); b.Property<string>("Remark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.HasKey("Id"); b.ToTable("equipmentbaseinfolog"); b.HasComment("设å¤ç»´æ¤è®°å½"); }); modelBuilder.Entity("iWare.Wms.Core.EquipmentCurrentMonitor", b => @@ -2250,6 +2330,51 @@ .HasColumnType("nvarchar(32)") .HasComment("ééç»å«;OP80"); b.Property<string>("QualityOP80_DTKYZD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_Houdu") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTSMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTXMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_ZXJ") .HasColumnType("nvarchar(max)"); b.Property<DateTime>("QualityReceiveTime") .HasColumnType("datetime2") .HasComment("è´¨éæ¥æ¶æ¶é´"); @@ -2575,6 +2700,51 @@ .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ééç»å«;OP80"); b.Property<string>("QualityOP80_DTKYZD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_D_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_Houdu") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTSMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_XTXMYD") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_S_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_TKZJ") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_X") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_X_X_Y") .HasColumnType("nvarchar(max)"); b.Property<string>("QualityOP80_ZXJ") .HasColumnType("nvarchar(max)"); b.Property<DateTime>("QualityReceiveTime") .HasColumnType("datetime2") @@ -13370,6 +13540,10 @@ .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<bool?>("IsOut") .HasColumnType("bit") .HasComment("æ¯å¦åºåº"); b.Property<string>("LogAddRemark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") @@ -13385,10 +13559,22 @@ .HasComment("æ°é"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasColumnType("nvarchar(max)") .HasComment("工件OP80ç "); b.Property<string>("OutPerson") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("åºåºäºº"); b.Property<string>("OutRemark") .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("åºåºå¤æ³¨"); b.Property<DateTime?>("OutTime") .HasColumnType("datetime2") .HasComment("åºåºæ¶é´"); b.Property<int?>("ProcessingDurationForCurrent") .HasColumnType("int") @@ -13402,6 +13588,12 @@ .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("è´¨éä¸åæ ¼åå "); b.Property<int?>("QualityNoOk") .HasColumnType("int"); b.Property<string>("QualityNoOkReason") .HasColumnType("nvarchar(max)"); b.Property<int?>("QualityState") .HasColumnType("int") @@ -13425,6 +13617,14 @@ .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("å¤æ³¨"); b.Property<int?>("UnLineStage") .HasColumnType("int") .HasComment("ä¸çº¿é¶æ®µ"); b.Property<string>("UnLineStageName") .HasColumnType("nvarchar(max)") .HasComment("ä¸çº¿é¶æ®µå称"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") @@ -13496,6 +13696,19 @@ b.Property<int?>("WorkPieceState") .HasColumnType("int") .HasComment("工件ç¶æ"); b.Property<DateTime?>("WorkPieceUnLineTime") .HasColumnType("datetime2") .HasComment("ä¸çº¿æ¶é´"); b.Property<long?>("WorkPieceUnLineUserId") .HasColumnType("bigint") .HasComment("ä¸çº¿äººId"); b.Property<string>("WorkPieceUnLineUserName") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ä¸çº¿äººå称"); b.Property<DateTime?>("WorkPieceinitOnlineTime") .HasColumnType("datetime2") @@ -13938,6 +14151,11 @@ .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); @@ -13961,6 +14179,19 @@ .HasColumnType("nvarchar(255)") .HasComment("OP80æç "); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<int?>("UnLineStage") .HasColumnType("int") .HasComment("é¶æ®µ"); b.Property<string>("UnLineStageName") .HasColumnType("nvarchar(max)") .HasComment("é¶æ®µå称"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); @@ -13975,33 +14206,109 @@ .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasColumnType("nvarchar(max)") .HasComment("工件å·"); b.Property<DateTime?>("WorkPieceOutboundTime") .IsRequired() .HasColumnType("datetime2") .HasComment("åºåºæ¶é´"); b.Property<long?>("WorkPieceOutboundUserId") .IsRequired() .HasMaxLength(32) .HasColumnType("bigint") .HasComment("åºåºäººId"); b.Property<string>("WorkPieceOutboundUserName") .IsRequired() .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("åºåºäººå称"); b.Property<DateTime?>("WorkPieceUnLineTime") .HasColumnType("datetime2") .HasComment("ä¸çº¿æ¶é´"); b.Property<long?>("WorkPieceUnLineUserId") .HasColumnType("bigint") .HasComment("ä¸çº¿äººId"); b.Property<string>("WorkPieceUnLineUserName") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("ä¸çº¿äººå称"); b.HasKey("Id"); b.ToTable("WorkPieceOutbound"); b.HasComment("工件åºåºè¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceOutboundRecord", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æåç "); b.Property<string>("OperationType") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("æä½ç±»å"); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("工件å·"); b.HasKey("Id"); b.ToTable("WorkPieceOutboundRecord"); b.HasComment("工件åºåºè®°å½è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceProcess", b => @@ -14045,6 +14352,12 @@ .HasColumnType("bigint") .HasComment("è´¨éä¿¡æ¯id"); b.Property<int?>("QualityNoOk") .HasColumnType("int"); b.Property<string>("QualityNoOkReason") .HasColumnType("nvarchar(max)"); b.Property<int>("QualityState") .HasColumnType("int") .HasComment("è´¨éç¶æ"); @@ -14088,6 +14401,70 @@ b.HasComment("工件å 工履å表"); }); modelBuilder.Entity("iWare.Wms.Core.WorkPieceUnLine", b => { b.Property<long>("Id") .HasColumnType("bigint") .HasComment("Id主é®"); b.Property<string>("CarNo") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("å°è½¦ç "); b.Property<DateTimeOffset?>("CreatedTime") .HasColumnType("datetimeoffset") .HasComment("å建æ¶é´"); b.Property<long?>("CreatedUserId") .HasColumnType("bigint") .HasComment("å建è Id"); b.Property<string>("CreatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("å建è å称"); b.Property<bool>("IsDeleted") .HasColumnType("bit") .HasComment("软å é¤æ è®°"); b.Property<string>("OP80NewCode") .IsRequired() .HasMaxLength(255) .HasColumnType("nvarchar(255)") .HasComment("æåç "); b.Property<string>("Remark") .HasMaxLength(500) .HasColumnType("nvarchar(500)") .HasComment("å¤æ³¨"); b.Property<DateTimeOffset?>("UpdatedTime") .HasColumnType("datetimeoffset") .HasComment("æ´æ°æ¶é´"); b.Property<long?>("UpdatedUserId") .HasColumnType("bigint") .HasComment("ä¿®æ¹è Id"); b.Property<string>("UpdatedUserName") .HasMaxLength(50) .HasColumnType("nvarchar(50)") .HasComment("ä¿®æ¹è å称"); b.Property<string>("WorkPieceID") .HasMaxLength(32) .HasColumnType("nvarchar(32)") .HasComment("工件å·"); b.HasKey("Id"); b.ToTable("WorkPieceUnLine"); b.HasComment("工件ä¸çº¿è¡¨"); }); modelBuilder.Entity("iWare.Wms.Core.YieldAnalysis", b => { b.Property<long>("Id") iWara.SCADA.Code/iWare.Wms.Database.Migrations/iWare.Wms.Database.Migrations.csproj
@@ -9,4 +9,8 @@ <ItemGroup> <ProjectReference Include="..\iWare.Wms.EntityFramework.Core\iWare.Wms.EntityFramework.Core.csproj" /> </ItemGroup> <ItemGroup> <Folder Include="Migrations\" /> </ItemGroup> </Project> iWara.SCADA.Code/iWare.Wms.EntityFramework.Core/dbsettings.json
@@ -15,7 +15,10 @@ //"MultiTenantConnection": "Data Source=localhost;Database=Admin.NET_SaaS;User ID=root;Password=123456;pooling=true;port=3306;sslmode=none;CharSet=utf8;" //MSSQLè¿æ¥å符串 "DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;" //"DefaultConnection": "Server=.;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;" //"DefaultConnection": "Server=82.156.32.44;Database=iWare.WMS;User=sa;Password=123abc.com;MultipleActiveResultSets=True;" //"DefaultConnection": "Server=192.168.216.203;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;" "DefaultConnection": "Server=.;Database=iWare.SCADA;User=sa;Password=123abc.com;MultipleActiveResultSets=True;" //"MultiTenantConnection": "Server=localhost;Database=Admin.NET_SaaS;User=sa;Password=123456;MultipleActiveResultSets=True;" } }
