JHSYS
/
AMES
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1.修改MAC資料維護的子窗口大小,並修改列印方式 

2.修改料號組件對應維護的是否重複為非必填
3.修改機種C/T資料維護的子窗口大小
4.修改機種C/T資料查詢的檢視窗口大小
5.修正修改不良現象原因資料後出現錯誤訊息
6.修正無效工時類別維護無法刪除
7.修正無效工時判定類別維護無法刪除資料
8.修改班別資料維護刪除提示信息
9.修改生產時段資料維護,不是啟用/停用(沒有狀態),而是刪除
PTD
Marvin 2 years ago
parent
97a3260e12
commit
acf4d07c5a
14 changed files with 42 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      AMESCoreStudio.Web/Views/BAS/BAS005.cshtml
  2. 9
      AMESCoreStudio.Web/Views/BAS/BAS006.cshtml
  3. 4
      AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
  4. 5
      AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml
  5. 5
      AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml
  6. 4
      AMESCoreStudio.Web/Views/PPS/PPS003.cshtml
  7. 2
      AMESCoreStudio.Web/Views/PPS/PPS004.cshtml
  8. 4
      AMESCoreStudio.Web/Views/PPS/PPS010.cshtml
  9. 4
      AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml
  10. 2
      AMESCoreStudio.Web/Views/WHS/WHS014.cshtml
  11. 2
      AMESCoreStudio.Web/Views/WHS/WHS016.cshtml
  12. 8
      AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs
  13. 1
      AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs
  14. 1
      AMESCoreStudio.WebApi/Models/AMESContext.cs

13
AMESCoreStudio.Web/Views/BAS/BAS005.cshtml
View File

@ -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 + '<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>';
btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> 啟用 / 停用 </a>';
if (item.statusNo == "A")
btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">停用</a>';
else if (item.statusNo == "S")
btns = btns + '<a class="layui-btn layui-btn-normal layui-btn-xs" lay-event="del">啟用</a>';
return btns;
}

9
AMESCoreStudio.Web/Views/BAS/BAS006.cshtml
View File

@ -75,7 +75,7 @@
templet: function (item) {
var btns = '';
btns = btns + '<a class="layui-btn layui-btn-xs" lay-event="edit">编辑</a>';
btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del"> 啟用 / 停用 </a>';
btns = btns + '<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">刪除</a>';
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);

4
AMESCoreStudio.Web/Views/KCS/KCS001.cshtml
View File

@ -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: '&#xe608;',
class: 'layui-btn-normal',
handler: function () {
hg.open('新增MAC資料', '/KCS/KCS001C', 640, 640);
hg.open('新增MAC資料', '/KCS/KCS001C', 640, 400);
}
}

5
AMESCoreStudio.Web/Views/KCS/KCS001C.cshtml
View File

@ -87,7 +87,10 @@
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="PrintType" class="control-label col-sm-3"></label>
<input asp-for="PrintType" class="form-control col-sm-9" placeholder="請輸入列印方式" />
<select asp-for="PrintType" class="custom-select col-sm-9">
<option value="AL">AL</option>
<option value="NA">NA</option>
</select>
<span asp-validation-for="PrintType" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">

5
AMESCoreStudio.Web/Views/KCS/KCS001U.cshtml
View File

@ -82,7 +82,10 @@
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="PrintType" class="control-label col-sm-3"></label>
<input asp-for="PrintType" class="form-control col-sm-9" placeholder="請輸入列印方式" />
<select asp-for="PrintType" class="custom-select col-sm-9">
<option value="AL">AL</option>
<option value="NA">NA</option>
</select>
<span asp-validation-for="PrintType" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">

4
AMESCoreStudio.Web/Views/PPS/PPS003.cshtml
View File

@ -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: '&#xe608;',
class: 'layui-btn-normal',
handler: function () {
hg.open('新增機種C/T資料', '/PPS/PPS003C', 800, 800);
hg.open('新增機種C/T資料', '/PPS/PPS003C', 800, 520);
}
}

2
AMESCoreStudio.Web/Views/PPS/PPS004.cshtml
View File

@ -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);
}
}

4
AMESCoreStudio.Web/Views/PPS/PPS010.cshtml
View File

@ -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);
}
}

4
AMESCoreStudio.Web/Views/PPS/PPS010U.cshtml
View File

@ -16,6 +16,8 @@
<form enctype="multipart/form-data" method="post" asp-action="PPS010USave">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<input type="hidden" asp-for="Status" />
<input type="hidden" asp-for="NGReasonNo" />
<input type="hidden" asp-for="NGClassNo" />
<div class="form-group form-inline my-sm-1">
<label asp-for="NGReasonNo" class="control-label col-sm-3"></label>
@ -24,7 +26,7 @@
</div>
<div class="form-group form-inline my-sm-1">
<label asp-for="NGClassNo" class="control-label col-sm-3"></label>
<select asp-for="NGClassNo" asp-items="@ViewBag.NGClassList" class="custom-select col-sm-9"></select>
<select asp-for="NGClassNo" asp-items="@ViewBag.NGClassList" class="custom-select col-sm-9" disabled></select>
<span asp-validation-for="NGClassNo" class="text-danger offset-sm-3 my-sm-1"></span>
</div>
<div class="form-group form-inline my-sm-1">

2
AMESCoreStudio.Web/Views/WHS/WHS014.cshtml
View File

@ -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) {

2
AMESCoreStudio.Web/Views/WHS/WHS016.cshtml
View File

@ -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) {

8
AMESCoreStudio.WebApi/Controllers/AMES/NGReasonsController.cs
View File

@ -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();

1
AMESCoreStudio.WebApi/Models/AMES/MaterialKp.cs
View File

@ -89,7 +89,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// <summary>
/// 是否重複
/// </summary>
[Required]
[Column("IS_REPEAT")]
[Display(Name = "是否重複")]
[StringLength(25)]

1
AMESCoreStudio.WebApi/Models/AMESContext.cs
View File

@ -116,6 +116,7 @@ namespace AMESCoreStudio.WebApi
modelBuilder.Entity<InspectionForm>().HasOne(r => r.FactoryUnit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
modelBuilder.Entity<SNKeyPart>().HasKey(c => new { c.StockInNo, c.KPItem });
modelBuilder.Entity<NGReason>().HasKey(c => new { c.NGClassNo, c.NGReasonNo });
}
/// <summary>

Write Preview
Loading…
Cancel
Save