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

1. 修正工單基本資料 工程維護人員 備註 

2. 供單開收線 修改顯示為中文
3. 修改鎖定條碼查詢 欄位描述
PTD
ray 3 years ago
parent
427656e55a
commit
2561a63220
13 changed files with 635 additions and 539 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. 16
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 17
      AMESCoreStudio.Web/Controllers/SYSController.cs
  3. 8
      AMESCoreStudio.Web/HttpApis/ISYS.cs
  4. 42
      AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
  5. 8
      AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
  6. 31
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  7. 4
      AMESCoreStudio.Web/Views/PCS/PCS006.cshtml
  8. 2
      AMESCoreStudio.Web/Views/PCS/PCS015.cshtml
  9. 1
      AMESCoreStudio.WebApi/Controllers/AMES/WipBoardController.cs
  10. 1
      AMESCoreStudio.WebApi/Controllers/AMES/WipSystemController.cs
  11. 14
      AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs
  12. 3
      AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
  13. 3
      AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs

16
AMESCoreStudio.Web/Controllers/PCSController.cs
View File

@ -1527,8 +1527,16 @@ namespace AMESCoreStudio.Web.Controllers
model.materialSops = q1.Data;
model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
if (model.wipBoard != null)
{
model.wipBoard.Engineer_Name = _sysApi.GetUserInfoByUserNo(model.wipBoard.Engineer).InvokeAsync().Result.UserName;
}
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
if (model.wipSystem != null)
{
model.wipSystem.Engineer_Name = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result.UserName;
}
model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
@ -1597,8 +1605,16 @@ namespace AMESCoreStudio.Web.Controllers
//var q1 = await _pcsApi.GetMaterialSopQuery(itemNo: model.wipAtt.ItemNO);
//model.materialSops = q1.Data;
model.wipBoard = await _pcsApi.GetWipBoard(model.wipInfo.WipNO);
if (model.wipBoard != null)
{
model.wipBoard.Engineer_Name = _sysApi.GetUserInfoByUserNo(model.wipBoard.Engineer).InvokeAsync().Result.UserName;
}
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
if (model.wipSystem != null)
{
model.wipSystem.Engineer_Name = _sysApi.GetUserInfoByUserNo(model.wipSystem.Engineer).InvokeAsync().Result.UserName;
}
model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);

17
AMESCoreStudio.Web/Controllers/SYSController.cs
View File

@ -133,6 +133,23 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new { data = item });
}
/// <summary>
/// 回傳UserName
/// </summary>
/// <param name="userNo">UserNo</param>
/// <returns></returns>
[HttpPost]
public async Task<JsonResult> getUserName(string userNo)
{
var result = await _sysApi.GetUserInfoByUserNo(userNo);
//将数据Json化并传到前台视图
if (result == null)
return Json(new { data = "" });
else
return Json(new { data = result.UserName });
}
#region SYS001系统资料维护相关
public IActionResult SYS001()

8
AMESCoreStudio.Web/HttpApis/ISYS.cs
View File

@ -349,6 +349,14 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpGet("api/UserInfoes")]
ITask<List<UserInfo>> GetUserInfoes(int page = 0, int limit = 10);
/// <summary>
/// 用UserNo 查詢
/// </summary>
/// <param name="id">UserNo</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/UserInfoes/ByUserNo/{id}")]
ITask<UserInfo> GetUserInfoByUserNo(string id);
#endregion
#region SYS009用户角色資料維護相關

42
AMESCoreStudio.Web/Views/PCS/PCS001.cshtml
View File

@ -299,16 +299,14 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">工程負責人員</label>
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="請輸入工號" />
<span style="color: #dc3545 !important;"></span>
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="" />
<span style="color: #dc3545 !important;"></span>
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
@ -435,21 +433,18 @@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">工程負責人員</label>
<label class="layui-form-label" asp-for="wipSystem.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-action="PCS001" autocomplete="off" placeholder="請輸入工號" />
<span style="color: #dc3545 !important;"></span>
<input class="layui-input" asp-for="wipSystem.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" autocomplete="off" placeholder="" />
<span style="color: #dc3545 !important;"></span>
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">Power Mode</label>
@ -637,7 +632,7 @@
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" />
<input class="layui-input" asp-for="wipSystem.Memo" />
</div>
</div>
</div>
@ -736,6 +731,10 @@
$("#board").show();
}
if ($('#wipAtt_ItemNO').val() != "" && $('#wipInfo_PlanQTY').val() != "") {
$("#GetMAC").hide();
}
var error = '@Html.ValidationMessage("error")';
if ($(error).text() != '') {
parent.hg.msg(error);
@ -1157,5 +1156,24 @@
$('#OutfitTable').append(contactdiv);
});
}
//UserName
function getUserName(val) {
$.ajax(
{
url: "@Url.Action("getUserName", "SYS")",
dataType: 'json',
data: { "userNo": val.value},
type: 'post',
success: function (result)
{
$(val).closest('div.layui-inline').find('input[id*=' + val.id + '_Name]').val(result.data);
},
error: function (result)
{
alert(result);
}
});
};
</script>
}

8
AMESCoreStudio.Web/Views/PCS/PCS001R.cshtml
View File

@ -438,6 +438,7 @@
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
@ -446,7 +447,8 @@
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.GetUserInfo.UserName" readonly="readonly" />
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
@ -575,7 +577,7 @@
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.GetUserInfo.UserName" readonly="readonly" />
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
@ -724,7 +726,7 @@
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" />
<input class="layui-input" asp-for="wipSystem.Memo" />
</div>
</div>
</div>

31
AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
View File

@ -417,15 +417,17 @@
@* 板卡-工程資訊sheet *@
<div class="layui-tab-item">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipBoard.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.Engineer" readonly="readonly" />
<input class="layui-input" asp-for="wipBoard.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipBoard.GetUserInfo.UserName" readonly="readonly" />
<input class="layui-input" asp-for="wipBoard.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
@ -550,12 +552,12 @@
<div class="layui-inline">
<label class="layui-form-label" asp-for="wipSystem.Engineer"></label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.Engineer" />
<input class="layui-input" asp-for="wipSystem.Engineer" onchange="getUserName(this);" />
</div>
<label class="layui-form-label">姓名</label>
<div class="layui-input-inline">
<input class="layui-input" asp-for="wipSystem.GetUserInfo.UserName" readonly="readonly" />
<input class="layui-input" asp-for="wipSystem.Engineer_Name" readonly="readonly" />
</div>
</div>
</div>
@ -747,7 +749,7 @@
<div class="layui-form-item">
<label class="layui-form-label">備註</label>
<div class="layui-input-block">
<input class="layui-input" />
<input class="layui-input" asp-for="wipSystem.Memo" />
</div>
</div>
</div>
@ -1043,6 +1045,25 @@
});
};
//UserName
function getUserName(val) {
$.ajax(
{
url: "@Url.Action("getUserName", "SYS")",
dataType: 'json',
data: { "userNo": val.value},
type: 'post',
success: function (result)
{
$(val).closest('div.layui-inline').find('input[id*=' + val.id + '_Name]').val(result.data);
},
error: function (result)
{
alert(result);
}
});
};
// RuleStation
function RuleStation(NewID) {
if (NewID == null) {

4
AMESCoreStudio.Web/Views/PCS/PCS006.cshtml
View File

@ -98,7 +98,7 @@
wipID = strSplit[0];
else
wipID = -1;
var confirmMsg = confirm('Are You Sure Change WorkOrder ?');
var confirmMsg = confirm('確定要變更該工單的開線或是收線狀態?');
if (confirmMsg) {
$.ajax({
@ -132,7 +132,7 @@
else
statusNO = "S"
var confirmMsg = confirm('Are You Sure Active Or Stop This Line ?');
var confirmMsg = confirm('確定要啟動或停止此生產線?');
if (confirmMsg) {
$.ajax({

2
AMESCoreStudio.Web/Views/PCS/PCS015.cshtml
View File

@ -42,7 +42,7 @@
<div class="layui-inline">
<label class="layui-form-label">內部條碼:</label>
<div class="layui-input-inline" style="width:150px">
<input id="barCodeNo" name="barCodeNo" autocomplete="off" class="layui-input" placeholder="請輸入料號">
<input id="barCodeNo" name="barCodeNo" autocomplete="off" class="layui-input" placeholder="請輸入內部條碼">
</div>
</div>
</div>

1
AMESCoreStudio.WebApi/Controllers/AMES/WipBoardController.cs
View File

@ -104,6 +104,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
getWipBoard.PcbBake = wipBoard.PcbBake;
getWipBoard.Smd = wipBoard.Smd;
getWipBoard.SolderPaste = wipBoard.SolderPaste;
getWipBoard.Engineer = wipBoard.Engineer;
getWipBoard.UpdateDate = DateTime.Now;
getWipBoard.UpdateUserID = 0;
}

1
AMESCoreStudio.WebApi/Controllers/AMES/WipSystemController.cs
View File

@ -102,6 +102,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
getwipSystem.OsVer = wipSystem.OsVer;
getwipSystem.PowerMode = wipSystem.PowerMode;
getwipSystem.Ram = wipSystem.Ram;
getwipSystem.Engineer = wipSystem.Engineer;
getwipSystem.UpdateDate = DateTime.Now;
getwipSystem.UpdateUserID = 0;
}

14
AMESCoreStudio.WebApi/Controllers/SYS/UserInfoesController.cs
View File

@ -71,6 +71,20 @@ namespace AMESCoreStudio.WebApi.Controllers.SYS
return userInfo;
}
/// <summary>
/// UserInfo By UserNo
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
// GET: api/UserInfoes/5
[HttpGet("ByUserNo/{id}")]
public async Task<ActionResult<UserInfo>> GetUserInfoByUserNo(string id)
{
IQueryable<UserInfo> q = _context.UserInfoes.Where(w => w.UserNo.ToUpper() == id.ToUpper());
var userInfo = await q.FirstOrDefaultAsync();
return userInfo;
}
/// <summary>
///
/// </summary>

3
AMESCoreStudio.WebApi/Models/AMES/WipBoard.cs
View File

@ -224,8 +224,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[NotMapped]
[DataMember]
[ForeignKey("Engineer")]
public SYS.UserInfo GetUserInfo { get; set; }
public string Engineer_Name { get; set; }
}
}

3
AMESCoreStudio.WebApi/Models/AMES/WipSystem.cs
View File

@ -349,7 +349,6 @@ namespace AMESCoreStudio.WebApi.Models.AMES
/// </summary>
[NotMapped]
[DataMember]
[ForeignKey("Engineer")]
public SYS.UserInfo GetUserInfo { get; }
public string Engineer_Name { get; set; }
}
}

Write Preview
Loading…
Cancel
Save