Browse Source

1.修改異常工時生產單位下拉連動線別及站別選項

2.修改標準工時3個欄位[首件產出/節拍時間/操機數]為非必填
PTD
Shani 3 years ago
parent
commit
e7fce311e9
  1. 2
      AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml
  2. 70
      AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml
  3. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll
  4. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb
  5. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
  6. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb
  7. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  8. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  9. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  10. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  11. 131
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
  12. 9
      AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs
  13. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  14. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  15. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  16. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  17. 131
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

2
AMESCoreStudio.Web/Views/WHS/WHS003C.cshtml

@ -25,7 +25,7 @@
<div class="form-group form-inline my-sm-1"> <div class="form-group form-inline my-sm-1">
<label asp-for="ItemNo" class="control-label col-sm-3"></label> <label asp-for="ItemNo" class="control-label col-sm-3"></label>
<input asp-for="ItemNo" class="form-control col-sm-9" placeholder="請輸入單位代碼" /> <input asp-for="ItemNo" class="form-control col-sm-9" placeholder="請輸入料號" />
<span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span> <span asp-validation-for="ItemNo" class="text-danger offset-sm-3 my-sm-1"></span>
</div> </div>
<div class="form-group form-inline my-sm-1"> <div class="form-group form-inline my-sm-1">

70
AMESCoreStudio.Web/Views/WHS/WHS009C.cshtml

@ -31,7 +31,7 @@
</div> </div>
<div class="form-group form-inline my-sm-1"> <div class="form-group form-inline my-sm-1">
<label asp-for="LineID" class="control-label col-sm-3"></label> <label asp-for="LineID" class="control-label col-sm-3"></label>
<select asp-for="LineID" asp-items="@ViewBag.LineList" class="custom-select col-sm-9"> <select id="LineID" asp-for="LineID" asp-items="@ViewBag.LineList" class="custom-select col-sm-9">
</select> </select>
<span asp-validation-for="LineID" class="text-danger offset-sm-3 my-sm-1"></span> <span asp-validation-for="LineID" class="text-danger offset-sm-3 my-sm-1"></span>
</div> </div>
@ -42,7 +42,7 @@
</div> </div>
<div class="form-group form-inline my-sm-1"> <div class="form-group form-inline my-sm-1">
<label asp-for="StationID" class="control-label col-sm-3"></label> <label asp-for="StationID" class="control-label col-sm-3"></label>
<select asp-for="StationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9"> <select id="StationID" asp-for="StationID" asp-items="@ViewBag.StationList" class="custom-select col-sm-9">
<option value="">N/A</option> <option value="">N/A</option>
</select> </select>
<span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span> <span asp-validation-for="StationID" class="text-danger offset-sm-3 my-sm-1"></span>
@ -242,6 +242,12 @@
} }
}); });
$("#UnitNo").change(function () {
var data = $("#UnitNo").val();
//console.info(data);
getLines(data);
getStations(data);
});
function getUserInfoes(data) { function getUserInfoes(data) {
$.ajax({ $.ajax({
@ -340,6 +346,66 @@
} }
}); });
}; };
function getLines(data) {
$.ajax({
url: "/BAS/GetLineInfoes",
dataType: 'json',
contentType: "application/json",
type: 'get',
success: function (result) {
if (result.data) {
$("#LineID").empty();
$('#LineID').append(new Option("請選擇", ""));
var count = 0;
$.each(result.data, function (index, item) {
if (item.unitNo == data) {
$('#LineID').append(new Option(item.lineDesc, item.lineID));
count = count + 1;
}
});
if (count == 0) {
$("#LineID").empty();
$('#LineID').append(new Option("無選項", ""));
}
}
else {
$("#LineID").empty();
$('#LineID').append(new Option("無選項", ""));
}
layui.form.render("select");
}
});
};
function getStations(data) {
$.ajax({
url: "/BAS/GetStationses",
dataType: 'json',
contentType: "application/json",
type: 'get',
success: function (result) {
if (result.data) {
$("#StationID").empty();
$('#StationID').append(new Option("請選擇", ""));
var count = 0;
$.each(result.data, function (index, item) {
if (item.unitNo == data) {
$('#StationID').append(new Option(item.stationName, item.stationID));
count = count + 1;
}
});
if (count == 0) {
$("#StationID").empty();
$('#StationID').append(new Option("無選項", ""));
}
}
else {
$("#StationID").empty();
$('#StationID').append(new Option("無選項", ""));
}
layui.form.render("select");
}
});
};
layui.use(['laydate'], function () { layui.use(['laydate'], function () {
//form = layui.form; //form = layui.form;

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll

Binary file not shown.

BIN
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb

Binary file not shown.

131
AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@ -2199,6 +2199,13 @@
<param name="no"></param> <param name="no"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.String)">
<summary>
ByWipNo
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.PutNgInfo(AMESCoreStudio.WebApi.Models.AMES.NgInfo)"> <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.PutNgInfo(AMESCoreStudio.WebApi.Models.AMES.NgInfo)">
<summary> <summary>
@ -4263,6 +4270,25 @@
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController.PutWipReturn(AMESCoreStudio.WebApi.Models.AMES.WipReturn)">
<summary>
更新工單序號退回紀錄
</summary>
<param name="wipReturn"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController.PostWipReturn(AMESCoreStudio.WebApi.Models.AMES.WipReturn)">
<summary>
新增工單序號退回紀錄
</summary>
<param name="wipReturn"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipRuleController.#ctor(AMESCoreStudio.WebApi.AMESContext)"> <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipRuleController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
<summary> <summary>
@ -12395,6 +12421,51 @@
更新日期 更新日期
</summary> </summary>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.Models.AMES.WipReturn">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.WipRetrueID">
<summary>
ID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.WipNo">
<summary>
工單號碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.GoruleStationId">
<summary>
指定過站 RuleStation
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.ReruleStationId">
<summary>
返回過站 RuleStation
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.Type">
<summary>
返回類型 P:單站退回 A:通過退回
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.Memo">
<summary>
備註
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.CreateUserID">
<summary>
建立UserID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.CreateDate">
<summary>
建立日期
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.Models.AMES.WipRule"> <member name="T:AMESCoreStudio.WebApi.Models.AMES.WipRule">
<summary> <summary>
工單條碼規則設定文件檔 工單條碼規則設定文件檔
@ -14945,6 +15016,61 @@
更新日期 更新日期
</summary> </summary>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto">
<summary>
不良維修 Dto
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.StationName">
<summary>
流程站
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.NGNo">
<summary>
不良代碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.NGNoDesc">
<summary>
不良代碼說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.LocationNo">
<summary>
零件位置
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.Status">
<summary>
處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判)
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairNo">
<summary>
維修代碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairNoDesc">
<summary>
維修代碼說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairDesc">
<summary>
維修說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.ReplyUser">
<summary>
回覆人員
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.ReplyDate">
<summary>
回覆日期
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.DTO.AMES.OutfitStatusLogDto"> <member name="T:AMESCoreStudio.WebApi.DTO.AMES.OutfitStatusLogDto">
<summary> <summary>
MaterialKpDtp Select Dto MaterialKpDtp Select Dto
@ -16934,6 +17060,11 @@
樣本序號取得記錄資料表 樣本序號取得記錄資料表
</summary> </summary>
</member> </member>
<member name="P:AMESCoreStudio.WebApi.AMESContext.WipReturns">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.Program"> <member name="T:AMESCoreStudio.WebApi.Program">
<summary> <summary>

9
AMESCoreStudio.WebApi/Models/AMES/StandardWorkTime.cs

@ -63,8 +63,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Column("FIRST_TIME")] [Column("FIRST_TIME")]
[DataMember] [DataMember]
[Display(Name = "首件產出時間(分)")] [Display(Name = "首件產出時間(分)")]
[Required(ErrorMessage = "{0},不能空白")] public decimal? FirstTime { get; set; }
public decimal FirstTime { get; set; }
/// <summary> /// <summary>
/// CT /// CT
@ -81,8 +80,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Column("CT")] [Column("CT")]
[DataMember] [DataMember]
[Display(Name = "節拍時間(分)")] [Display(Name = "節拍時間(分)")]
[Required(ErrorMessage = "{0},不能空白")] public decimal? CT { get; set; }
public decimal CT { get; set; }
/// <summary> /// <summary>
/// 操機數 /// 操機數
@ -90,8 +88,7 @@ namespace AMESCoreStudio.WebApi.Models.AMES
[Column("MACHINE_CNT")] [Column("MACHINE_CNT")]
[DataMember] [DataMember]
[Display(Name = "操機數(台/人)")] [Display(Name = "操機數(台/人)")]
[Required(ErrorMessage = "{0},不能空白")] public decimal? MachineCT { get; set; }
public decimal MachineCT { get; set; }
/// <summary> /// <summary>
/// 正背面 /// 正背面

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll

Binary file not shown.

BIN
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb

Binary file not shown.

131
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml

@ -2199,6 +2199,13 @@
<param name="no"></param> <param name="no"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.GetNgInfoByBarcodeNoFromPCS009(System.String)">
<summary>
ByWipNo
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.PutNgInfo(AMESCoreStudio.WebApi.Models.AMES.NgInfo)"> <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.NgInfoController.PutNgInfo(AMESCoreStudio.WebApi.Models.AMES.NgInfo)">
<summary> <summary>
@ -4263,6 +4270,25 @@
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController.PutWipReturn(AMESCoreStudio.WebApi.Models.AMES.WipReturn)">
<summary>
更新工單序號退回紀錄
</summary>
<param name="wipReturn"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipReturnController.PostWipReturn(AMESCoreStudio.WebApi.Models.AMES.WipReturn)">
<summary>
新增工單序號退回紀錄
</summary>
<param name="wipReturn"></param>
<returns></returns>
</member>
<member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipRuleController.#ctor(AMESCoreStudio.WebApi.AMESContext)"> <member name="M:AMESCoreStudio.WebApi.Controllers.AMES.WipRuleController.#ctor(AMESCoreStudio.WebApi.AMESContext)">
<summary> <summary>
@ -12395,6 +12421,51 @@
更新日期 更新日期
</summary> </summary>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.Models.AMES.WipReturn">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.WipRetrueID">
<summary>
ID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.WipNo">
<summary>
工單號碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.GoruleStationId">
<summary>
指定過站 RuleStation
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.ReruleStationId">
<summary>
返回過站 RuleStation
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.Type">
<summary>
返回類型 P:單站退回 A:通過退回
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.Memo">
<summary>
備註
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.CreateUserID">
<summary>
建立UserID
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.Models.AMES.WipReturn.CreateDate">
<summary>
建立日期
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.Models.AMES.WipRule"> <member name="T:AMESCoreStudio.WebApi.Models.AMES.WipRule">
<summary> <summary>
工單條碼規則設定文件檔 工單條碼規則設定文件檔
@ -14945,6 +15016,61 @@
更新日期 更新日期
</summary> </summary>
</member> </member>
<member name="T:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto">
<summary>
不良維修 Dto
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.StationName">
<summary>
流程站
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.NGNo">
<summary>
不良代碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.NGNoDesc">
<summary>
不良代碼說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.LocationNo">
<summary>
零件位置
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.Status">
<summary>
處理狀態(0:尚未維修處理, 1:已維修處理, 2:誤判)
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairNo">
<summary>
維修代碼
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairNoDesc">
<summary>
維修代碼說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.RepairDesc">
<summary>
維修說明
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.ReplyUser">
<summary>
回覆人員
</summary>
</member>
<member name="P:AMESCoreStudio.WebApi.DTO.AMES.NGInfoDto.ReplyDate">
<summary>
回覆日期
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.DTO.AMES.OutfitStatusLogDto"> <member name="T:AMESCoreStudio.WebApi.DTO.AMES.OutfitStatusLogDto">
<summary> <summary>
MaterialKpDtp Select Dto MaterialKpDtp Select Dto
@ -16934,6 +17060,11 @@
樣本序號取得記錄資料表 樣本序號取得記錄資料表
</summary> </summary>
</member> </member>
<member name="P:AMESCoreStudio.WebApi.AMESContext.WipReturns">
<summary>
工單序號退回紀錄
</summary>
</member>
<member name="T:AMESCoreStudio.WebApi.Program"> <member name="T:AMESCoreStudio.WebApi.Program">
<summary> <summary>

Loading…
Cancel
Save