ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.binBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/CodeChunks.dbBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/CopilotIndices/17.14.1368.60722/SemanticSymbols.dbBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2Binary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2Binary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suoBinary files differ
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -150,6 +150,7 @@ /// <param name="nextAddress">ä¸ä¸å°å</param> /// <returns></returns> Dt_Task QueryExecutingTaskByBarcode(string barcode, string nextAddress); Dt_Task QueryOutTaskByBarcode(string barcode); /// <summary> /// æ ¹æ®ä»»å¡å·ãå½åå°åæ¥è¯¢è¾éçº¿å®æçä»»å¡ ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -815,6 +815,11 @@ return BaseDal.QueryFirst(x => x.PalletCode == barcode && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy); } public Dt_Task QueryOutTaskByBarcode(string barcode) { return BaseDal.QueryFirst(x => x.PalletCode == barcode && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting, TaskOrderBy); } private string GetIpAddress(string baseIp, string name) { var configz = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress); ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -322,6 +322,7 @@ { if (_taskService.UpdateCheckTask(command.Number, stationInfo).Result.Status) { conveyorLine.SetValue(ConveyorLineDBName.ResponState, 1, stationInfo.stationChildCode); _taskService.UpdatePosition(task.TaskNum, stationInfo.stationChildCode); @@ -346,7 +347,8 @@ /// <param name="ProtocalDetailValue">线ä½å½åbool读ååç§»å°å</param> public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, Dt_StationManager stationInfo) { var task = _taskService.QueryExecutingTaskByBarcode(command.Number, stationInfo.stationChildCode); //var task = _taskService.QueryExecutingTaskByBarcode(command.Number, stationInfo.stationChildCode); var task = _taskService.QueryOutTaskByBarcode(command.Number); if (task != null) { if (task.TargetAddress == "2032" || task.TargetAddress == "2042") ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.metadata.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.projects.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/ProjectEvaluation/widesea_wmsserver.strings.v9.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/CodeChunks.dbBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/CopilotIndices/17.14.1368.60722/SemanticSymbols.dbBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/DesignTimeBuild/.dtbcache.v2Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.futdcache.v2Binary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/.suoBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/fileList.binBinary files differ
ÏîÄ¿´úÂë/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs
@@ -41,8 +41,8 @@ builder.Services.AddAllOptionRegister();//读åé ç½®æä»¶ builder.Services.AddMemoryCacheSetup();//ç¼å builder.Services.AddSqlsugarSetup();//SqlSugar å¯å¨æå¡ //builder.Services.AddInitializationHostServiceSetup();//åºç¨åå§åæå¡æ³¨å ¥ //builder.Services.AddDbSetup();//Db å¯å¨æå¡ builder.Services.AddInitializationHostServiceSetup();//åºç¨åå§åæå¡æ³¨å ¥ builder.Services.AddDbSetup();//Db å¯å¨æå¡ //todo åå§å模åéªè¯é ç½® //builder.Services.UseMethodsModelParameters().UseMethodsGeneralParameters();