Browse Source

1206 SHANI 工時

PTD
Shani 3 years ago
parent
commit
ba47fbd5fd
  1. 32
      AMESCoreStudio.Web/Controllers/BASController.cs
  2. 158
      AMESCoreStudio.Web/Controllers/PCSController.cs
  3. 75
      AMESCoreStudio.Web/HttpApis/AMES/IPCS.cs
  4. 13
      AMESCoreStudio.Web/HttpApis/IBAS.cs
  5. 95
      AMESCoreStudio.Web/Views/BAS/BAS002.cshtml
  6. 26
      AMESCoreStudio.Web/Views/Home/Framework.cshtml
  7. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.dll
  8. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.Views.pdb
  9. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.dll
  10. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.Web.pdb
  11. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  12. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  13. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  14. BIN
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  15. 3634
      AMESCoreStudio.Web/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
  16. 9
      AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs
  17. 34
      AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs
  18. 23
      AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs
  19. 82
      AMESCoreStudio.WebApi/Models/AMESContext.cs
  20. 3
      AMESCoreStudio.WebApi/appsettings.json
  21. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.dll
  22. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.Views.pdb
  23. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.dll
  24. BIN
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.pdb
  25. 3634
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/AMESCoreStudio.WebApi.xml
  26. 3
      AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json

32
AMESCoreStudio.Web/Controllers/BASController.cs

@ -534,6 +534,21 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new Table() { count = 0, data = null });
}
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetLineInfoesListAsync()
{
var result = await _basApi.GetLineInfoList();
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
#region BA005班別维护相关
@ -1223,6 +1238,23 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new Table() { count = 0, data = null });
}
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetRuleStationByUnitAsync(string ID)
{
if (ID is null)
ID = "0";
var result = await _basApi.GetRuleStationByUnit(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
#region BAS011流程站別規則維護相關

158
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -591,6 +591,47 @@ namespace AMESCoreStudio.Web.Controllers
//TempData["GetLockReasonTypeList"] = LockReasonType;
ViewBag.GetLockReasonTypeList = LockReasonType;
}
/// <summary>
/// 生產單位
/// </summary>
/// <returns></returns>
private async Task GetFactoryUnitList()
{
var result = await _basApi.GetFactoryUnits();
var UnitItems = new List<SelectListItem>();
UnitItems.Add(new SelectListItem("請選擇", ""));
for (int i = 0; i < result.Count; i++)
{
UnitItems.Add(new SelectListItem(result[i].UnitName, result[i].UnitNo.ToString()));
}
ViewBag.FactoryUnit = UnitItems;
}
/// <summary>
/// 組件資料
/// </summary>
/// <returns></returns>
private async Task GetItems()
{
var result = await _pcsApi.GetItems();
var ItemsList = new List<SelectListItem>();
ItemsList.Add(new SelectListItem("請選擇", ""));
for (int i = 0; i < result.Count; i++)
{
ItemsList.Add(new SelectListItem(result[i].ItemName, result[i].ItemNo.ToString()));
}
ViewBag.ItemsList = ItemsList;
}
#endregion
[ResponseCache(Duration = 0)]
@ -837,8 +878,6 @@ namespace AMESCoreStudio.Web.Controllers
}
#endregion
#region PCS005 工單資料查詢
public IActionResult PCS005()
{
@ -1257,6 +1296,121 @@ namespace AMESCoreStudio.Web.Controllers
return View(model);
}
#region PCS024組件资料维护相关
public async Task<IActionResult> PCS024()
{
await GetFactoryUnitList();
return View();
}
//新增頁面
public async Task<IActionResult> PCS024C(string id)
{
var result = await _pcsApi.GetBarcodeInfoesByNo(id);
var tt = result[0];
ViewBag.BarcodeID = tt.BarcodeID;
ViewBag.WipID = tt.WipID;
ViewBag.BarcodeNo = id;
await GetFactoryUnitList();
//await GetStations();
await GetItems();
return View();
}
//修改页面
[HttpGet]
public async Task<IActionResult> PCS024UAsync(int id)
{
await GetItems();
var result = await _pcsApi.GetBarcodeItem(id);
if (result.Count == 0)
{
return View();
}
return View(result[0]);
}
public async Task<IActionResult> PCS024DAsync(int id)
{
var result = await _pcsApi.DeleteBarcodeItem(id);
return Json(new Result() { success = true, msg = "" });
}
//頁面提交,id=0 添加,id>0 修改
[HttpPost]
public async Task<IActionResult> PCS024CSaveAsync(BarcodeItem model)
{
if (ModelState.IsValid)
{
IResultModel result;
result = await _pcsApi.PostBarcodeItem(JsonConvert.SerializeObject(model));
if (!result.Success)
{
var _msg = "新增成功!";
return RedirectToAction("Refresh", "Home", new { msg = _msg });
}
else
{
if (result.Errors.Count > 0)
{
ModelState.AddModelError(result.Errors[0].Id, result.Errors[0].Msg);
}
else
{
ModelState.AddModelError("error", result.Msg);
}
}
}
return View("PCS024C", model);
}
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetBarcodeItemsAsync()
{
var result = await _pcsApi.GetBarcodeItems();
if (result.Count > 0)
{
return Json(new Table() { code = 0, msg = "", data = result, count = result.Count });
}
return Json(new Table() { count = 0, data = null });
}
[ResponseCache(Duration = 0)]
[HttpGet]
public async Task<IActionResult> GetBarcodeItemByUnitAsync(string ID)
{
string str, str1;
var strA = ID.Split("=");
str = strA[0];
str1 = strA[1];
//WO0002A10001
if (ID is null)
return Json(new Table() { count = 0, data = null });
var result = await _pcsApi.GetBItemByStr(str, str1);
//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
[HttpPost]
public JsonResult TestFunc(string number)
{

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

@ -64,6 +64,7 @@ namespace AMESCoreStudio.Web
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/WipInfos")]
//ITask<ResultModel<string>> PostWipInfo([FromBody, RawJsonContent] string model);
ITask<ResultModel<WipInfo>> PostWipInfo([FromBody, RawJsonContent] string model);
/// <summary>
@ -80,6 +81,7 @@ namespace AMESCoreStudio.Web
/// <param name="wipno">工單號碼</param>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipInfos/GetWipInfoSelectParameter")]
//ITask<List<WipInfo>> GetWipInfoSelectParameter(string unitno = null, string wipno = null);
ITask<ResultModel<dynamic>> GetWipInfoSelectParameter(string unitno = null, string wipno = null, int lineid = 0
, string itemno = null, DateTime? date_str = null, DateTime? date_end = null);
@ -88,12 +90,15 @@ namespace AMESCoreStudio.Web
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/WipInfos/{id}")]
//ITask<List<WipInfo>> GetWipInfo(decimal id);
ITask<List<WipInfo>> GetWipInfo(int id);
/// <summary>
/// 查詢工單基本資料-WipNO
/// </summary>
/// <returns></returns>
//[WebApiClient.Attributes.HttpGet("api/WipInfos/{id}")]
//ITask<List<WipInfo>> GetWipInfoByUnitNO(string id);
[WebApiClient.Attributes.HttpGet("api/WipInfos/WipInfoByWipNo/{wipno}")]
ITask<List<WipInfo>> GetWipInfoByWipNO(string wipno);
#endregion
@ -222,6 +227,8 @@ namespace AMESCoreStudio.Web
/// 工單號碼 by 工單鎖定資料檔
/// </summary>
/// <returns></returns>
//[WebApiClient.Attributes.HttpGet("api/WipLock/{id}")]
//ITask<List<WipLock>> GetWipLockByWipNO(string WipNO);
[WebApiClient.Attributes.HttpGet("api/WipLock/ByWipNO/{id}")]
ITask<ResultModel<WipLock>> GetWipLockByWipNO(string id);
@ -291,5 +298,73 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpPut("api/WipSop/{id}/{state}")]
ITask<ResultModel<WipSop>> PutWipSop(int id , string state);
#endregion
#region PCS024組件維護相關
/// <summary>
/// 取得組件ITEM
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/Items")]
ITask<List<Item>> GetItems();
/// <summary>
/// 新增組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPost("api/BarcodeItems")]
ITask<ResultModel<BarcodeItem>> PostBarcodeItem([FromBody, RawJsonContent] string model);
/// <summary>
/// 更新組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpPut("api/BarcodeItems/{id}")]
ITask<ResultModel<BarcodeItem>> PutBarcodeItem(int id, [FromBody, RawJsonContent] string model);
/// <summary>
/// 刪除組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpDelete("api/BarcodeItems/{id}")]
ITask<ResultModel<string>> DeleteBarcodeItem(int id);
/// <summary>
/// 根據ID獲取指定組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/BarcodeItems/{id}")]
ITask<List<BarcodeItem>> GetBarcodeItem(int id);
/// <summary>
/// 獲取組件
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/BarcodeItems")]
ITask<List<BarcodeItem>> GetBarcodeItems();
/// <summary>
/// 根据單位獲取組件資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/BarcodeItems/Unit/{id}")]
ITask<List<BarcodeItem>> GetBarcodeItemByUnit(string id);
/// <summary>
/// 根据單位獲取組件資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/BarcodeItems/Unit/{id}/Str/{str}")]
ITask<List<BarcodeItem>> GetBItemByStr(string id, string str);
/// <summary>
/// 根据單位獲取組件資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/BarcodeInfoes/No/{id}")]
ITask<List<BarcodeInfo>> GetBarcodeInfoesByNo(string id);
#endregion
}
}

13
AMESCoreStudio.Web/HttpApis/IBAS.cs

@ -134,6 +134,12 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpGet("api/LineInfoes/Unit/{id}")]
ITask<List<LineInfo>> GetLineInfoByUnit(string id);
/// <summary>
/// 根据單位獲取線別資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/LineInfoes/List")]
ITask<List<ListObj>> GetLineInfoList();
#endregion
#region BAS005班別維護相關
@ -398,6 +404,13 @@ namespace AMESCoreStudio.Web
[WebApiClient.Attributes.HttpGet("api/RuleStations/Flow/{id}")]
ITask<List<RuleStation>> GetRuleStationsByFlow(int id, int page = 1, int limit = 10);
/// <summary>
/// 獲取流程站別資料
/// </summary>
/// <returns></returns>
[WebApiClient.Attributes.HttpGet("api/RuleStations/Unit/{id}")]
ITask<List<RuleStation>> GetRuleStationByUnit(string id);
#endregion
#region BAS011流程規則維護相關

95
AMESCoreStudio.Web/Views/BAS/BAS002.cshtml

@ -141,101 +141,6 @@
hg.open('新增生產製程單位', '/BAS/BAS002C', 480, 480);
});
////监听表单提交事件
//hg.form.onsubmit('querysubmit', function (data) {
// table && table.reload(data);
//});
//var tableCols = [[
// {
// field: 'seq',
// width: 160,
// title: '#',
// sort: true
// },
// {
// field: 'unitNo',
// width: 100,
// title: '單位代號'
// },
// {
// field: 'unitName',
// minWidth: 100,
// title: '單位名稱'
// },
// {
// field: 'unitCode',
// title: '狀態代碼',
// width: 160
// },
// {
// field: 'right',
// width: 200,
// title: '操作',
// fixed: 'right',
// templet: function (item) {
// var btn = '<a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="edit">修改</a>';
// if (item.statusNo == "A")
// btn += ' <a class="layui-btn layui-btn-danger layui-btn-xs layui-icon layui-icon-delete" lay-event="del">停用</a>';
// else
// btn += ' <a class="layui-btn layui-btn-normal layui-btn-xs layui-icon layui-icon-edit" lay-event="del">啟用</a>';
// return btn
// }
// }]
//];
////通过行tool编辑,lay-event="edit"
//function edit(obj) {
// if (obj.data.unitNo) {
// hg.open('修改生產製程單位資料', '/BAS/BAS002U/' + obj.data.unitNo, 480, 480);
// }
//}
////通过行tool删除,lay-event="del"
//function del(obj) {
// alert(obj.data.statusNo);
// var str;
// if (obj.data.statusNo == "A")
// str = "停用";
// else
// str = "啟用";
// if (obj.data.unitNo) {
// hg.confirm("系統:" + obj.data.unitName + ",確定要" + str + "嗎?", function () {
// $.ajax({
// url: '/BAS/BAS002D',
// data: { id: obj.data.unitNo },
// type: 'POST',
// success: function (data) {
// if (data.success) {
// //obj.del(); //只删本地数据
// hg.msghide(str + "成功!");
// table && table.reload(data);
// }
// else {
// hg.msg(data.msg);
// }
// },
// error: function () {
// hg.msg("网络请求失败!");
// }
// });
// });
// }
//}
//var toolbar = [{
// text: '新增',
// layuiicon: '&#xe608;',
// class: 'layui-btn-normal',
// handler: function () {
// hg.open('新增生產製程單位', '/BAS/BAS002C', 480, 480);
// }
//}
//];
////基本数据表格
//var table = hg.table.datatable('test', '生產製程單位維護', '/BAS/GetFactoryUnits', {}, tableCols, toolbar, true, 'full-100', ['filter', 'print', 'exports']);
</script>

26
AMESCoreStudio.Web/Views/Home/Framework.cshtml

@ -254,6 +254,32 @@
<li class="sub-tab" hg-title="SOP文件查詢" hg-nav="/PCS/PCS030">
<a><i class="fa fa-comment-o fa-fw"></i><cite>SOP文件查詢</cite></a>
</li>
</ul>
</li>
<li>
<a>
<i class="fa fa-folder-o fa-fw" style="color:#77B272;"></i><cite style="color:#77B272;">工時控管模組</cite><i class="fa fa-angle-up fa-fw nav_right"></i>
</a>
<ul class="sub-menu">
<li class="sub-tab" hg-title="工時資料維護" hg-nav="/WHS/WHS001">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工時資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="工時類別維護" hg-nav="/WHS/WHS002">
<a><i class="fa fa-comment-o fa-fw"></i><cite>工時類別維護</cite></a>
</li>
<li class="sub-tab" hg-title="標準工時維護" hg-nav="/WHS/WHS003">
<a><i class="fa fa-comment-o fa-fw"></i><cite>標準工時維護</cite></a>
</li>
<li class="sub-tab" hg-title="標準工時查詢" hg-nav="/WHS/WHS005">
<a><i class="fa fa-comment-o fa-fw"></i><cite>標準工時查詢</cite></a>
</li>
<li class="sub-tab" hg-title="援入/外資料維護" hg-nav="/WHS/WHS008">
<a><i class="fa fa-comment-o fa-fw"></i><cite>援入/外資料維護</cite></a>
</li>
<li class="sub-tab" hg-title="重工標準工時維護" hg-nav="/WHS/WHS011">
<a><i class="fa fa-comment-o fa-fw"></i><cite>重工標準工時維護</cite></a>
</li>
</ul>
</li>
</ul>

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.

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

File diff suppressed because it is too large

9
AMESCoreStudio.WebApi/Controllers/BAS/FactoryInfoesController.cs

@ -123,13 +123,8 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
{
Helper helper = new Helper(_context);
factoryInfo.FactoryID = helper.GetIDKey("FACTORY_ID").Result;
//factoryInfo.CreateDate = DateTime.Now;
//factoryInfo.CreateUserId = 0;
//factoryInfo.UpdateDate = DateTime.Now;
factoryInfo.FactoryCode = "T" + factoryInfo.FactoryID.ToString(); //SHANI?
//factoryInfo.OrgID = -1; //SHANI?
//factoryInfo.VirtualFlag = "N"; //SHANI?
//factoryInfo.StatusNo = "A"; //SHANI?
factoryInfo.FactoryCode = "T" + factoryInfo.FactoryID.ToString();
_context.FactoryInfos.Add(factoryInfo);

34
AMESCoreStudio.WebApi/Controllers/BAS/LineInfoesController.cs

@ -281,6 +281,40 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
////return lineInfo;
}
/// <summary>
/// 获取全部單位资料List
/// </summary>
/// <returns></returns>
// GET: api/LineInfoes/List
[HttpGet("List")]
public async Task<ActionResult<List<ListObj>>> GetLineInfoList()
{
IQueryable<LineInfo> q = _context.LineInfoes;
//q = q.Where(p => p.StatusNo == "A");
q = q.OrderBy(p => p.LineID);
var LineInfo = await q.ToListAsync();
var list = new List<ListObj>();
foreach (var data in LineInfo)
{
var tt = new ListObj();
tt.name= data.LineDesc;
tt.value = data.LineID.ToString();
tt.selected = false;
tt.disabled = false;
list.Add(tt);
}
if (LineInfo == null)
{
return NotFound();
}
return list;
}
private bool LineInfoExists(int id)
{
return _context.LineInfoes.Any(e => e.LineID == id);

23
AMESCoreStudio.WebApi/Controllers/BAS/RuleStationsController.cs

@ -130,6 +130,29 @@ namespace AMESCoreStudio.WebApi.Controllers.BAS
return ruleStation;
}
/// <summary>
/// 根據製程單位獲取指定單一資料
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
// GET: api/RuleStations/5
[HttpGet("Unit/{id}")]
public async Task<ActionResult<IEnumerable<RuleStation>>> GetRuleStationByUnit(string id)
{
IQueryable<RuleStation> q = _context.RuleStations;
q = q.Where(p => p.Station.UnitNo.Equals(id));
var ruleStation = await q.ToListAsync();
if (ruleStation == null)
{
return NotFound();
}
return ruleStation;
}
/// <summary>
/// 更新流程站別資料
/// </summary>

82
AMESCoreStudio.WebApi/Models/AMESContext.cs

@ -86,10 +86,16 @@ namespace AMESCoreStudio.WebApi
modelBuilder.Entity<WipLog>().HasKey(c => new { c.WipID, c.CreateDate});
modelBuilder.Entity<PartMap>().HasKey(c => new { c.CorpSN });
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.B).WithMany().HasForeignKey(r => r.BarcodeID).IsRequired();
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.I).WithMany().HasForeignKey(r => r.ItemNo).IsRequired();
modelBuilder.Entity<BarcodeItem>().HasOne(r => r.S).WithMany().HasForeignKey(r => r.RuleStationID).IsRequired();
modelBuilder.Entity<WorkClass>().HasOne(r => r.Group).WithMany().HasForeignKey(r => r.GroupID).IsRequired();
modelBuilder.Entity<ListObj>().HasKey(c => new { c.value, c.name });
modelBuilder.Entity<CycleTime>().HasKey(c => new { c.ItemNo, c.LineID });
modelBuilder.Entity<CycleTime>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.SectionNo).IsRequired();
modelBuilder.Entity<CycleTime>().HasOne(r => r.Line).WithMany().HasForeignKey(r => r.LineID).IsRequired();
modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.ClassInfo>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.LineInfo>().HasOne(r => r.Unit).WithMany().HasForeignKey(r => r.UnitNo).IsRequired();
modelBuilder.Entity<AMESCoreStudio.WebApi.Models.BAS.LineInfo>().HasOne(r => r.Dept).WithMany().HasForeignKey(r => r.DeptID).IsRequired();
@ -164,6 +170,10 @@ namespace AMESCoreStudio.WebApi
/// </summary>
public DbSet<AMESCoreStudio.WebApi.Models.BAS.TestType> TestTypes { get; set; }
/// <summary>
/// List
/// </summary>
public DbSet<AMESCoreStudio.WebApi.Models.BAS.ListObj> ListObjs { get; set; }
/////////////////////////*****/////////////////////////////////////////////////////////
@ -248,17 +258,21 @@ namespace AMESCoreStudio.WebApi
/// </summary>
public DbSet<WipLog> WipLogs { get; set; }
/// <summary>
/// 工單投產纪錄資料文件
///1108因無法執行SHANI補上
/// </summary>
public DbSet<NGGroup> NGGroups { get; set; }
/// <summary>
/// 工單投產纪錄資料文件
///1108因無法執行SHANI補上
/// </summary>
public DbSet<NGClass> NGClasses { get; set; }
/// <summary>
///1108因無法執行SHANI補上
/// </summary>
public DbSet<NGReason> NGReasons { get; set; }
/// <summary>
/// 維修群組資料
/// </summary>
@ -345,6 +359,66 @@ namespace AMESCoreStudio.WebApi
/// 工單資訊-系統組裝工程資訊
/// </summary>
public virtual DbSet<BarcodeChange> BarcodeChanges { get; set; }
}
/// <summary>
///條碼資料
/// </summary>
public DbSet<BarcodeInfo> BarcodeInfoes { get; set; }
/// <summary>
///條碼组件資料
/// </summary>
public DbSet<BarcodeItem> BarcodeItems { get; set; }
/// <summary>
///組件資料
/// </summary>
public DbSet<Item> Items { get; set; }
/// <summary>
///工時群組資料
/// </summary>
public DbSet<WorkGroup> WorkGroups { get; set; }
/// <summary>
///工作類別資料
/// </summary>
public DbSet<WorkClass> WorkClasses { get; set; }
/// <summary>
///標準工時資料
/// </summary>
public DbSet<StandardWorkTime> StandardWorkTimes { get; set; }
/// <summary>
///每日出勤資料
/// </summary>
public DbSet<WorkManPower> WorkManPowers { get; set; }
/// <summary>
///援入援外資料
/// </summary>
public DbSet<SupportUser> SupportUsers { get; set; }
/// <summary>
///異常工時資料
/// </summary>
public DbSet<ExceptionWorktime> ExceptionWorktimes { get; set; }
/// <summary>
///重工工時資料
/// </summary>
public DbSet<StandardWorkTimeRework> StandardWorkTimeReworks { get; set; }
/// <summary>
///無效工時在線收集資料
/// </summary>
public DbSet<ExceptionWorktimeOline> ExceptionWorktimeOlines { get; set; }
}
}

3
AMESCoreStudio.WebApi/appsettings.json

@ -8,7 +8,8 @@
},
"ConnectionStrings": {
"AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHSYS;Password=12345;",
"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=JHSYS;Password=ASYS666;"
"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
//"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
},
"AllowedHosts": "*"
}

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.

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

File diff suppressed because it is too large

3
AMESCoreStudio.WebApi/bin/Debug/netcoreapp3.1/appsettings.json

@ -8,7 +8,8 @@
},
"ConnectionStrings": {
"AMESContext2": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.5)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=gdb)));User Id=JHSYS;Password=12345;",
"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=jhdb)));User Id=system;Password=admin;"
//"AMESContext": "Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=61.216.68.18)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=cpadb)));User Id=JHSYS;Password=ASYS666;"
},
"AllowedHosts": "*"
}

Loading…
Cancel
Save