diff --git a/AMESCoreStudio.Web/Controllers/BASController.cs b/AMESCoreStudio.Web/Controllers/BASController.cs index 5f7d9ce0..025210cc 100644 --- a/AMESCoreStudio.Web/Controllers/BASController.cs +++ b/AMESCoreStudio.Web/Controllers/BASController.cs @@ -403,7 +403,10 @@ namespace AMESCoreStudio.Web.Controllers { model.UpdateDate = System.DateTime.Now; - model.StatusNo = "S"; + if(model.StatusNo == "S") + model.StatusNo = "A"; + else if (model.StatusNo == "A") + model.StatusNo = "S"; var result = await _basApi.PutLineInfo(model.LineID, JsonConvert.SerializeObject(model)); return Json(new Result() { success = true, msg = "" }); } diff --git a/AMESCoreStudio.Web/Views/BAS/BAS001.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS001.cshtml index dabe9ba0..5d701dae 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS001.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS001.cshtml @@ -50,12 +50,17 @@ width: 160 }, { - field: 'right', - width: 200, + field: 'center', + width: 160, title: '操作', - fixed: 'right', templet: function (d) { - return '修改 删除' + var btn = '修改'; + if (d.statusNo=="A") + btn += ' 停用'; + else + btn += ' 啟用'; + return btn + //return '修改 删除' } }] ]; @@ -69,16 +74,22 @@ //通过行tool删除，lay-event="del" function del(obj) { + var str; + if (obj.data.statusNo == "A") + str = "停用"; + else + str = "啟用"; if (obj.data.factoryID) { - hg.confirm("系統：" + obj.data.factoryNameCh + "，确定要删除吗？", function () { + hg.confirm("系統：" + obj.data.factoryNameCh + "，確定要"+str+"嗎？", function () { $.ajax({ url: '/BAS/BAS001D', data: { id: obj.data.factoryID }, type: 'POST', success: function (data) { if (data.success) { - obj.del(); //只删本地数据 - hg.msghide("删除成功！"); + //obj.del(); //只删本地数据 + hg.msghide(str + "成功！"); + table && table.reload(data); } else { hg.msg(data.msg); diff --git a/AMESCoreStudio.Web/Views/BAS/BAS002.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS002.cshtml index fc080f54..df47dc76 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS002.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS002.cshtml @@ -2,7 +2,6 @@ ViewData["Title"] = "生產製程單位維護"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } -
@@ -12,91 +11,232 @@
+
+ +
@section Scripts{ -} \ No newline at end of file + + + } \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml index da672203..63ee2c09 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS003.cshtml @@ -54,7 +54,12 @@ } } if (obj.event == 'del') { - hg.confirm("系統：" + obj.data.lineDesc + "，确定要停用吗？", function () { + var str; + if (obj.data.statusNo == 'A') + str = '停用'; + else + str = '啟用'; + hg.confirm("系統：" + obj.data.lineDesc + "，确定要"+str+"吗？", function () { $.ajax({ url: '/BAS/BAS003U2', //抓取停用 data: { model: obj.data }, @@ -63,6 +68,8 @@ if (data.success) { //obj.del(); //只删本地数据 hg.msghide("成功！"); + var aa = $("#unitId").val(); + request(aa); } else { hg.msg(data.msg); @@ -126,7 +133,7 @@ tree: { iconIndex: -1, isPidData: false, - idName: 'lineID' + idName: 'lineID', }, cols: [ { @@ -145,7 +152,6 @@ }, { field: 'dept', - width: 100, title: '部門名稱', templet: function (d) { return d.dept["deptName"]; @@ -163,11 +169,16 @@ width: 80 }, { - align: 'center', title: '操作', - templet: function (item) { + align: 'center' + , title: '操作' + , width: 200 + ,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 bfbc898d..b15df396 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS006.cshtml @@ -2,6 +2,28 @@ ViewData["Title"] = "生產時段資料維護"; Layout = "~/Views/Shared/_AMESLayout.cshtml"; } + +
@@ -12,89 +34,194 @@
+
+ +
@section Scripts{ } \ No newline at end of file diff --git a/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml b/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml index 30bfd12d..04318460 100644 --- a/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml +++ b/AMESCoreStudio.Web/Views/BAS/BAS008.cshtml @@ -54,15 +54,22 @@ } } if (obj.event == 'del') { - hg.confirm("系統：" + obj.data.stationName + "，确定要删除吗？", function () { + var str; + if (obj.data.statusNo == 'A') + str = '停用'; + else + str = '啟用'; + hg.confirm("系統：" + obj.data.stationName + "确定要" + str +"吗？", function () { $.ajax({ url: '/BAS/BAS008D', data: { id: obj.data.stationID }, type: 'POST', success: function (data) { if (data.success) { - obj.del(); //只删本地数据 + //obj.del(); //只删本地数据 hg.msghide("删除成功！"); + var aa = $("#unitId").val(); + request(aa); } else { hg.msg(data.msg); @@ -127,7 +134,7 @@ tree: { iconIndex: -1, isPidData: false, - idName: 'classID' + idName: 'stationID' }, cols: [ { @@ -171,11 +178,15 @@ // } //}, { - align: 'center', title: '操作', + align: 'center' title: '操作', width: 160, 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/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll index dbc163ab..7c5300b9 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 c68c6a04..af1d24f4 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.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll index 1f279ab2..95452e9c 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 3b1f481d..a6a8a8da 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 1034b1d1..579a4e4c 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 f77737ab..186ce747 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.dll b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 413b527f..d78d036b 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 57015f40..20e2e622 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 e0d241a8..9c1c114c 100644 --- a/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -179,6 +179,59 @@ + + + 異常原因維護 + + + + + + + + + + + + + + + + + + + + + + + + 根据異常類別獲取該類別異常原因資料 + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,20 +296,20 @@ - 獲取產品別資料 + 查詢工單資料Att - + - 工單機種資料 to Wipatt_NO + 查詢工單資料Att By WipNO - + 工單號碼 - 新增工單資料 + 新增工單資料Att @@ -272,9 +325,22 @@ + + + 查詢工單資料Barcode + + + + + + 查詢工單資料Barcode By WipNO + + 工單號碼 + + - 新增工單資料-條碼 + 新增工單資料-條碼Barcode @@ -292,15 +358,21 @@ - 獲取產品別資料 + 查詢工單資料Info - + - 獲取產品別資料 + 查詢工單資料 by SelectParameter + + + + + + 查詢工單資料Info By WipID - + WipID @@ -842,11 +914,13 @@ - + 根據流程ID獲取該流程站別資料 + + @@ -1547,6 +1621,21 @@ + + + WipInfo Select Dto + + + + + 工單號碼 + + + + + 生產單位 + + @@ -1702,6 +1791,21 @@ 部門 + + + + + + + + 外部異常 + + + + + 內部異常 + + 平台类型 @@ -1921,22 +2025,22 @@ - 流程規則資料 + 條碼狀態資料 - 流程規則資料 + 異常群組資料 - 流程規則資料 + 異常類別資料 - 流程規則資料 + 工單狀態資料 @@ -1949,6 +2053,11 @@ 工單條碼起迄資料檔 + + + 異常原因資料 + + 條碼變更資料表 @@ -2094,6 +2203,56 @@ 異常群組名稱 + + + 异常代码资料表 + + + + + 異常原因代碼 + + + + + 異常類別代碼 + + + + + 異常原因描述 + + + + + 異常原因英文描述 + + + + + 內外部損耗分類 + + + + + 責任單位 + + + + + 內部流程代碼 + + + + + 成本屬性代碼 + + + + + 生產單位 + + 用户资料表 @@ -3194,6 +3353,31 @@ 部門资料 + + + 虛擬物件 + + + + + Str1 + + + + + Str2 + + + + + Int1 + + + + + Int2 + + 站别資料 diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs index 6621d199..43a3ea2f 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/ClassInfoesController.cs @@ -37,6 +37,7 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS public async Task>> GetClassInfo() { IQueryable q = _context.ClassInfoes; + q = q.OrderBy(p => p.ClassID); var classInfo = await q.ToListAsync(); diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs index f3510a1a..3cd794ef 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs @@ -159,7 +159,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS factoryInfoNew = factoryInfo; _context.Entry(factoryInfoNew).State = EntityState.Modified; - factoryInfoNew.StatusNo = "S"; + ; + if (factoryInfo.StatusNo == "A") + factoryInfoNew.StatusNo = "S"; + else + factoryInfoNew.StatusNo = "A"; factoryInfoNew.UpdateDate = DateTime.Now; try diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/FactoryUnitsController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/FactoryUnitsController.cs index fb425b94..5accd402 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/FactoryUnitsController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/FactoryUnitsController.cs @@ -138,7 +138,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS factoryUnitNew = factoryUnit; _context.Entry(factoryUnitNew).State = EntityState.Modified; - factoryUnitNew.StatusNo = "S"; + if(factoryUnit.StatusNo =="A") + factoryUnitNew.StatusNo = "S"; + else + factoryUnitNew.StatusNo = "A"; try { diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs index fa874e9e..77ff45a1 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs @@ -192,7 +192,11 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS lineInfoNew = lineInfo; _context.Entry(lineInfoNew).State = EntityState.Modified; - lineInfoNew.StatusNo = "S"; + if(lineInfo.StatusNo=="A") + lineInfoNew.StatusNo = "S"; + if (lineInfo.StatusNo == "S") + lineInfoNew.StatusNo = "A"; + lineInfoNew.UpdateDate = DateTime.Now; try diff --git a/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs b/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs index 1caf6b97..784e696e 100644 --- a/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs +++ b/AMESCoreStudio.WebApi/Controllers/BAS/StationsesController.cs @@ -184,8 +184,10 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS stationsNew = stations; _context.Entry(stationsNew).State = EntityState.Modified; - stationsNew.StatusNo = "S"; - + if(stations.StatusNo == "A") + stationsNew.StatusNo = "S"; + else + stationsNew.StatusNo = "A"; try { await _context.SaveChangesAsync(); diff --git a/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs b/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs index 7de80425..7d3e1fe7 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/ClassInfo.cs @@ -133,8 +133,12 @@ namespace AMESCoreStudio.WebApi.Models.BAS /// /// 生產單位 /// - //public virtual AMESCoreStudio.WebApi.Models.BAS.FactoryUnit Unit { get; set; } - - + //public virtual System.Collections.Generic.ICollection Unit { get; set; } + //public virtual FactoryUnit Unit { get; set; } + //public class Other + //{ + // public string Member { get; set; } + //} + } } diff --git a/AMESCoreStudio.WebApi/Models/BAS/FactoryUnit.cs b/AMESCoreStudio.WebApi/Models/BAS/FactoryUnit.cs index 4ab7344b..19975fff 100644 --- a/AMESCoreStudio.WebApi/Models/BAS/FactoryUnit.cs +++ b/AMESCoreStudio.WebApi/Models/BAS/FactoryUnit.cs @@ -57,6 +57,7 @@ namespace AMESCoreStudio.WebApi.Models.BAS /// 狀態 /// [Column("STATUS_NO")] + [DataMember] public String StatusNo { 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 1034b1d1..579a4e4c 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 f77737ab..186ce747 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.dll b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll index 413b527f..d78d036b 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 57015f40..20e2e622 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 e0d241a8..9c1c114c 100644 --- a/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml +++ b/AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml @@ -179,6 +179,59 @@ + + + 異常原因維護 + + + + + + + + + + + + + + + + + + + + + + + + 根据異常類別獲取該類別異常原因資料 + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,20 +296,20 @@ - 獲取產品別資料 + 查詢工單資料Att - + - 工單機種資料 to Wipatt_NO + 查詢工單資料Att By WipNO - + 工單號碼 - 新增工單資料 + 新增工單資料Att @@ -272,9 +325,22 @@ + + + 查詢工單資料Barcode + + + + + + 查詢工單資料Barcode By WipNO + + 工單號碼 + + - 新增工單資料-條碼 + 新增工單資料-條碼Barcode @@ -292,15 +358,21 @@ - 獲取產品別資料 + 查詢工單資料Info - + - 獲取產品別資料 + 查詢工單資料 by SelectParameter + + + + + + 查詢工單資料Info By WipID - + WipID @@ -842,11 +914,13 @@ - + 根據流程ID獲取該流程站別資料 + + @@ -1547,6 +1621,21 @@ + + + WipInfo Select Dto + + + + + 工單號碼 + + + + + 生產單位 + + @@ -1702,6 +1791,21 @@ 部門 + + + + + + + + 外部異常 + + + + + 內部異常 + + 平台类型 @@ -1921,22 +2025,22 @@ - 流程規則資料 + 條碼狀態資料 - 流程規則資料 + 異常群組資料 - 流程規則資料 + 異常類別資料 - 流程規則資料 + 工單狀態資料 @@ -1949,6 +2053,11 @@ 工單條碼起迄資料檔 + + + 異常原因資料 + + 條碼變更資料表 @@ -2094,6 +2203,56 @@ 異常群組名稱 + + + 异常代码资料表 + + + + + 異常原因代碼 + + + + + 異常類別代碼 + + + + + 異常原因描述 + + + + + 異常原因英文描述 + + + + + 內外部損耗分類 + + + + + 責任單位 + + + + + 內部流程代碼 + + + + + 成本屬性代碼 + + + + + 生產單位 + + 用户资料表 @@ -3194,6 +3353,31 @@ 部門资料 + + + 虛擬物件 + + + + + Str1 + + + + + Str2 + + + + + Int1 + + + + + Int2 + + 站别資料