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

1. 修正過站判斷組件數量 

2. 工單資料修正 各項目刪除失效
PTD
Ray 3 years ago
parent
109adac469
commit
c8ca8b602d
3 changed files with 62 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 95
      AMESCoreStudio.Web/Views/PCS/PCS003.cshtml
  3. 2
      AMESCoreStudio.Web/Views/PCS/PCS021.cshtml

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

@ -1429,7 +1429,7 @@ namespace AMESCoreStudio.Web.Controllers
Title = item.Title, Title = item.Title,
CreateUserID = UserID, CreateUserID = UserID,
UpdateUserID = UserID UpdateUserID = UserID
}; };
await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp)); await _pcsApi.PostWipKp(JsonConvert.SerializeObject(wipKp));
} }
@ -1446,7 +1446,7 @@ namespace AMESCoreStudio.Web.Controllers
PartNo = item.StationType, PartNo = item.StationType,
CreateUserID = UserID, CreateUserID = UserID,
UpdateUserID = UserID UpdateUserID = UserID
}; };
await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(wipOutfit)); await _pcsApi.PostWipOutfit(JsonConvert.SerializeObject(wipOutfit));
} }
@ -1464,7 +1464,7 @@ namespace AMESCoreStudio.Web.Controllers
SOPType = item.SopType, SOPType = item.SopType,
CreateUserID = UserID, CreateUserID = UserID,
UpdateUserID = UserID UpdateUserID = UserID
}; };
await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop)); await _pcsApi.PostWipSop(JsonConvert.SerializeObject(wipSop));
} }
} }
@ -3482,7 +3482,12 @@ namespace AMESCoreStudio.Web.Controllers
int i = 0; int i = 0;
foreach (var KeyPartItem in model.Inputs) foreach (var KeyPartItem in model.Inputs)
{ {
if (i + KpItemQty > model.WipKps.Count())
{
Msg = "已刷超過組件數量";
Success = false;
return Json(new Result() { success = Success, msg = Msg, data = Data });
}
keyParts.Add(new BarCodeCheckDto.inputItem keyParts.Add(new BarCodeCheckDto.inputItem
{ {
inputType = KeyPartItem.Contains("$") ? "NG" : model.WipKps[i + KpItemQty].KpNo, inputType = KeyPartItem.Contains("$") ? "NG" : model.WipKps[i + KpItemQty].KpNo,

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

@ -233,47 +233,47 @@
@* 序號編碼sheet *@ @* 序號編碼sheet *@
<div class="layui-tab-item"> <div class="layui-tab-item">
<label class="layui-form-label">生產序號</label> <label class="layui-form-label">生產序號</label>
<table id="MydataTable" class="layui-table"> <table id="MydataTable" class="layui-table">
<thead> <thead>
<tr> <tr>
<th> <th>
起始生產序號 起始生產序號
</th> </th>
<th> <th>
結束生產序號 結束生產序號
</th> </th>
</tr>
</thead>
<tbody>
@foreach (var index in Model.wipBarcodes)
{
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
</tr> </tr>
</thead> }
<tbody> </tbody>
@foreach (var index in Model.wipBarcodes) </table>
{
<tr>
<td>
@index.StartNO
</td>
<td>
@index.EndNO
</td>
</tr>
}
</tbody>
</table>
@*<div class="layui-form-item"> @*<div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">生產序號</label> <label class="layui-form-label">生產序號</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input asp-for="wipBarcode.StartNO" class="layui-input" /> <input asp-for="wipBarcode.StartNO" class="layui-input" />
</div> </div>
<div class="layui-form-mid">-</div> <div class="layui-form-mid">-</div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input asp-for="wipBarcode.EndNO" class="layui-input" /> <input asp-for="wipBarcode.EndNO" class="layui-input" />
</div> </div>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" /> <input id="GetBarCode" class="layui-btn layui-btn-primary layui-border-blue layui-btn-sm" type="button" value="產生條碼" />
</div>
</div> </div>
</div> </div>*@
</div>*@
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
@ -1374,7 +1374,8 @@
}); });
SelectKPNo += '</select>'; SelectKPNo += '</select>';
var contactdiv = '<tr>' + var contactdiv = '<tr>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' + '<td><input type="hidden" value="" name="WipKps[' + No + '].WipKpID" />' +
'<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpName" /></td>' +
'<td>'+SelectKPNo+'</td>' + '<td>'+SelectKPNo+'</td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].KpSeq" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipKps[' + No + '].Title" /></td>' +
@ -1400,7 +1401,8 @@
}); });
Select += '</select>'; Select += '</select>';
var contactdiv = '<tr>' + var contactdiv = '<tr>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' + '<td><input type="hidden" value="" name="WipOutfits[' + No + '].WipOutfitID" />' +
'<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].OutfitNo" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].PartNo" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipOutfits[' + No + '].PartNo" /></td>' +
'<td>' + Select + '</td>' + '<td>' + Select + '</td>' +
'<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' + '<td><a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" onclick="Remove(this);">刪除</a></td>' +
@ -1428,7 +1430,8 @@
}); });
SelectSOPType += '</select>'; SelectSOPType += '</select>';
var contactdiv = '<tr>' + var contactdiv = '<tr>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPName" /></td>' + '<td><input type="hidden" value="" name="WipSops[' + No + '].WipSOPID" />' +
'<input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPName" /></td>' +
'<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' + '<td><input onkeypress="if( event.keyCode == 13 ) { return false; }" class="layui-input" name="WipSops[' + No + '].SOPPath" /></td>' +
'<td>' + SelectSOPType + '</td>' + '<td>' + SelectSOPType + '</td>' +
'<td>' + Select + '</td>' + '<td>' + Select + '</td>' +
@ -1442,9 +1445,15 @@
// Table 刪除 // Table 刪除
function Remove(button) { function Remove(button) {
//Determine the reference of the Row using the Button. //Determine the reference of the Row using the Button.
var row = $(button).closest("TR"); hg.confirm("確認要刪除此筆資料嗎？", function () {
var table = $(button).closest("TABLE")[0]; //$("#KPTable")[0]; var row = $(button).closest("TR");
table.deleteRow(row[0].rowIndex); var id = $(button).closest("TR").find('input[type=hidden]').val();
var table = $(button).closest("TABLE")[0]; //$("#KPTable")[0];
$(button).closest("TR").find('input[type=hidden]').val(id + "_");
alert($(button).closest("TR").find('input[type=hidden]').val());
row.hide();
});
//table.deleteRow(row[0].rowIndex);
}; };
//生產單位選單 //生產單位選單

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

@ -217,7 +217,7 @@
<input type="text" asp-for="@index.KpName" name="WipKps[@j].KpName" style="width:100px" readonly="readonly" /> <input type="text" asp-for="@index.KpName" name="WipKps[@j].KpName" style="width:100px" readonly="readonly" />
</td> </td>
<td> <td>
<select asp-for="@index.KpNo" name="WipKps[@j].KpNo" asp-items="@ViewBag.ItemsList" class=""></select> <select disabled asp-for="@index.KpNo" name="WipKps[@j].KpNo" asp-items="@ViewBag.ItemsList" class=""></select>
</td> </td>
<td> <td>
<input type="text" asp-for="@index.KpSeq" name="WipKps[@j].KpSeq" style="width:30px" readonly="readonly" /> <input type="text" asp-for="@index.KpSeq" name="WipKps[@j].KpSeq" style="width:30px" readonly="readonly" />

Write Preview
Loading…
Cancel
Save