diff --git a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml index 63ee2c09..1b297e41 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml @@ -157,7 +157,13 @@ return d.dept["deptName"]; } }, - + { + field: 'unit', + title: '製程單位', + templet: function (d) { + return d.unit["unitName"]; + } + }, { field: 'lineDesc', minWidth: 100, diff --git a/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml index 30239c65..755eaffb 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml @@ -320,15 +320,14 @@ return layui.util.toDateString(d.bulletinTime, "yyyy-MM-dd"); } }, - //{ - // field: 'right', - // width: 200, - // title: '操作', - // fixed: 'right', - // templet: function (d) { - // return '修改 删除' - // } - //}, + { + field: 'unit', + width: 100, + title: '製程單位', + templet: function (item) { + return item.unit["unitName"]; + } + }, { align: 'center', title: '操作', templet: function (item) { diff --git a/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml index 757663b4..2fe24abf 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml @@ -164,19 +164,24 @@ title: '測試類別', width: 80 }, - { - field: 'unitNo', - title: '歸屬製程', - width: 80 - }, //{ - // field: 'unit', - // width: 100, + // field: 'unitNo', // title: '歸屬製程', - // templet: function (d) { - // return d.unit["unitName"]; - // } + // width: 80 //}, + { + field: 'unit', + width: 100, + title: '製程單位', + templet: function (d) { + var tt; + if (d.unit== null) + tt = "N/A"; + else + tt = d.unit["unitName"]; + return tt + } + }, { align: 'center' ,title: '操作', width: 160, templet: function (item) { diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll index d69bc4c8..3e4793f7 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb index b4e1bb1c..29b32f49 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json index 03a74442..a61eb6ed 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.deps.json @@ -2502,8 +2502,17 @@ "lib/netcoreapp2.1/WebApiClient.JIT.dll": {} } }, + "AMESCoreStudio.CommonTools/1.0.0": { + "runtime": { + "AMESCoreStudio.CommonTools.dll": {} + }, + "compile": { + "AMESCoreStudio.CommonTools.dll": {} + } + }, "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { + "AMESCoreStudio.CommonTools": "1.0.0", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", "Microsoft.EntityFrameworkCore.SqlServer": "3.1.18", @@ -5407,6 +5416,11 @@ "path": "webapiclient.jit/1.1.4", "hashPath": "webapiclient.jit.1.1.4.nupkg.sha512" }, + "AMESCoreStudio.CommonTools/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, "AMESCoreStudio.WebApi/1.0.0": { "type": "project", "serviceable": false, diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index 673510d4..6ea17f16 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb index f718a2bf..6bdd02d6 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index ac2bf20d..1c99b2d2 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 27fe2764..1969e46b 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json index 1207593c..0d396387 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -31,6 +31,7 @@ ".NETCoreApp,Version=v3.1": { "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { + "AMESCoreStudio.CommonTools": "1.0.0", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", @@ -2443,6 +2444,14 @@ "System.Xml.XmlDocument": "4.3.0" } }, + "AMESCoreStudio.CommonTools/1.0.0": { + "runtime": { + "AMESCoreStudio.CommonTools.dll": {} + }, + "compile": { + "AMESCoreStudio.CommonTools.dll": {} + } + }, "Microsoft.AspNetCore.Antiforgery/3.1.0.0": { "compile": { "Microsoft.AspNetCore.Antiforgery.dll": {} @@ -5297,6 +5306,11 @@ "path": "system.xml.xmlserializer/4.3.0", "hashPath": "system.xml.xmlserializer.4.3.0.nupkg.sha512" }, + "AMESCoreStudio.CommonTools/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, "Microsoft.AspNetCore.Antiforgery/3.1.0.0": { "type": "referenceassembly", "serviceable": false, diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 44be866c..0cffab0e 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index bab10666..c6981929 100644 Binary files a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 9c1c114c..07ddf217 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -382,6 +382,14 @@ + + + 更新工單資本資料-狀態 + + 工單ID + 狀態 + + @@ -413,6 +421,37 @@ + + + + + + + + + + + + + + 工單投產纪錄資料文件 + + + + + + 工單投產纪錄資料文件 to WipID + + 工單ID + + + + + 新增工單投產纪錄資料文件 + + 工單ID + + 工單狀態維護 @@ -682,12 +721,27 @@ + + + 用工單ID查詢是否有正在開線 + + + + 更改單位资料 + + + 更新線別 ON/OFF + + Line ID + 工單ID + + 新增單位资料 @@ -2058,6 +2112,11 @@ 異常原因資料 + + + 工單投產纪錄資料文件 + + 條碼變更資料表 @@ -3033,6 +3092,11 @@ 狀態 + + + 生產單位 + + 用户资料表 @@ -3235,7 +3299,7 @@ - 生產單位 + 工單ID @@ -3258,6 +3322,11 @@ 修改時間 + + + 生產單位资料 + + 部門资料 @@ -3598,6 +3667,11 @@ 狀態 + + + 生產單位资料 + + 用户资料表 diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs index 43a3ea2f..72ee42fc 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs @@ -41,10 +41,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS q = q.OrderBy(p => p.ClassID); var classInfo = await q.ToListAsync(); - //foreach (var data in classInfo) - //{ - // data.TestCol = data.BeginTime + " ~ " + data.EndTime; - //} + foreach (var data in classInfo) + { + data.Unit = _context.FactoryUnits.Find(data.UnitNo); + // data.TestCol = data.BeginTime + " ~ " + data.EndTime; + } return classInfo; //return await _context.ClassInfo.ToListAsync(); diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs index 58df6889..bbec2526 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs @@ -46,7 +46,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS foreach (var data in LineInfo) { data.Dept = _context.DeptInfoes.Find(data.DeptID); - //data.Unit = _context.FactoryUnits.Find(data.UnitNo); + data.Unit = _context.FactoryUnits.Find(data.UnitNo); } if (LineInfo == null) diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs index 784e696e..dd31694e 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs @@ -37,17 +37,20 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS public async Task>> GetStations() { IQueryable q = _context.Stationses; - //q = q.Where(p => p.StationID > 0); + q = q.Where(p => p.UnitNo != "0"); q = q.OrderBy(p => p.StationID); var Stations = await q.ToListAsync(); - //foreach (var data in Stations) - //{ - // //data.Dept = _context.DeptInfoes.Find(data.DeptID); - // var tt = _context.FactoryUnits.Find(data.UnitNo); - // data.UnitName = _context.FactoryUnits.Find(data.UnitNo).UnitName; - //} + foreach (var data in Stations) + { + //data.Dept = _context.DeptInfoes.Find(data.DeptID); + if (data.UnitNo != "0") + data.Unit = _context.FactoryUnits.Find(data.UnitNo); + else + data.Unit.UnitName = "N/A"; + + } return Stations; diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index 862f6f6d..4167bc1d 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -85,8 +85,13 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasKey(c => new { c.WipNO, c.StartNO, c.EndNO }); modelBuilder.Entity().HasKey(c => new { c.WipID, c.CreateDate}); - //modelBuilder.Entity().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); - //modelBuilder.Entity().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired(); + + modelBuilder.Entity().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); + modelBuilder.Entity().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired(); + modelBuilder.Entity < AMESCoreStudio.WebApi.Models.BAS.Stations>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); + + } /// diff --git a/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs b/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs index 7d3e1fe7..734f46dd 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs @@ -133,12 +133,8 @@ namespace AMESCoreStudio.WebApi.Models.BAS /// /// 生產單位 /// - //public virtual System.Collections.Generic.ICollection Unit { get; set; } - //public virtual FactoryUnit Unit { get; set; } - //public class Other - //{ - // public string Member { get; set; } - //} + public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; } + } } diff --git a/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs b/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs index c85347a1..a30d8ccb 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/LineInfo.cs @@ -94,7 +94,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS /// /// 生產單位资料 /// - //public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; } + public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; } /// /// 部門资料 diff --git a/AMESCoreStudio.WebApi/Models/BAS/Stations.cs b/AMESCoreStudio.WebApi/Models/BAS/Stations.cs index 33b621c6..fbb465ac 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/Stations.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/Stations.cs @@ -168,7 +168,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS /// /// 生產單位资料 /// - //public virtual String UnitName { get; set; } + public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; } } } diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll index ac2bf20d..1c99b2d2 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb index 27fe2764..1969e46b 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json index 1207593c..0d396387 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.deps.json @@ -31,6 +31,7 @@ ".NETCoreApp,Version=v3.1": { "AMESCoreStudio.WebApi/1.0.0": { "dependencies": { + "AMESCoreStudio.CommonTools": "1.0.0", "Microsoft.EntityFrameworkCore": "5.0.8", "Microsoft.EntityFrameworkCore.Design": "5.0.8", "Microsoft.EntityFrameworkCore.Proxies": "5.0.8", @@ -2443,6 +2444,14 @@ "System.Xml.XmlDocument": "4.3.0" } }, + "AMESCoreStudio.CommonTools/1.0.0": { + "runtime": { + "AMESCoreStudio.CommonTools.dll": {} + }, + "compile": { + "AMESCoreStudio.CommonTools.dll": {} + } + }, "Microsoft.AspNetCore.Antiforgery/3.1.0.0": { "compile": { "Microsoft.AspNetCore.Antiforgery.dll": {} @@ -5297,6 +5306,11 @@ "path": "system.xml.xmlserializer/4.3.0", "hashPath": "system.xml.xmlserializer.4.3.0.nupkg.sha512" }, + "AMESCoreStudio.CommonTools/1.0.0": { + "type": "project", + "serviceable": false, + "sha512": "" + }, "Microsoft.AspNetCore.Antiforgery/3.1.0.0": { "type": "referenceassembly", "serviceable": false, diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 44be866c..0cffab0e 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb index bab10666..c6981929 100644 Binary files a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb and b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb differ diff --git a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml index 9c1c114c..07ddf217 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -382,6 +382,14 @@ + + + 更新工單資本資料-狀態 + + 工單ID + 狀態 + + @@ -413,6 +421,37 @@ + + + + + + + + + + + + + + 工單投產纪錄資料文件 + + + + + + 工單投產纪錄資料文件 to WipID + + 工單ID + + + + + 新增工單投產纪錄資料文件 + + 工單ID + + 工單狀態維護 @@ -682,12 +721,27 @@ + + + 用工單ID查詢是否有正在開線 + + + + 更改單位资料 + + + 更新線別 ON/OFF + + Line ID + 工單ID + + 新增單位资料 @@ -2058,6 +2112,11 @@ 異常原因資料 + + + 工單投產纪錄資料文件 + + 條碼變更資料表 @@ -3033,6 +3092,11 @@ 狀態 + + + 生產單位 + + 用户资料表 @@ -3235,7 +3299,7 @@ - 生產單位 + 工單ID @@ -3258,6 +3322,11 @@ 修改時間 + + + 生產單位资料 + + 部門资料 @@ -3598,6 +3667,11 @@ 狀態 + + + 生產單位资料 + + 用户资料表