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

1. 修正工單檢視錯誤

PTD
Ray 3 years ago
parent
02b4bcdfd4
commit
6467a59ff0
1 changed files with 125 additions and 30 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. 155
      AMESCoreStudio.Web/Controllers/PCSController.cs

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

@ -1840,21 +1840,47 @@ namespace AMESCoreStudio.Web.Controllers
model.wipSystem.Engineer_Name = UserInof.UserName; model.wipSystem.Engineer_Name = UserInof.UserName;
} }
var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result; if (!string.IsNullOrWhiteSpace(model.wipSystem.Ec))
var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result; {
var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result; var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result;
var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result; model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc;
var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result; }
var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result; if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw))
{
model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc; var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result;
model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc; model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc;
model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc; }
model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc; if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw1))
model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc; {
model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo; var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result;
model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw2))
{
var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result;
model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.Bios))
{
var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result;
model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.OsVer))
{
var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.PowerMode))
{
var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result;
model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo;
}
} }
model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO); model.wipMAC = await _pcsApi.GetWipMAC(model.wipInfo.WipNO);
@ -1937,21 +1963,47 @@ namespace AMESCoreStudio.Web.Controllers
model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO); model.wipSystem = await _pcsApi.GetWipSystem(model.wipInfo.WipNO);
if (model.wipSystem != null) if (model.wipSystem != null)
{ {
var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result; if (!string.IsNullOrWhiteSpace(model.wipSystem.Ec))
var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result; {
var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result; var Ec_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Ec).InvokeAsync().Result;
var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result; model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc;
var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result; }
var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result; if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw))
{
model.wipSystem.Ec_Desc = Ec_Desc == null ? "" : Ec_Desc.MeterialDesc; var Fw_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw).InvokeAsync().Result;
model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc; model.wipSystem.Fw_Desc = Fw_Desc == null ? "" : Fw_Desc.MeterialDesc;
model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc; }
model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc; if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw1))
model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc; {
model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo; var Fw1_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw1).InvokeAsync().Result;
model.wipSystem.Fw1_Desc = Fw1_Desc == null ? "" : Fw1_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.Fw2))
{
var Fw2_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Fw2).InvokeAsync().Result;
model.wipSystem.Fw2_Desc = Fw2_Desc == null ? "" : Fw2_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.Bios))
{
var Bios_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.Bios).InvokeAsync().Result;
model.wipSystem.Bios_Desc = Bios_Desc == null ? "" : Bios_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.OsVer))
{
var Os_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.OsVer).InvokeAsync().Result;
model.wipSystem.OsVer_Desc = Os_Desc == null ? "" : Os_Desc.MeterialDesc;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.PowerMode))
{
var PowerMode_Desc = _pcsApi.GetPlmMeterialInfo(model.wipSystem.PowerMode).InvokeAsync().Result;
model.wipSystem.PowerMode_Desc = PowerMode_Desc == null ? "" : PowerMode_Desc.ProductionMemo;
}
if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer)) if (!string.IsNullOrWhiteSpace(model.wipSystem.Engineer))
{ {
@ -4433,6 +4485,49 @@ namespace AMESCoreStudio.Web.Controllers
return Json(new Result() { success = result.Success, msg = result.Msg }); return Json(new Result() { success = result.Success, msg = result.Msg });
} }
#region PCS031 工單生產重新過站
public ActionResult PCS031()
{
return View();
}
//[HttpPost]
//public async Task<IActionResult> PCS031Asnyc(PCS031ViewModel model)
//{
//}
[HttpPost]
public async Task<IActionResult> PCS031QueryAsnyc(string wipNo)
{
var result = new ResultModel<string>();
var result_Wip = await _pcsApi.GetWipInfoByWipNO(wipNo.Trim().ToUpper());
if (result_Wip.Count == 0)
{
result.Success = false;
result.Msg = "找不到工單號碼【" + wipNo + "】建立資料";
}
else if (result_Wip.Count != 1)
{
result.Success = false;
result.Msg = "工單號碼【" + wipNo + "】有開立多張工單維護資料，無法使用生產序號退回";
}
else
{
var FlowRule = result_Wip.FirstOrDefault().FlowRuleID;
var result_RuleStation = await _pcsApi.GetRuleStationByFlow(FlowRule);
}
if (result.Data.Count() != 0)
{
return Json(new Table() { code = 0, msg = "", data = result.Data, count = 0 });
}
return Json(result);
}
#endregion
[HttpPost] [HttpPost]
public JsonResult TestFunc(string number) public JsonResult TestFunc(string number)
{ {

Write Preview
Loading…
Cancel
Save