From acf4d07c5a0456151ea0829a92f9b33de5962551 Mon Sep 17 00:00:00 2001 From: Marvin Date: Wed, 28 Sep 2022 23:09:09 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9MAC=E8=B3=87=E6=96=99?= =?UTF-8?q?=E7=B6=AD=E8=AD=B7=E7=9A=84=E5=AD=90=E7=AA=97=E5=8F=A3=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F,=E4=B8=A6=E4=BF=AE=E6=94=B9=E5=88=97=E5=8D=B0?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=202.=E4=BF=AE=E6=94=B9=E6=96=99=E8=99=9F?= =?UTF-8?q?=E7=B5=84=E4=BB=B6=E5=B0=8D=E6=87=89=E7=B6=AD=E8=AD=B7=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E9=87=8D=E8=A4=87=E7=82=BA=E9=9D=9E=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=203.=E4=BF=AE=E6=94=B9=E6=A9=9F=E7=A8=AEC/T=E8=B3=87?= =?UTF-8?q?=E6=96=99=E7=B6=AD=E8=AD=B7=E7=9A=84=E5=AD=90=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=204.=E4=BF=AE=E6=94=B9=E6=A9=9F=E7=A8=AEC/T?= =?UTF-8?q?=E8=B3=87=E6=96=99=E6=9F=A5=E8=A9=A2=E7=9A=84=E6=AA=A2=E8=A6=96?= =?UTF-8?q?=E7=AA=97=E5=8F=A3=E5=A4=A7=E5=B0=8F=205.=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E8=89=AF=E7=8F=BE=E8=B1=A1=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=E8=B3=87=E6=96=99=E5=BE=8C=E5=87=BA=E7=8F=BE=E9=8C=AF?= =?UTF-8?q?=E8=AA=A4=E8=A8=8A=E6=81=AF=206.=E4=BF=AE=E6=AD=A3=E7=84=A1?= =?UTF-8?q?=E6=95=88=E5=B7=A5=E6=99=82=E9=A1=9E=E5=88=A5=E7=B6=AD=E8=AD=B7?= =?UTF-8?q?=E7=84=A1=E6=B3=95=E5=88=AA=E9=99=A4=207.=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=84=A1=E6=95=88=E5=B7=A5=E6=99=82=E5=88=A4=E5=AE=9A=E9=A1=9E?= =?UTF-8?q?=E5=88=A5=E7=B6=AD=E8=AD=B7=E7=84=A1=E6=B3=95=E5=88=AA=E9=99=A4?= =?UTF-8?q?=E8=B3=87=E6=96=99=208.=E4=BF=AE=E6=94=B9=E7=8F=AD=E5=88=A5?= =?UTF-8?q?=E8=B3=87=E6=96=99=E7=B6=AD=E8=AD=B7=E5=88=AA=E9=99=A4=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF=209.=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E7=94=A2=E6=99=82=E6=AE=B5=E8=B3=87=E6=96=99=E7=B6=AD=E8=AD=B7?= =?UTF-8?q?,=E4=B8=8D=E6=98=AF=E5=95=9F=E7=94=A8/=E5=81=9C=E7=94=A8(?= =?UTF-8?q?=E6=B2=92=E6=9C=89=E7=8B=80=E6=85=8B),=E8=80=8C=E6=98=AF?= =?UTF-8?q?=E5=88=AA=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AMESCoreStudio.Web/Views/BAS/BAS005.cshtml | 13 ++++++++++--- AMESCoreStudio.Web/Views/BAS/BAS006.cshtml | 9 +++++---- AMESCoreStudio.Web/Views/KCS/KCS001.cshtml | 4 ++-- AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml | 5 ++++- AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml | 5 ++++- AMESCoreStudio.Web/Views/PPS/PPS003.cshtml | 4 ++-- AMESCoreStudio.Web/Views/PPS/PPS004.cshtml | 2 +- AMESCoreStudio.Web/Views/PPS/PPS010.cshtml | 4 ++-- AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml | 4 +++- AMESCoreStudio.Web/Views/WHS/WHS014.cshtml | 2 +- AMESCoreStudio.Web/Views/WHS/WHS016.cshtml | 2 +- .../Controllers/AMES/NGReasonsController.cs | 8 ++++++-- AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs | 1 - AMESCoreStudio.WebApi/Models/AMESContext.cs | 1 + 14 files changed, 42 insertions(+), 22 deletions(-) diff --git a/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml index 0b1d2963..1121afd8 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS005.cshtml @@ -189,8 +189,12 @@ hg.open('修改班別', '/BAS/BAS005U/' + obj.data.classID, 480, 480); } } + if (obj.data.statusNo == "A") + str = "停用"; + else + str = "啟用"; if (obj.event == 'del') { - hg.confirm("系統：" + obj.data.classNo + "，确定要删除吗？", function () { + hg.confirm("系統：" + obj.data.classNo + "，确定要" + str + "吗？", function () { $.ajax({ url: '/BAS/BAS005D', data: { id: obj.data.classID }, @@ -198,7 +202,7 @@ success: function (data) { if (data.success) { obj.del(); //只删本地数据 - hg.msghide("删除成功！"); + hg.msghide(str + "成功！"); init(data); request($("#selectunit").val()); } @@ -335,7 +339,10 @@ templet: function (item) { var btns = ''; btns = btns + '编辑'; - btns = btns + ' 啟用 / 停用 '; + if (item.statusNo == "A") + btns = btns + '停用'; + else if (item.statusNo == "S") + btns = btns + '啟用'; return btns; } diff --git a/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml index a77faafd..9754ea4d 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml @@ -75,7 +75,7 @@ templet: function (item) { var btns = ''; btns = btns + '编辑'; - btns = btns + ' 啟用 / 停用 '; + btns = btns + '刪除'; return btns; } @@ -111,13 +111,14 @@ } if (obj.event == 'del') { if (obj.data.segmentID) { - + /* var str; if (obj.data.statusNo == "A") str = "停用"; else str = "啟用"; - hg.confirm("系統：" + obj.data.segmentID + "，确定"+str+"要吗？", function () { + */ + hg.confirm("系統：" + obj.data.segmentID + "，确定要刪除吗？", function () { $.ajax({ url: '/BAS/BAS006D', data: { id: obj.data.segmentID }, @@ -125,7 +126,7 @@ success: function (data) { if (data.success) { obj.del(); //只删本地数据 - hg.msghide(str+"成功！"); + hg.msghide("刪除成功！"); } else { hg.msg(data.msg); diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml index 5dd3fff5..abc19a77 100644 --- a/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml +++ b/AMESCoreStudio.Web/Views/KCS/KCS001.cshtml @@ -100,7 +100,7 @@ //通过行tool编辑，lay-event="edit" function edit(obj) { if (obj.data.class) { - hg.open('修改MAC資料', '/KCS/KCS001U/' + obj.data.class + ',' + obj.data.classGroup, 640, 640); + hg.open('修改MAC資料', '/KCS/KCS001U/' + obj.data.class + ',' + obj.data.classGroup, 640, 400); } } @@ -133,7 +133,7 @@ layuiicon: '', class: 'layui-btn-normal', handler: function () { - hg.open('新增MAC資料', '/KCS/KCS001C', 640, 640); + hg.open('新增MAC資料', '/KCS/KCS001C', 640, 400); } } diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml index 72af2ec3..3e121456 100644 --- a/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml +++ b/AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml @@ -87,7 +87,10 @@
- +
diff --git a/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml b/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml index 603a97c1..5f5eff9c 100644 --- a/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml +++ b/AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml @@ -82,7 +82,10 @@
- +
diff --git a/AMESCoreStudio.Web/Views/PPS/PPS003.cshtml b/AMESCoreStudio.Web/Views/PPS/PPS003.cshtml index 33c5c37b..15417661 100644 --- a/AMESCoreStudio.Web/Views/PPS/PPS003.cshtml +++ b/AMESCoreStudio.Web/Views/PPS/PPS003.cshtml @@ -69,7 +69,7 @@ //通过行tool编辑，lay-event="edit" function edit(obj) { if (obj.data.itemNo) { - hg.open('修改機種C/T資料', '/PPS/PPS003U/' + obj.data.itemNo + ',' + obj.data.lineID, 800, 800); + hg.open('修改機種C/T資料', '/PPS/PPS003U/' + obj.data.itemNo + ',' + obj.data.lineID, 800, 520); } } @@ -102,7 +102,7 @@ layuiicon: '', class: 'layui-btn-normal', handler: function () { - hg.open('新增機種C/T資料', '/PPS/PPS003C', 800, 800); + hg.open('新增機種C/T資料', '/PPS/PPS003C', 800, 520); } } diff --git a/AMESCoreStudio.Web/Views/PPS/PPS004.cshtml b/AMESCoreStudio.Web/Views/PPS/PPS004.cshtml index d75e1d61..94e4fe96 100644 --- a/AMESCoreStudio.Web/Views/PPS/PPS004.cshtml +++ b/AMESCoreStudio.Web/Views/PPS/PPS004.cshtml @@ -69,7 +69,7 @@ //通过行tool编辑，lay-event="edit" function edit(obj) { if (obj.data.itemNo) { - hg.open('檢視 - 機種C/T資料', '/PPS/PPS003V/' + obj.data.itemNo + ',' + obj.data.lineID, 800, 800); + hg.open('檢視 - 機種C/T資料', '/PPS/PPS003V/' + obj.data.itemNo + ',' + obj.data.lineID, 800, 520); } } diff --git a/AMESCoreStudio.Web/Views/PPS/PPS010.cshtml b/AMESCoreStudio.Web/Views/PPS/PPS010.cshtml index ad2e8287..f699454f 100644 --- a/AMESCoreStudio.Web/Views/PPS/PPS010.cshtml +++ b/AMESCoreStudio.Web/Views/PPS/PPS010.cshtml @@ -175,7 +175,7 @@ function edit(obj) { if (obj.data.ngReasonNo) { var no = ngGroupNo.value; - hg.open('修改不良現象原因', '/PPS/PPS010U/' + obj.data.ngReasonNo + ',' + no, 800, 640); + hg.open('修改不良現象原因', '/PPS/PPS010U/' + obj.data.ngReasonNo + ',' + no, 800, 400); } } @@ -210,7 +210,7 @@ handler: function () { var id = ngClassNo.value; var no = ngGroupNo.value; - hg.open('新增不良現象原因', '/PPS/PPS010C/' + id + ',' + no, 800, 640); + hg.open('新增不良現象原因', '/PPS/PPS010C/' + id + ',' + no, 800, 400); } } diff --git a/AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml b/AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml index b7e495d6..5d00a3fc 100644 --- a/AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml +++ b/AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml @@ -16,6 +16,8 @@
+ +
@@ -24,7 +26,7 @@
- +
diff --git a/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml index c2c87fcb..81d10129 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS014.cshtml @@ -96,7 +96,7 @@ hg.confirm("異常工時類別：" + obj.data.exceptionClassNo + "，确定要删除吗？", function () { $.ajax({ url: '/WHS/WHS014D', - data: { id: obj.data.groupID }, + data: { id: obj.data.exceptionClassNo }, type: 'POST', success: function (data) { if (data.success) { diff --git a/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml b/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml index 6592175d..f8792187 100644 --- a/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml +++ b/AMESCoreStudio.Web/Views/WHS/WHS016.cshtml @@ -206,7 +206,7 @@ if (obj.data.reasonNo) { hg.confirm("異常工時原因：" + obj.data.reasonDescCH + "，确定要删除吗？", function () { $.ajax({ - url: '/WHS/WHS001D', + url: '/WHS/WHS016D', data: { id: obj.data.reasonNo }, type: 'POST', success: function (data) { diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs index a70ada29..77d5ee15 100644 --- a/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs @@ -138,8 +138,12 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES return result; } - _context.Entry(nGReason).State = EntityState.Modified; - + _context.NGReasons.Attach(nGReason); + //_context.Entry(nGReason).State = EntityState.Modified; + _context.Entry(nGReason).Property(p => p.NGReasonDesc).IsModified = true; + _context.Entry(nGReason).Property(p => p.NGReasonDescEn).IsModified = true; + _context.Entry(nGReason).Property(p => p.ResponseDept).IsModified = true; + _context.Entry(nGReason).Property(p => p.Status).IsModified = true; try { await _context.SaveChangesAsync(); diff --git a/AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs b/AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs index 9242e1a1..cacba516 100644 --- a/AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs +++ b/AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs @@ -89,7 +89,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES /// /// 是否重複 /// - [Required] [Column("IS_REPEAT")] [Display(Name = "是否重複")] [StringLength(25)] diff --git a/AMESCoreStudio.WebApi/Models/AMESContext.cs b/AMESCoreStudio.WebApi/Models/AMESContext.cs index f18b7071..44b2973f 100644 --- a/AMESCoreStudio.WebApi/Models/AMESContext.cs +++ b/AMESCoreStudio.WebApi/Models/AMESContext.cs @@ -116,6 +116,7 @@ namespace AMESCoreStudio.WebApi modelBuilder.Entity().HasOne(r => r.FactoryUnit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired(); modelBuilder.Entity().HasKey(c => new { c.StockInNo, c.KPItem }); + modelBuilder.Entity().HasKey(c => new { c.NGClassNo, c.NGReasonNo }); } ///