diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
index bf5860fd..791a7977 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeItemsController.cs
@@ -518,9 +518,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
///
///
///
+ ///
///
- [HttpPut("WriteBarcodeItem4DataCarrier/{barcodeID}/{wipID}/{stationID}/{itemNo}/{partNo}/{kpItemNo}")]
- public async Task> WriteBarcodeItem4DataCarrier(int barcodeID, int wipID, int stationID,string itemNo, string partNo, string kpItemNo)
+ [HttpPut("WriteBarcodeItem4DataCarrier/{barcodeID}/{wipID}/{stationID}/{itemNo}/{partNo}/{kpItemNo}/{kpDateTime}")]
+ public async Task> WriteBarcodeItem4DataCarrier(int barcodeID, int wipID, int stationID,string itemNo, string partNo, string kpItemNo, string kpDateTime)
{
Helper helper = new Helper(_context);
ResultModel result = new ResultModel();
@@ -536,7 +537,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
barcode_item.PartNo = partNo;
barcode_item.KpItemNo = kpItemNo;
barcode_item.SysType = "S";
- barcode_item.CreateDate = DateTime.Now;
+ barcode_item.CreateDate = DateTime.Parse(kpDateTime.Substring(0, 4) + "-" + kpDateTime.Substring(4, 2) + "-" + kpDateTime.Substring(6, 2) + " " + kpDateTime.Substring(8, 2) + ":" + kpDateTime.Substring(10, 2) + ":" + kpDateTime.Substring(12, 2));
_context.BarcodeItems.Add(barcode_item);
await _context.SaveChangesAsync();
diff --git a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
index 99fe824b..ccd494c5 100644
--- a/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
+++ b/AMESCoreStudio.WebApi/Controllers/AMES/BarcodeStationController.cs
@@ -297,9 +297,10 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
///
///
///
+ ///
///
- [HttpPut("WriteBarcodeStation4DataCarrier/{barcodeID}/{wipID}/{stationID}")]
- public async Task> WriteBarcodeStation4DataCarrier(int barcodeID,int wipID, int stationID)
+ [HttpPut("WriteBarcodeStation4DataCarrier/{barcodeID}/{wipID}/{stationID}/{flowRuleID}")]
+ public async Task> WriteBarcodeStation4DataCarrier(int barcodeID,int wipID, int stationID,int flowRuleID)
{
Helper helper = new Helper(_context);
ResultModel result = new ResultModel();
@@ -310,7 +311,7 @@ namespace AMESCoreStudio.WebApi.Controllers.AMES
barcode_station.BarcodeID = barcodeID;
barcode_station.WipID = wipID;
barcode_station.StationID = stationID;
- barcode_station.FlowRuleID = -1;
+ barcode_station.FlowRuleID = flowRuleID;
barcode_station.RuleStatus = "P";
barcode_station.Systype = "S";
barcode_station.CreateDate = DateTime.Now;