someupdate

Html/src/locale/lang/zh-CN.js

@@ -2111,6 +2111,9 @@ export default {
     '3000176': '工序未开始加工',
     '3000177': '同步报表记录失败',
     '3000178': '请勿重复提交任务',
+    '3000179': '该工单对应当前工装产品不一致',
+    '3000180': '请更换工件',
+
 
     '400000': '设备状态',
     '400002': '更改状态',

Html/src/view/fml/operation_manage/feedingBlanking.vue

@@ -756,6 +756,7 @@ export default {
             let data = {
                 section: section,
                 code: code,
+                location:this.locationobj.id,
             };
             this.request(
                 "acc/AutomationOperate/CurrentOrder",
@@ -782,9 +783,10 @@ export default {
             }
             let data = {
                 section: this.sectionid,
+                sn:this.orderDetail2.sn?this.orderDetail2.sn:''
             };
             this.request(
-                " acc/AutomationOperate/DisassembleAndAssemble",
+                "acc/AutomationOperate/DisassembleAndAssemble",
                 data,
                 "post"
             ).then((res) => {

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

@@ -797,25 +797,37 @@ namespace Siger.ApiACC.Controllers
         [HttpPost]
         public IActionResult CurrentOrder([FromBody]RequestDissasembleAndLoad request)
         {
-            var monitor = _automationFixtureMonitor.Get(f => f.section == request.section);
-            if (monitor == null)
+
+            var location = _automationLocation.Get(f => f.id == request.location);
+
+            if (location==null)
             {
-                throw new BadRequestException(AccEnum.MachineOnFree);
+                throw new BadRequestException(AccEnum.LocationNoExits);
             }
-            var newCode = monitor.ordernumber;
+            var orderNo = location.ordernumber;
+            
+            var oldLocation = location.locationid;
             if (!string.IsNullOrEmpty(request.code))
             {
-                newCode = request.code;
+                orderNo = request.code;
+            }
+            else
+            {
+                var monitor = _automationFixtureMonitor.Get(f => f.section == request.section);
+                if (monitor == null)
+                {
+                    throw new BadRequestException(AccEnum.MachineOnFree);
+                }
             }
-            var result = _automationFixtureToolsProduct.GetPlanFixtureInfo(ProjectId, newCode);
+            var result = _automationFixtureToolsProduct.GetPlanFixtureInfo(ProjectId, orderNo);
             if (result == null)
             {
                 throw new BadRequestException(AccEnum.FixtureOrderNulll);
             }
             if (!string.IsNullOrEmpty(request.code))
             {
-                //新扫描的工单，工装与原托盘工装一致
-                if (result.FixtureGuid != monitor.fixtureguid)
+                //新扫描的工单，工装与原托盘工装产品一致
+                if (result.ProductCode != location.productcode)
                 {
                     throw new BadRequestException(AccEnum.FixtureDiff); 
                 }
@@ -823,7 +835,9 @@ namespace Siger.ApiACC.Controllers
           
             var sn = _automationTaskList.CreateRandonSn(result.ProductCode);
             result.Sn = sn;
-            result.status = monitor != null ? monitor.status : 1;
+            result.OrderNumber = orderNo;
+            result.Location = oldLocation;
+         
             return new ObjectResult(result);
 
         }

Server/Common/Siger.Middlelayer.Share/Enum/ModuleEnum/AccEnum.cs

@@ -362,7 +362,7 @@ namespace Siger.Middlelayer.Common.ModuleEnum
         SyncSnReportErro,
         [Description("请勿重复提交任务")]
         TaskCreateDone,
-        [Description("该工单对应当前工装不一致")]
+        [Description("该工单对应当前工装产品不一致")]
         FixtureDiff,
         [Description("请更换工件")]
         ReplaceSn

Server/Infrastructure/Repositories/Siger.Middlelayer.AccRepository/Repositories/AutomationFixtureToolsProductRepository.cs

@@ -234,14 +234,14 @@ namespace Siger.Middlelayer.AccRepository.Repositories
                         select new ResponsePlanlFixtureInfo
                         {
                 
-                            OrderNumber = d.OrderNumber,
-                            ProductName = p.product_name,
+                            OrderNumber = l.ordernumber,
+                            ProductName = l.productname,
                             Url = pd.image,
                             FixtureName = t.name,
                             FixtureGuid = t.guid,
                             FixtureCode =t.code,
-                            ProductCode = q != null ? q.productcode : "",
-                            Location = l != null ? l.locationid : 0,
+                            ProductCode = l.productcode,
+                            Location = l.locationid,
                             Sn=l.sn
                         };
             return query.FirstOrDefault();

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

@@ -58,5 +58,6 @@ namespace Siger.Middlelayer.AccRepository.Request
         /// 新工件SN
         /// </summary>
         public string sn { get; set; }
+        public int location { get; set; }
     }
 }