Browse Source

1.修改組件新增

PTD
Marvin 2 years ago
parent
commit
36d69697ef
  1. 29
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 7
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  3. 327
      AMESCoreStudio.Web/Views/PCS/PCS024.cshtml
  4. 4
      AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml
  5. 2
      AMESCoreStudio.Web/Views/PCS/PCS025.cshtml
  6. 2
      AMESCoreStudio.Web/Views/PCS/PCS026.cshtml
  7. 44
      AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

29
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -5917,7 +5917,7 @@ namespace AMESCoreStudio.Web.Controllers
if (ModelState.IsValid) if (ModelState.IsValid)
{ {
IResultModel result; IResultModel result;
result = await _pcsApi.PostBarcodeItem(JsonConvert.SerializeObject(model)); result = await _pcsApi.PostBarcodeItemAddnew(JsonConvert.SerializeObject(model));
if (result.Success) if (result.Success)
@ -5964,13 +5964,12 @@ namespace AMESCoreStudio.Web.Controllers
[ResponseCache(Duration = 0)] [ResponseCache(Duration = 0)]
[HttpGet] [HttpGet]
public async Task<IActionResult> GetBarcodeItemByUnitAsync(string ID) public async Task<IActionResult> GetBarcodeItemByUnit2Async(string ID)
{ {
string str, str1; string str, str1;
var strA = ID.Split("="); var strA = ID.Split("=");
str = strA[0]; str = strA[0];
str1 = strA[1]; str1 = strA[1];
//WO0002A10001
if (ID is null) if (ID is null)
return Json(new Table() { count = 0, data = null }); return Json(new Table() { count = 0, data = null });
@ -5986,6 +5985,30 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new Table() { count = 0, data = null }); return Json(new Table() { count = 0, data = null });
} }
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetBarcodeItemByUnitAsync(string unitId,string barcodeNo)
{
//string str, str1;
//var strA = ID.Split("=");
//str = strA[0];
//str1 = strA[1];
//WO0002A10001
if (barcodeNo is null)
return Json(new Table() { count = 0, data = null });
var result = await _pcsApi.GetBItemByStr(unitId, barcodeNo);
//var result = await _pcsApi.GetBarcodeItemByUnit(ID);
if (result.Count > 0)
{
return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
}
return Json(new Table() { count = 0, data = null });
}
#endregion #endregion
#region PCS027 組件資料整批刪除 #region PCS027 組件資料整批刪除

7
AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs

@ -808,6 +808,13 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpPost("api/BarcodeItems")] [WebApiClient.Attributes.HttpPost("api/BarcodeItems")]
ITask<ResultModel<BarcodeItem>> PostBarcodeItem([FromBody, RawJsonContent] string model); ITask<ResultModel<BarcodeItem>> PostBarcodeItem([FromBody, RawJsonContent] string model);
/// <summary>
/// 新增組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/BarcodeItems/PCS024")]
ITask<ResultModel<BarcodeItem>> PostBarcodeItemAddnew([FromBody, RawJsonContent] string model);
/// <summary> /// <summary>
/// 更新組件 /// 更新組件
/// </summary> /// </summary>

327
AMESCoreStudio.Web/Views/PCS/PCS024.cshtml

@ -1,221 +1,108 @@
@{ @{
ViewData["Title"] = "组件資料新增"; ViewData["Title"] = "组件資料新增";
Layout = "~/Views/Shared/_AMESLayout.cshtml"; Layout = "~/Views/Shared/_AMESLayout.cshtml";
} }
<div class="layui-card"> <div class="layui-card">
<div class="layui-card-header"> <div class="layui-card-header">
<div class="layui-form"> <div class="layui-form">
<div class="layui-form-item "> <div class="layui-form-item ">
<div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div> <div class="layui-inline"><i class="fa fa-file-text-o fa-fw"></i> @ViewBag.Title</div>
</div> </div>
</div> </div>
</div> </div>
<div class="layui-card-body"> <div class="layui-card-body">
<div class="layui-form" style="margin-bottom:5px;"> <div class="layui-form" style="margin-bottom:5px;">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline" style="margin-right:0px;"> <div class="layui-inline" style="margin-right:0px;">
<label class=" layui-inline layui-form-label" style="width:120px;">请選擇單位名稱</label> <label class=" layui-inline layui-form-label" style="width:120px;">请選擇單位名稱</label>
<div class="layui-input-inline" width:400px;"> <div class="layui-input-inline" width:400px;">
<select id="unit" lay-event="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnitList"> <select id="unit" lay-event="unit" lay-filter="unit" lay-submit asp-items="@ViewBag.FactoryUnitList">
</select> </select>
</div> </div>
<input id="unitId" type="hidden" name="unitId" value="@ViewBag.UnitNo" /> <input id="unitId" type="hidden" name="unitId" value="@ViewBag.UnitNo" />
</div> </div>
<div class="layui-inline" style="margin-right:5px;"> <div class="layui-inline" style="margin-right:5px;">
<input type="text" class="layui-input" id="edtSearch" value="" placeholder="請輸入內部條碼" style="display: inline-block;width: 140px;height: 30px;line-height: 30px;margin-left:20px;" /> <input id="barcodeNo" name="barcodeNo" autocomplete="off" class="layui-input" placeholder="請輸入內部條碼" style="display: inline-block;width: 140px;height: 30px;line-height: 30px;margin-left:20px;" />
</div> </div>
<div class="layui-inline" style="margin-left:0px;"> <div class="layui-inline layui-show-xs-block">
<div class="layui-btn-group"> <button class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="querysubmit">
<button id="btnSearch" class="layui-btn layui-btn-sm"> <i class="layui-icon layui-icon-sm">&#xe615;</i>
<i class="layui-icon">&#xe615;</i>搜索 </button>
</button> </div>
<button id="btnClearSearch" class="layui-btn layui-btn-sm layui-btn-primary"> </div>
<i class="layui-icon">&#x1006;</i>清除 <div class="layui-inline">
</button> <button type="button" id="btnAdd" class="layui-btn layui-btn-normal layui-btn-sm"><i class="layui-icon">&#xe654;</i>新增</button>
</div> </div>
</div> <table class="layui-hide" id="test" lay-filter="test"></table>
</div> </div>
<div class="layui-inline"> </div>
<button type="button" id="btnAdd" class="layui-btn layui-btn-normal layui-btn-sm"><i class="layui-icon">&#xe654;</i>新增</button> </div>
</div> @section Scripts{
<table class="layui-hide" id="test" lay-filter="test"></table> <script type="text/javascript">
</div>
</div>
</div> layui.use(['form', 'jquery', 'layer'], function () {
@section Scripts{ form = layui.form;
<script type="text/javascript">
var treeTable; var qs = $('button[lay-filter="querysubmit"]');
layui.config({ qs.click();
base: '../lib/layui_ext/' });
}).extend({
treeTable: 'treetable/treeTable' //监听表单提交事件
}).use(['treeTable'], function () { hg.form.onsubmit('querysubmit', function (data) {
treeTable = layui.treeTable; hg.msghide("重新載入資料..");
//treeTable.on('tool(test)', function (obj) { table && table.reload(data);
// if (obj.event == 'edit') { });
// if (obj.data.lineID) {
// hg.open('修改線別', '/BAS/BAS003U/' + obj.data.lineID, 480, 480); var tableCols = [[
// } {
// } field: 'b',
// if (obj.event == 'del') { title: '內部條碼',
// var str; sort: true,
// if (obj.data.statusNo == 'A') templet: function (d) {
// str = '停用'; return d.b['barcodeNo'];
// else }
// str = '啟用'; },
// hg.confirm("系統:" + obj.data.lineDesc + ",确定要"+str+"吗?", function () { {
// $.ajax({ field: 's',
// url: '/BAS/BAS003U2', //抓取停用 width: 200,
// data: { model: obj.data }, title: '站別',
// type: 'POST', sort: true,
// success: function (data) { templet: function (d) {
// if (data.success) { return d.s['stationName'];
// //obj.del(); //只删本地数据 }
// hg.msghide("成功!"); },
// var aa = $("#unitId").val(); {
// request(aa); field: 'itemNo',
// } width: 120,
// else { title: '組件代碼'
// hg.msg(data.msg); },
// } {
// }, field: 'kpItemNo',
// error: function () { width: 200,
// hg.msg("网络请求失败!"); title: '组件料號'
// } },
// }); {
// }); field: 'partNo',
// } width: 120,
//}); title: '組件條碼'
form.on('select(unit)', function (data) { }]
$("#unitId").val(data.value); ];
});
}); //新增
var data = []; $('#btnAdd').click(function () {
$(document).ready(function () { var keywords = $('#barcodeNo').val();
request(); if (keywords)
}); hg.open('新增組件資料', '/PCS/PCS024C/' + keywords, 640, 480);
//通过table定义reload刷新列表,update本地填充一条数据 else
var TABLE = function () { alert("請先輸入內部條碼!!");
return { });
reload: function () {
request(); var aa = $("#unit").val(); var keywords = $('#edtSearch').val();
},
update: function (d) { //基本数据表格
var model = $.parseJSON(d); var table = hg.table.datatable('test', '組件資料', '/PCS/GetBarcodeItemByUnit', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
var up = false;
layui.each(data, function (i, d) { </script>
if (d.id == model.id) {
data[i] = model;
up = true;
return false;
}
});
up || data.push(model);
init(data);
}
}
}
var insTb;
function init(data) {
insTb = treeTable.render({
elem: '#test',
height: 'full-180',
text: {
none: '<div style="padding: 18px 0;">無資料</div>'
},
data: data,
tree: {
iconIndex: -1,
isPidData: false,
idName: 'barcodeID',
},
cols: [
{
field: 'b',
minWidth: 100,
title: '內部條碼'
, templet: function (d) {
console.log(d.b);
var iN;
if (d.i)
iN = d.b["barcodeNo"];
else
iN = "N/A";
return iN;
}
},
{
field: 'partNo',
minWidth: 100,
title: '組件條碼'
},
{
field: 'kpItemNo',
minWidth: 100,
title: '組件料號'
},
{
field: 'i',
title: '組件名稱'
, templet: function (d) {
var iN;
if (d.i)
iN = d.i["itemName"];
else
iN = "N/A";
return iN;
}
}
],
style: 'margin-top:0;',
done: function () {
}
});
insTb.expandAll();
}
var table = new TABLE()
//更新資料
function request() {
var aa = $("#unit").val();
var keywords = $('#edtSearch').val();
if (keywords && aa)
//hg.request('/PCS/GetBItem/' + aa + '/' + keywords , function (result) {
hg.request('/PCS/GetBarcodeItemByUnit/' + aa + '=' + keywords, function (result) {
data = result.data;
init(data);
});
}
//搜索
$('#btnSearch').click(function () {
var aa = $("#unit").val();
var keywords = $('#edtSearch').val();
if (aa) {
if (keywords) {
hg.msghide("刷新数据!");
request();
} else {
alert("請輸入條碼!!");
}
}
else {
alert("請選擇生產單位!!");
}
});
//清除
$('#btnClearSearch').click(function () {
$('#edtSearch').val("");
insTb.clearFilter();
});
//新增
$('#btnAdd').click(function () {
var keywords = $('#edtSearch').val();
if (keywords)
hg.open('新增組件資料', '/PCS/PCS024C/' + keywords, 480, 480);
else
alert("請先輸入內部條碼!!");
});
</script>
} }

4
AMESCoreStudio.Web/Views/PCS/PCS024C.cshtml

@ -34,7 +34,7 @@
<select asp-for="StationID" name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9"> <select asp-for="StationID" name="Role" id="Role" lay-filter="RoleInfo" asp-items="@ViewBag.GetStationsList" class="custom-select col-sm-9">
<option value="">請選擇</option> <option value="">請選擇</option>
</select> </select>
<input type="hidden" name="RuleStationID" id="RuleStationID" /> <input type="hidden" name="StationID" id="StationID" />
</div> </div>
<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>
@ -84,7 +84,7 @@
$("#Role").change(function () { $("#Role").change(function () {
var data = $("#Role").val(); var data = $("#Role").val();
console.info(data); console.info(data);
$("#RuleStationID").val(data); $("#StationID").val(data);
}) })
function getRoles(data) { function getRoles(data) {

2
AMESCoreStudio.Web/Views/PCS/PCS025.cshtml

@ -148,7 +148,7 @@
if (keywords) { if (keywords) {
hg.msghide("刷新数据!"); hg.msghide("刷新数据!");
table.reload('test', { table.reload('test', {
url: '/PCS/GetBarcodeItemByUnit/', url: '/PCS/GetBarcodeItemByUnit2/',
where: { where: {
ID: aa ID: aa
} }

2
AMESCoreStudio.Web/Views/PCS/PCS026.cshtml

@ -171,7 +171,7 @@
if (keywords) { if (keywords) {
hg.msghide("刷新数据!"); hg.msghide("刷新数据!");
table.reload('test', { table.reload('test', {
url: '/PCS/GetBarcodeItemByUnit/', url: '/PCS/GetBarcodeItemByUnit2/',
where: { where: {
ID: aa ID: aa
} }

44
AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs

@ -502,7 +502,49 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
//_context.Entry(barcodeItem.B).State = EntityState.Detached; //_context.Entry(barcodeItem.B).State = EntityState.Detached;
//_context.BarcodeItems.Add(barcodeItem); //_context.BarcodeItems.Add(barcodeItem);
_context.Set<BarcodeItem>().Add(barcodeItem); _context.Set<BarcodeItem>().Add(barcodeItem);
await _context.SaveChangesAsync();
result.Success = true;
result.Msg = "OK";
}
catch (Exception ex)
{
result.Success = false;
result.Msg = ex.InnerException.Message;
}
return result;
}
/// <summary>
/// 新增條碼资料
/// </summary>
/// <param name="barcodeItem"></param>
/// <returns></returns>
// POST: api/BarcodeItems
// To protect from overposting attacks, enable the specific properties you want to bind to, for
// more details, see https://go.microsoft.com/fwlink/?linkid=2123754.
[HttpPost("PCS024")]
public async Task<ResultModel<BarcodeItem>> PostBarcodeItemsAddnew(BarcodeItem barcodeItem)
{
ResultModel<BarcodeItem> result = new ResultModel<BarcodeItem>();
Helper helper = new Helper(_context);
barcodeItem.BarcodeItemID = helper.GetIDKey("BARCODEITEM_ID").Result;
barcodeItem.B.BarcodeID = barcodeItem.BarcodeID;
if (PartNoExists(barcodeItem.PartNo))
{
result.Success = false;
result.Msg = "組件條碼重複";
return result;
}
try
{
_context.BarcodeItems.Add(barcodeItem);
_context.Entry(barcodeItem.B).State = EntityState.Detached;
_context.Entry(barcodeItem).State = EntityState.Added;
//_context.Set<BarcodeItem>().Add(barcodeItem);
await _context.SaveChangesAsync(); await _context.SaveChangesAsync();
result.Success = true; result.Success = true;
result.Msg = "OK"; result.Msg = "OK";

Loading…
Cancel
Save