From 974052b73e7dcfbb4f4916e4804e3d2c6f2e38a8 Mon Sep 17 00:00:00 2001
From: Marvin <marvinhong@163.com>
Date: Tue, 15 Aug 2023 09:46:53 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9WriteBarcodeStation4DataCar?=
 =?UTF-8?q?rier=E5=A2=9E=E5=8A=A0=E6=B5=81=E7=A8=8BID=E5=8F=82=E6=95=B0=20?=
 =?UTF-8?q?2.=E4=BF=AE=E6=94=B9WriteBarcodeItem4DataCarrier=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=BB=84=E4=BB=B6=E7=BB=91=E5=AE=9A=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AMES/BarcodeItemsController.cs             | 7 ++++---
 .../Controllers/AMES/BarcodeStationController.cs           | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

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
         /// <param name="itemNo"></param>
         /// <param name="partNo"></param>
         /// <param name="kpItemNo"></param>
+        /// <param name="kpDateTime"></param>
         /// <returns></returns>
-        [HttpPut("WriteBarcodeItem4DataCarrier/{barcodeID}/{wipID}/{stationID}/{itemNo}/{partNo}/{kpItemNo}")]
-        public async Task<ResultModel<dynamic>> 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<ResultModel<dynamic>> WriteBarcodeItem4DataCarrier(int barcodeID, int wipID, int stationID,string itemNo, string partNo, string kpItemNo, string kpDateTime)
         {
             Helper helper = new Helper(_context);
             ResultModel<dynamic> result = new ResultModel<dynamic>();
@@ -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
         /// <param name="barcodeID"></param>
         /// <param name="wipID"></param>
         /// <param name="stationID"></param>
+        /// <param name="flowRuleID"></param>
         /// <returns></returns>
-        [HttpPut("WriteBarcodeStation4DataCarrier/{barcodeID}/{wipID}/{stationID}")]
-        public async Task<ResultModel<dynamic>> WriteBarcodeStation4DataCarrier(int barcodeID,int wipID, int stationID)
+        [HttpPut("WriteBarcodeStation4DataCarrier/{barcodeID}/{wipID}/{stationID}/{flowRuleID}")]
+        public async Task<ResultModel<dynamic>> WriteBarcodeStation4DataCarrier(int barcodeID,int wipID, int stationID,int flowRuleID)
         {
             Helper helper = new Helper(_context);
             ResultModel<dynamic> result = new ResultModel<dynamic>();
@@ -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;