´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/6d6fd497-0513-41bc-af51-04d63cd9843e.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/8cc7cbb4-d887-4b48-8514-053a923806f4.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/9d850b17-0be4-494b-9f52-085d0b20437e.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b33061e1-a74d-4784-8448-ddd7731d8d8c.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/read.lock
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -66,19 +66,19 @@ WebResponseContent RequestWMSTask(string palletCode, string sourceAddress); /// <summary> /// /// åWMSç³è¯·ä»»å¡ /// </summary> /// <param name="palletCode"></param> /// <param name="sourceAddress"></param> /// <param name="palletCode">æçå·</param> /// <param name="sourceAddress">èµ·å§å°å</param> /// <returns></returns> WebResponseContent RequestWMSTaskSimple(string palletCode, string sourceAddress); /// <summary> /// /// åWMSç³è¯·ä»»å¡ /// </summary> /// <param name="palletCode"></param> /// <param name="sourceAddress"></param> /// <param name="roadway"></param> /// <param name="palletCode">æçå·</param> /// <param name="sourceAddress">èµ·å§å°å</param> /// <param name="roadway">å··éå·</param> /// <returns></returns> WebResponseContent RequestWMSTask(string palletCode, string sourceAddress, string roadway); @@ -91,18 +91,18 @@ string? RequestAssignLocation(int taskNum, string roadwayNo); /// <summary> /// /// åWMSç³è¯·åé è´§ä½ /// </summary> /// <param name="taskNum"></param> /// <param name="roadwayNo"></param> /// <param name="heightType"></param> /// <param name="taskNum">ä»»å¡å·</param> /// <param name="roadwayNo">å··éå·</param> /// <param name="heightType">é«åº¦</param> /// <returns></returns> string? RequestAssignLocationByHeight(int taskNum, string roadwayNo, int heightType); /// <summary> /// /// ä»»å¡å®æ /// </summary> /// <param name="taskNum"></param> /// <param name="taskNum">ä»»å¡å·</param> /// <returns></returns> WebResponseContent TaskCompleted(int taskNum);
@@ -79,7 +79,7 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> <Content Update="wwwroot\swg-login.html"> <CopyToOutputDirectory>Never</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> <Content Update="wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Tenant.tsv"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -499,7 +499,7 @@ } /// <summary> /// /// åWMSç³è¯·åé è´§ä½ /// </summary> /// <param name="taskNum"></param> /// <param name="roadwayNo"></param> ´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/°å²Ä²Ö/StackerCraneJob_BC.cs
@@ -135,14 +135,25 @@ /// <param name="e"></param> private void CommonStackerCrane_StackerCraneTaskCompletedEventHandler(object? sender, WIDESEAWCS_QuartzJob.StackerCrane.StackerCraneTaskCompletedEventArgs e) { try { CommonStackerCrane? commonStackerCrane = sender as CommonStackerCrane; if (commonStackerCrane != null) { if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5) //if (commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WorkType) != 5) { if (e.TaskNum != 0) { WriteDebug(commonStackerCrane.DeviceCode, $"读åå°ä»»å¡å®æ,ä»»å¡å·:{e.TaskNum}"); StackerCraneTaskCompleted(e.TaskNum, commonStackerCrane.DeviceCode); commonStackerCrane.SetValue(StackerCraneDBName.WorkType, 5); } } } } catch (Exception ex) { WriteError(nameof(StackerCraneJob_BC), "ä»»å¡å®æ失败", ex); } } @@ -160,6 +171,7 @@ { _taskExecuteDetailService.AddTaskExecuteDetail(taskNum, $"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); _taskService.UpdateTaskExceptionMessage(taskNum, $"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); WriteInfo(deviceCode, $"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); return WebResponseContent.Instance.Error($"è¾é线åºåºç«ç¹æªé ç½®,{task.NextAddress}"); } Dt_Router router = _routerRepository.QueryFirst(x => x.InOutType == task.TaskType && x.StartPosi == stationManger.StationCode); @@ -205,6 +217,16 @@ /// <returns></returns> private Dt_Task? GetTask(CommonStackerCrane commonStackerCrane) { try { Dt_Task oldTask = _taskRepository.QueryFirst(x => x.DeviceCode == commonStackerCrane.DeviceCode && x.TaskState == TaskStatusEnum.SC_Executing.ObjToInt()); if (oldTask != null) { StackerCraneTaskCompleted(oldTask.TaskNum, commonStackerCrane.DeviceCode); } } catch { } Dt_Task task; if (commonStackerCrane.LastTaskType == null) { ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2ad7410e-7b16-4692-8ca2-e7055946c8fa.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b3148ac-ac73-4f51-871c-b180e5505f3e.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4c38f972-bf83-4ac2-aafd-e039bf28b031.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/dd0e45d4-3741-49da-b1eb-25a4729fc53f.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/read.lock
´úÂë¹ÜÀí/»´°²PDA/pages/stash/receiveorderoutbound.vue
@@ -31,11 +31,6 @@ </view> <view v-if="current === 1" class="headerstyle"> <view class="itemstyle"> <u-sticky> <!-- <view style="background-color: #ffffff;"> <uni-search-bar @confirm="search" v-model="searchValue"></uni-search-bar> </view> --> </u-sticky> <!-- <uni-forms label-width="180"> <uni-forms-item label="åºå"> <uni-data-select v-if="show" v-model="value" :localdata="range"></uni-data-select> @@ -48,7 +43,7 @@ </uni-forms-item> </uni-forms> --> <uni-list :border="true"> <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.dtlId"> <uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.id"> <template v-slot:body> <view class="uni-content"> <view>æ¶è´§åå·ï¼{{orderNo}}</view>
