ray 3 years ago
parent
commit
000f9b4ea3
  1. 11
      AMESCoreStudio.Web/Controllers/PCSController.cs
  2. 33
      AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs
  3. 6
      AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs

11
AMESCoreStudio.Web/Controllers/PCSController.cs

@ -1865,6 +1865,9 @@ namespace AMESCoreStudio.Web.Controllers
model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO); model.wipBarcodes = await _pcsApi.GetWipBarcode(model.wipInfo.WipNO);
IResultModel result; IResultModel result;
// 登入UserID
var UserID = GetLogInUserID();
// Checkbox轉換 // Checkbox轉換
model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "on" ? "Y" : "N"; model.wipInfo.ECNCheck = model.wipInfo.ECNCheck == "on" ? "Y" : "N";
model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "on" ? "Y" : "N"; model.wipInfo.ModelCheck = model.wipInfo.ModelCheck == "on" ? "Y" : "N";
@ -1940,6 +1943,7 @@ namespace AMESCoreStudio.Web.Controllers
} }
} }
result = await _pcsApi.PutWipInfo(JsonConvert.SerializeObject(model.wipInfo)); result = await _pcsApi.PutWipInfo(JsonConvert.SerializeObject(model.wipInfo));
if (result.Success) if (result.Success)
{ {
@ -3645,7 +3649,8 @@ namespace AMESCoreStudio.Web.Controllers
line = model.LineID, line = model.LineID,
unitNo = model.UnitNO, unitNo = model.UnitNO,
inputItems = keyParts, inputItems = keyParts,
outfits = outfit outfits = outfit,
userID = GetLogInUserID()
}; };
var barcode_result = await _pcsApi.PassIngByCheck(JsonConvert.SerializeObject(x)); var barcode_result = await _pcsApi.PassIngByCheck(JsonConvert.SerializeObject(x));
@ -4509,6 +4514,10 @@ namespace AMESCoreStudio.Web.Controllers
return View(model); return View(model);
} }
/// <summary>
/// 登入UserID
/// </summary>
/// <returns></returns>
public int GetLogInUserID() public int GetLogInUserID()
{ {
int user_id = 0; int user_id = 0;

33
AMESCoreStudio.WebApi/Controllers/BLL/BarCodeCheckController.cs

@ -580,6 +580,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
StatusID = 1, StatusID = 1,
SysType = "S", SysType = "S",
StatusNo = StatusNo, StatusNo = StatusNo,
CreateUserID = barCodeCheckDto.userID
}; };
return await barcodeInfoesController.PostBarcodeInfoes(barcodeInfo); return await barcodeInfoesController.PostBarcodeInfoes(barcodeInfo);
} }
@ -615,7 +616,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
RuleStationID = barCodeCheckDto.ruleStationID, RuleStationID = barCodeCheckDto.ruleStationID,
RuleStatus = barCodeCheckDto.ruleStatus, //F 不良 RuleStatus = barCodeCheckDto.ruleStatus, //F 不良
InputDate = DateTime.Now, InputDate = DateTime.Now,
LineId = barCodeCheckDto.line LineId = barCodeCheckDto.line,
CreateUserID = barCodeCheckDto.userID
}; };
return await barcodeStationController.PostBarcodeStation(barcodeStation); return await barcodeStationController.PostBarcodeStation(barcodeStation);
} }
@ -641,7 +643,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
ItemNo = KeyPartsItem[i].inputType, ItemNo = KeyPartsItem[i].inputType,
PartNo = KeyPartsItem[i].inputData, PartNo = KeyPartsItem[i].inputData,
SysType = "S", SysType = "S",
CreateUserID = 0, CreateUserID = barCodeCheckDto.userID,
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
UpdateDate = DateTime.Now UpdateDate = DateTime.Now
}; };
@ -672,9 +674,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
WipNo = barCodeCheckDto.wipNo, WipNo = barCodeCheckDto.wipNo,
OutfitNo = item.inputData, OutfitNo = item.inputData,
StationID = barCodeCheckDto.station, StationID = barCodeCheckDto.station,
CreateUserID = 0, CreateUserID = barCodeCheckDto.userID,
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
UpdateUserID = 0, UpdateUserID = barCodeCheckDto.userID,
UpdateDate = DateTime.Now UpdateDate = DateTime.Now
}; };
result = await barcodeOutfitController.PostBarcodeOutfit(barcodeOutfit); result = await barcodeOutfitController.PostBarcodeOutfit(barcodeOutfit);
@ -752,6 +754,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
item.FinishTime = DateTime.Now; item.FinishTime = DateTime.Now;
item.OutUserID = 1; item.OutUserID = 1;
item.UpdateDate = DateTime.Now; item.UpdateDate = DateTime.Now;
item.UpdateUserID = model.userID;
result = await burnInfoeController.PutBurnInfo(item); result = await burnInfoeController.PutBurnInfo(item);
} }
} }
@ -766,7 +769,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
StartTime = DateTime.Now, StartTime = DateTime.Now,
ScheduleFinishTime = DateTime.Now.AddMinutes((double)PlanHour), ScheduleFinishTime = DateTime.Now.AddMinutes((double)PlanHour),
InUserID = 0, InUserID = 0,
Status = 0 Status = 0,
CreateUserID = model.userID,
UpdateUserID = model.userID
}; };
result = await burnInfoeController.PostBurnInfo(burnInfo); result = await burnInfoeController.PostBurnInfo(burnInfo);
} }
@ -800,7 +805,9 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
ProgramNo = "N/A", ProgramNo = "N/A",
MachineNo = "N/A", MachineNo = "N/A",
StationId = barCodeCheckDto.station, StationId = barCodeCheckDto.station,
WipId = barCodeCheckDto.wipID WipId = barCodeCheckDto.wipID,
CreateUserID = barCodeCheckDto.userID,
UpdateUserID = barCodeCheckDto.userID
}; };
result = await ngInfoController.PostNgInfo(ngInfo); result = await ngInfoController.PostNgInfo(ngInfo);
@ -814,6 +821,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
NgID = result.Data.FirstOrDefault().NgID, NgID = result.Data.FirstOrDefault().NgID,
LocationNo = NGNo.oldInputData ?? "N/A", LocationNo = NGNo.oldInputData ?? "N/A",
NgNo = NGNo.inputData, NgNo = NGNo.inputData,
CreateUserID = barCodeCheckDto.userID,
UpdateUserID = barCodeCheckDto.userID
}; };
result_NgComponent = await ngComponentsController.PostNgComponent(ngComponent); result_NgComponent = await ngComponentsController.PostNgComponent(ngComponent);
@ -847,7 +856,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
barcodeWip = new BarcodeWip barcodeWip = new BarcodeWip
{ {
BarcodeID = barCodeCheckDto.barcodeID, BarcodeID = barCodeCheckDto.barcodeID,
WipID = barCodeCheckDto.wipID WipID = barCodeCheckDto.wipID,
CreateUserID = barCodeCheckDto.userID
}; };
return await barcodeWipController.PostBarcodeWip(barcodeWip); return await barcodeWipController.PostBarcodeWip(barcodeWip);
@ -893,7 +903,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
RuleStatus = barCodeCheckDto.ruleStatus, RuleStatus = barCodeCheckDto.ruleStatus,
RuleStationID = barCodeCheckDto.ruleStationID, RuleStationID = barCodeCheckDto.ruleStationID,
FirstCnt = 1, FirstCnt = 1,
PassCnt = 1 PassCnt = 1,
CreateUserID = barCodeCheckDto.userID
}; };
resut = await wipStationController.PostWipStation(wipStation); resut = await wipStationController.PostWipStation(wipStation);
} }
@ -954,7 +965,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
RuleStationID = barCodeCheckDto.ruleStationID, RuleStationID = barCodeCheckDto.ruleStationID,
ClassID = ClassID, ClassID = ClassID,
FirstCnt = 1, FirstCnt = 1,
PassCnt = 1 PassCnt = 1,
CreateUserID = barCodeCheckDto.userID
}; };
resut = await wipClassController.PostWipClass(wipClass); resut = await wipClassController.PostWipClass(wipClass);
} }
@ -1017,7 +1029,8 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
RuleStationID = barCodeCheckDto.ruleStationID, RuleStationID = barCodeCheckDto.ruleStationID,
SegmentID = SegmentID, SegmentID = SegmentID,
FirstCnt = 1, FirstCnt = 1,
PassCnt = 1 PassCnt = 1,
CreateUserID = barCodeCheckDto.userID
}; };
resut = await wipTimeController.PostWipTime(wipTime); resut = await wipTimeController.PostWipTime(wipTime);
} }

6
AMESCoreStudio.WebApi/DTO/BLL/BarCodeCheckDto.cs

@ -102,6 +102,12 @@ namespace AMESCoreStudio.WebApi.DTO.AMES
[DataMember] [DataMember]
public string extNo { get; set; } = string.Empty; public string extNo { get; set; } = string.Empty;
/// <summary>
/// UserID
/// </summary>
[DataMember]
public int userID { get; set; } = 0;
/// <summary> /// <summary>
/// 紀錄組件或不良代碼 /// 紀錄組件或不良代碼

Loading…
Cancel
Save