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

Html/src/view/cnc/set/beat.vue

@@ -620,7 +620,7 @@ export default {
         getRoutesByProduct(val) {
             // 选择产品查询工艺路径
             let id = 0;
-            id = val.value?val.value:0;
+            id = val&&val.value?val.value:0;
             var params = {
                 productId: id,
                 page: 1,

Html/src/view/pms/planMange/productPlanMange.vue

@@ -256,7 +256,6 @@
             </label>
             <DatePicker
               class="searchInput"
-              :disabled="type == 2 ? true : false"
               v-model="addobj.deliverydate"
               type="date"
             ></DatePicker>

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

@@ -299,6 +299,7 @@ namespace Siger.ApiACC.Controllers
                         location.productid = taskObj.productid;
                         location.routeid = taskObj.route;
                         location.sn = taskObj.sn;
+                        location.status = (int)LocationStatus.In;
                         _automationLocation.Update(location);
                     }
 
@@ -389,7 +390,7 @@ namespace Siger.ApiACC.Controllers
                         return;
                     }
                     //工件回到立库
-                    locationObj.status = 1;
+                    locationObj.status = (int)LocationStatus.In;
                     _automationLocation.Update(locationObj);
 
                     CreateTask(cleanMachine.section, TaskActionType.Unload, TaskAction.Step_QXJ_LK, tasklist.fixtureguid, tasklist.ordercode, tasklist.sn, "无程序", tasklist.productid, tasklist.productcode, tasklist.locationid, tasklist.route);
@@ -425,7 +426,7 @@ namespace Siger.ApiACC.Controllers
                             locationObj.route = nextRoute != null ? nextRoute.name : "";
                         }
                         //工件已出立库
-                        locationObj.status = 2;
+                        locationObj.status = (int)LocationStatus.Out;
                         _automationLocation.Update(locationObj);
 
                         CreateTask(location.section, TaskActionType.Load, TaskAction.Step_LK_JGZX, location.fixture, location.ordernumber, location.sn, location.pn, location.productId, location.productCode, location.location,location.route);

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

@@ -22,6 +22,7 @@ using Siger.Middlelayer.Common.Configuration;
 using Siger.Middlelayer.Common.Helpers;
 using Newtonsoft.Json;
 using NPOI.SS.Formula;
+using static Siger.Middlelayer.Share.Enum.ModuleEnum.Automation;
 
 namespace Siger.ApiACC.Controllers
 {
@@ -488,7 +489,7 @@ namespace Siger.ApiACC.Controllers
             {
                 throw new BadRequestException(AccEnum.MonitorNotfound);
             }
-            //移出 上料位
+            //检测工序是否配置正确
         
 
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);
@@ -516,6 +517,7 @@ namespace Siger.ApiACC.Controllers
                 processid = 0,
                 programnumber = "",
                 remark = "手动任务-安装完成",
+                route=monitor.route
 
             });
             monitor.taskno = taskNo;
@@ -680,6 +682,7 @@ namespace Siger.ApiACC.Controllers
             if (location!=null)
             {
                 location.sn = "";
+                location.status= (int)LocationStatus.Out;
                 _automationLocation.Update(location);
             }
             var taskNo = _automationTaskList.CrateTaskNumber(Automation.TaskTrigerType.Manual);

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

@@ -148,5 +148,13 @@ namespace Siger.Middlelayer.Share.Enum.ModuleEnum
             [Description("清洗机->加工中心")]
             Step_QXJ_JGZX = 10,
         }
+
+        public enum LocationStatus
+        {
+            [Description("在库内")]
+            In =1,
+            [Description("不在库内")]
+            Out =2
+        }
     }
 }

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

@@ -121,7 +121,8 @@ namespace Siger.Middlelayer.AccRepository.Repositories
         {
             var query = from q in _context.siger_automation_fixture_tools
                         join l in _context.siger_automation_location on q.guid equals l.fixturetools
-                        where q.projectId ==projectId && q.guid==guid && l.locationid==loactionId
+                        where q.projectId == projectId && q.guid == guid && l.locationid == loactionId
+                        && l.status == 1
                         select new ResponseProductFixtureInfo
                         {
                              FixtureGuid=q.guid,