Merge branch 'master' of http://test.siger-data.com:9000/jiawei.su/Laisi_AutoMES2

Html/src/view/wms/whStatusQuery/storageInfoQuery.vue

@@ -309,7 +309,7 @@ export default {
             this.storageList1 = [];
             this.addstorageid = "";
             if(value != undefined){
-                this.warehouseid = value.value;
+                this.addwarehouseid = value.value;
                 this.addinitStorage();
             }
         },
@@ -460,6 +460,14 @@ export default {
         },
         add(){
             this.type = 1;
+            this.initFrockType();//工装类型
+            this.addstorageid = '';//仓库id
+            this.parentType = [];//工装类型
+            this.parentTypeid = '';//工装类型id
+            this.addfrockid = '';//工装id
+            this.addremark = '';//备注
+            this.filename = '';
+            this.fileurl = '';
             this.addmodal = true;
         },
         /*********文件上传 start******** */

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

@@ -181,7 +181,7 @@ namespace Siger.ApiACC.Controllers
         public IActionResult TaskResult([FromBody]RequestAutomationTaskResult request)
         {
             //1.检查Tasklist
-            var taskObj = _automationTaskList.Get(f => f.guid == request.guid);
+            var taskObj = _automationTaskList.Get(f => f.no== request.guid);
             if (taskObj == null)
             {
                 throw new BadRequestException(CommonEnum.RecordNotFound);