fixedbug

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

@@ -261,23 +261,31 @@ namespace Siger.ApiACC.Controllers
                 // 业务入口： 上料位-》 入库 如果是上料工装 安装完成 ,绑定 储位与装配
                 if (sectionProperty.propertytype == 1)
                 {
+                    var download = false;
+                    if (sectionProperty.down > 2)
+                    {
+                        // 是拆卸
+                        download = true;
+                    }
                     //绑定SN 工件到立库储位
                     if (taskObj.action == TaskAction.Step_SXLW_LK)
                     {
                         location.fixturetools = taskObj.fixtureguid;
                         location.fixturename = taskObj.fixturename;
                         location.ordernumber = taskObj.ordercode;
-                        location.productcode = taskObj.productcode;
-                        location.productid = taskObj.productid;
-                        location.routeid = taskObj.route;
-                        location.route = taskObj.route.ToString();
-                        location.sn = taskObj.sn;
-                        location.status = (int)LocationStatus.In;
+                        location.productcode = download?"": taskObj.productcode;
+                        location.productid = download?0: taskObj.productid;
+                        location.routeid = download?0: taskObj.route;
+                        location.route = download?"": taskObj.route.ToString();
+                        location.sn = download?"": taskObj.sn;
+                        location.status =(int)LocationStatus.In;
                         _automationLocation.Update(location);
 
                         sectionProperty.upload = 0;
                         sectionProperty.down = 0;
                         _automationSectionProperty.Update(sectionProperty);
+
+                       
                     }
                     //从立库储位拿SN 工件到上料位
                     if (taskObj.action == TaskAction.Step_LK_SXLW)

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

@@ -36,11 +36,11 @@ namespace Siger.ApiACC.Tasks
 
                     return;
                 }
-                //if (!dbhelper.CanTask(projectId))
-                //{
-                //    return;
-                //}
-                
+                if (!dbhelper.CanTask(projectId))
+                {
+                    return;
+                }
+
                 var tasks = tasklist.OrderBy(s => s.actiontype);
                 var task = tasks.FirstOrDefault();
                 if (task.send == 1)