someupdate

Server/Apis/Siger.ApiACC/Controllers/AutomationController.cs

@@ -101,7 +101,6 @@ namespace Siger.ApiACC.Controllers
                 {
                     if (request.status == (int)Automation.MachineStatus.Waiting || request.status == (int)Automation.MachineStatus.Complated)
                     {
-
                         var stationDicts = _sigerDict.GetDataByCat(AccDictCost.Automation, PID);
                         if (!stationDicts.Any())
                         {

Server/Apis/Siger.ApiACC/Controllers/AutomationOperateController.cs

@@ -210,11 +210,17 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(CommonEnum.Fail);
             }
+            var fixture = _automationFixtureTools.Get(f => f.guid == taskobj.fixtureguid);
+            if (fixture==null)
+            {
+                throw new BadRequestException(AccEnum.FixtureToolsIsNone);
+            }
             var sendToPLC = new RequestPLC
             {
+                ProductCode=taskobj.productcode,
                 LineID=levelsection.parentid,
                 RStation = attr.machine,
-                Fixture = taskobj.fixtureguid,
+                Fixture = fixture.code,
                 RequestForm = taskobj.no,
                 RobotStep = (int)taskobj.action,
                 StorageNo = taskobj.locationid,

Server/Apis/Siger.ApiACC/Tasks/AutoMES.cs

@@ -50,11 +50,18 @@ namespace Siger.ApiACC.Tasks
                 if (attr == null)
                     return;
 
+                var fixtrue = dbhelper.GetFixture(task.fixtureguid);
+                if (fixtrue==null)
+                {
+                    Logger.WriteLineError($"自动工装未找到");
+                    return;
+                }
                 var sendToPLC = new RequestPLC
                 {
+                    ProductCode=task.productcode,
                     LineID= levelsction.parentid,
                     RStation = attr.machine,
-                    Fixture = task.fixtureguid,
+                    Fixture = fixtrue.code,
                     RequestForm = task.no,
                     RobotStep = (int)task.action,
                     StorageNo = task.locationid,

Server/Apis/Siger.ApiACC/Tasks/DBhelper.cs

@@ -70,6 +70,10 @@ namespace Siger.ApiACC.Tasks
         {
             return AccDbContext.siger_project_machine_attribution.FirstOrDefault(f => f.station==section && f.status==1);
         }
+        public siger_automation_fixture_tools GetFixture(string guid)
+        {
+            return AccDbContext.siger_automation_fixture_tools.FirstOrDefault(f => f.guid==guid && f.status == 1);
+        }
         public void Dispose()
         {
             CncDbContext?.Dispose();

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Request/RequestPLC.cs

@@ -6,6 +6,7 @@ namespace Siger.Middlelayer.AccRepository.Request
 {
     public class RequestPLC
     {
+        public string ProductCode { get; set; }
         /// <summary>
         /// 工件唯一识别SN
         /// </summary>