1

huanghongfeng

13 小时以前 9c3ee278c31a79e2e36b635651cef0b2dd431260

1

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue

@@ -3,7 +3,7 @@
    <vol-box
      v-model="showDetialBox"
      :lazy="true"
      width="1200px"
      width="1400px"
      :padding="15"
      title="任务详情"
    >
@@ -81,21 +81,26 @@
            <el-table-column type="index" width="50"> </el-table-column>
            <el-table-column prop="taskNum" label="任务号" width="90">
            </el-table-column>
            <el-table-column prop="taskState" label="任务状态" width="90">
            <!-- <el-table-column prop="taskState" label="任务状态" width="90">
            </el-table-column> -->
            <el-table-column prop="taskStateremark" label="下一执行状态" width="90">
            </el-table-column>
            <el-table-column prop="currentAddress" label="当前位置" width="90">
            <el-table-column prop="rgvTaskTyperemark" label="RGV下一执行状态" width="90">
            </el-table-column>
            <el-table-column prop="nextAddress" label="下一位置" width="90">
            <el-table-column prop="currentAddress" label="当前执行点" width="90">
            </el-table-column>
            <el-table-column prop="nextAddress" label="下一执行点" width="90">
            </el-table-column>
            <el-table-column prop="isManual" label="是否人工操作" width="120">
            </el-table-column>
            <el-table-column prop="isNormal" label="是否正常" width="90">
            </el-table-column>
            <el-table-column prop="description" label="描述"> </el-table-column>
            
            <el-table-column prop="createDate" label="创建时间" width="180">
            </el-table-column>
            <el-table-column prop="remark" label="备注" width="180">
            </el-table-column>
            <el-table-column prop="description" label="描述"> </el-table-column>
            <!-- <el-table-column prop="remark" label="备注" width="180">
            </el-table-column> -->
          </el-table>
        </div>
      </div>
@@ -131,7 +136,7 @@
      } else {
        this.getDetailDatas();
      }

      
      this.$emit("parentCall", ($vue) => {
        var previousButton = $vue.buttons.find((x) => x.value == "Previous");
        this.previousShow = previousButton != null;
@@ -151,6 +156,10 @@
          if (!x.status) return this.$message.error(x.message);
          this.steps = x.data.list;
          this.active = x.data.active;
          
          this.row.taskState=this.steps[this.active-1].title;
          this.row.currentAddress=x.data.curradd;
          this.row.nextAddress=x.data.nextadd;
        });
    },
    getDetailDatas() {
@@ -163,6 +172,7 @@
        .then((x) => {
          if (!x.status) return this.$message.error(x.message);
          this.tableData = x.data;
          
        });
    },
    previous() {

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js

@@ -28,41 +28,32 @@
                    let rows = this.getSelectRows();
                    console.log('选中的数据行:', rows);

                    if (rows.length === 0 || rows.length > 1) {0
                    if (rows.length === 0 || rows.length > 1) {
                        0
                        return this.$message.warning('请选择一条数据');
                    } else if (rows.length === 1) {

                        let selectRow = rows;
                        let selectRow = rows[0];

                        let Id = selectRow.map(item => item.taskId);
                        console.log('任务ID列表:', Id);

                        // éåŽ†çŠ¶æ€æ•°ç»„，判断是否有不符合条件的状态
                        //   for (let i = 0; i < statusList.length; i++) {
                        //     const status = statusList[i];

                        //     if (status === 2 || status === 3 || status === 4) {
                        //       this.$message.error('执行中任务无法取消');
                        //       return; 
                        //     }
                        //   }

                       
                        // æ˜¾ç¤ºç¡®è®¤æ¡†ï¼Œè®©ç”¨æˆ·ç¡®è®¤æ˜¯å¦æ‰§è¡Œæ“ä½œ
                        this.$confirm('确定要手动完成选中的' + selectRow.map(item => item.taskNum) + '任务号吗？', '操作确认', {
                        this.$confirm('确定要手动完成选中的' + selectRow.taskNum + '任务号吗？', '操作确认', {
                            confirmButtonText: '确定',
                            cancelButtonText: '取消',
                            type: 'warning' // è­¦å‘Šç±»åž‹ï¼Œæ˜¾ç¤ºé»„色图标
                        }).then(() => {
                            // ç”¨æˆ·ç‚¹å‡»"确定"后执行的逻辑
                            http.post('api/Task/CompletedManually', Id).then(res => {
                                if (res && res.status) {
                                    this.$message.success(res.message || '手动完成任务成功！');
                                } else {
                                    this.$message.error(res.message || '手动完成任务失败！');
                                }
                            }).catch(() => {
                                this.$message.error('请求失败，请稍后重试');
                            });
                            var CompletionType = 1;
                            http.post(`api/Task/CompletedManually?id=${selectRow.taskId}`).then(res => {
                                    if (res && res.status) {
                                        this.$message.success(res.message || '手动完成任务成功！');
                                        this.search();
                                    } else {
                                        this.$message.error(res.message || '手动完成任务失败！');
                                    }
                                }).catch(() => {
                                    this.$message.error('请求失败，请稍后重试');
                                });
                        }).catch(() => {
                            // ç”¨æˆ·ç‚¹å‡»"取消"后执行的逻辑（通常是提示取消操作）
                            this.$message.info('已取消手动完成任务');
@@ -82,7 +73,7 @@
                    console.log('选中的数据行:', rows);

                    if (rows.length === 0 || rows.length > 1) {
                        return this.$message.warning('请选择最少一条数据');
                        return this.$message.warning('请选择一条数据');
                    }
                    if (rows.length === 1) {
                        let selectRow = rows;
@@ -102,6 +93,7 @@
                            ).then(res => {
                                if (res && res.status) {
                                    this.$message.success(res.message || '取消任务成功！');
                                    this.search();
                                } else {
                                    this.$message.error(res.message || '取消任务失败！');
                                }

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue

@@ -89,6 +89,7 @@
          data: [],
          placeholder: "请选择任务状态"
        },
        
        {
          title: "起始地址",
          required: true,
@@ -234,7 +235,7 @@
        type: "int",
        width: 90,
        align: "left",
        bind: { key: "agvStationEnum", data: [] },
        bind: { key: "taskType", data: [] },
      },
      {
        field: "taskState",
@@ -243,6 +244,13 @@
        width: 150,
        align: "left",
        bind: { key: "taskState", data: [] },
      },{
        field: "rgvTaskType",
        title: "RGV执行类型",
        type: "int",
        width: 120,
        align: "left",
        bind: { key: "rgvtaskTypeEnum", data: [] },
      },
      {
        field: "sourceAddress",

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskStatusEnum.cs

@@ -84,8 +84,8 @@
        RGV_InMothercarExecuting = 260,

        /// <summary>
        /// ä»»åŠ¡å®Œæˆï¼ˆæ¯è½¦ç§»åŠ¨å®Œæˆï¼‰
        /// </summary>
        /// ä»»åŠ¡å®Œæˆ
        /// </summary>（母车移动完成）
        [Description("任务完成")]
        RGV_InMothercarFinish = 290,


 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs

@@ -35,5 +35,9 @@
        WebResponseContent GetDetailDatas(int taskNum);

        void AddTaskExecuteDetail(List<int> taskNums, string description = "");


        string GetEnumDescription(int taskNum);
        string GetEnumDescription2(int taskNum);
    }
}

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -109,7 +109,7 @@
        /// </summary>
        /// <param name="taskNum">任务id</param>
        /// <returns></returns>
        WebResponseContent UpdateTaskStatus(int taskNum);
        WebResponseContent UpdateTaskStatus(int taskNum, int Completetype);


        /// <summary>
@@ -180,7 +180,7 @@
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        WebResponseContent CompletedManually(int id);
        WebResponseContent CompletedManually(int id,int CompletionType);

        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å–消任务

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs

@@ -54,11 +54,11 @@
        public string PalletCode { get; set; }

        /// <summary>
        /// åŒºåŸŸå·
        /// RGV执行设备
        /// </summary>
        [ImporterHeader(Name = "区域号")]
        [ExporterHeader(DisplayName = "区域号")]
        [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "区域号")]
        [ImporterHeader(Name = "RGV执行设备")]
        [ExporterHeader(DisplayName = "RGV执行设备")]
        [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "RGV执行设备")]
        public string Roadway { get; set; }

        /// <summary>

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_TaskExecuteDetail.cs

@@ -56,8 +56,8 @@
        /// <summary>
        /// ä»»åŠ¡çŠ¶æ€
        /// </summary>
        [ImporterHeader(Name = "主键")]
        [ExporterHeader(DisplayName = "主键")]
        [ImporterHeader(Name = "任务状态")]
        [ExporterHeader(DisplayName = "任务状态")]
        [SugarColumn(IsNullable = false, ColumnDescription = "任务状态")]
        public int TaskState { get; set; }

@@ -108,5 +108,38 @@
        [ExporterHeader(DisplayName = "备注")]
        [SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "备注")]
        public string Remark { get; set; }


        /// <summary>
        /// çŠ¶æ€æè¿°
        /// </summary>
        [ImporterHeader(Name = "状态描述")]
        [ExporterHeader(DisplayName = "状态描述")]
        [SugarColumn(IsNullable = true, Length = 150, ColumnDescription = "状态描述")]
        public string TaskStateremark { get; set; }

        /// <summary>
        /// æ‰§è¡Œçš„RGV
        /// </summary>
        [ImporterHeader(Name = "执行的RGV")]
        [ExporterHeader(DisplayName = "执行的RGV")]
        [SugarColumn(IsNullable = true, Length = 150, ColumnDescription = "执行的RGV")]
        public string Roadway { get; set; }

        /// <summary>
        /// rgv任务类型
        /// </summary>
        [ImporterHeader(Name = "rgv任务类型")]
        [ExporterHeader(DisplayName = "rgv任务类型")]
        [SugarColumn(IsNullable = true, ColumnDescription = "rgv任务类型")]
        public int RGVTaskType { get; set; }

        /// <summary>
        /// ä»»åŠ¡ç±»åž‹æè¿°
        /// </summary>
        [ImporterHeader(Name = "任务类型描述")]
        [ExporterHeader(DisplayName = "任务类型描述")]
        [SugarColumn(IsNullable = true, Length = 150, ColumnDescription = "任务类型描述")]
        public string RGVTaskTyperemark { get; set; }
    }
}

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/ref/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/refint/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs

@@ -321,6 +321,30 @@
                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "rgvtaskTypeEnum":
                        {
                            List<object> data = new List<object>();
                            Type type = typeof(RGVTaskTypeEnum);
                            List<int> enums = Enum.GetValues(typeof(RGVTaskTypeEnum)).Cast<int>().ToList();
                            int index = 0;
                            foreach (var item in enums)
                            {
                                FieldInfo? fieldInfo = typeof(RGVTaskTypeEnum).GetField(((RGVTaskTypeEnum)item).ToString());
                                DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                if (description != null)
                                {
                                    data.Add(new { key = item.ToString(), value = description.Description });
                                }
                                else
                                {
                                    data.Add(new { key = item.ToString(), value = item.ToString() });
                                }
                                index++;
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "inOutType":
                        {
                            List<object> data = new List<object>();

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -49,10 +49,9 @@
        /// <param name="ids"></param>
        /// <returns></returns>
        [HttpPost,HttpGet, Route("CompletedManually")]
        public WebResponseContent CompletedManually([FromBody] int[] id)
        public WebResponseContent CompletedManually(int id)
        {
            int taskid = id[0];
            return Service.CompletedManually(taskid);
            return Service.CompletedManually(id, 1);
        }

        /// <summary>

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/ÈÎÎñ½ÓÊÕ/2025-09-22/½ÓÊÕÀ¼½£Ï·¢ÈÎÎñ250922.txt

@@ -33,3 +33,43 @@
"接收到的数据为：{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 11:01:22.157
成功
"接收到的数据为：{\"data\":[{\"taskNo\":43,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 11:01:26.399
成功
"接收到的数据为：{\"data\":[{\"taskNo\":233,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 15:08:59.571
成功
"接收到的数据为：{\"data\":[{\"taskNo\":233,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 15:25:45.981
成功
"接收到的数据为：{\"data\":[{\"taskNo\":233,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 15:50:48.869
成功
"接收到的数据为：{\"data\":[{\"taskNo\":43,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 15:54:54.166
成功
"接收到的数据为：{\"data\":[{\"taskNo\":43,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 16:15:06.994
成功
"接收到的数据为：{\"data\":[{\"taskNo\":43,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------

2025/9/22 16:18:57.114
成功
"接收到的数据为：{\"data\":[{\"taskNo\":43,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------


 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -6,7 +6,7 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
  "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType,agvStationEnum,agvareaEnum",
  "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType,agvStationEnum,agvareaEnum,rgvtaskTypeEnum",
  "urlLanJianWCSAPI": "http://26.39.153.105:8080/WcsApi/", //兰剑IP地址，后续待更改
  "LanJianStkRunStatus": "StkRunStatus", //兰剑堆垛机运行状态接口
  "LanJiantaskResult": "taskResult", //兰剑任务反馈接口

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_SystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_SystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json

@@ -6,7 +6,7 @@
      "Microsoft.AspNetCore": "Warning"
    }
  },
  "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType,agvStationEnum,agvareaEnum",
  "dics": "deviceType,devicePlcType,jobAssembly,jobClassName,deviceStatus,taskType,taskState,inOutType,agvStationEnum,agvareaEnum,rgvtaskTypeEnum",
  "urlLanJianWCSAPI": "http://26.39.153.105:8080/WcsApi/", //兰剑IP地址，后续待更改
  "LanJianStkRunStatus": "StkRunStatus", //兰剑堆垛机运行状态接口
  "LanJiantaskResult": "taskResult", //兰剑任务反馈接口

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0/WIDESEAWCS_SystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs

@@ -46,32 +46,33 @@

        public void AddTaskExecuteDetail(int taskId, string description = "")
        {
            try
            {
                bool isNormal = true;
                Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
                if (task == null) return;
                int taskNum = task.TaskNum;
                int taskState = task.TaskState;
            bool isNormal = true;
            Dt_Task task = _taskRepository.QueryFirst(x => x.TaskId == taskId);
            if (task == null) return;
            int taskNum = task.TaskNum;
            int taskState = task.TaskState;
            int TaskStateremark = task.RGVTaskType; //新增RGv任务类型

               
                Dt_TaskExecuteDetail taskExecuteDetail = new()
                {
                    IsManual = App.User.UserId > 0,
                    IsNormal = isNormal,
                    TaskNum = taskNum,
                    TaskId = taskId,
                    TaskState = taskState,
                    Description = description,
                    CurrentAddress = task.CurrentAddress,
                    NextAddress = task.NextAddress,
                };
                BaseDal.AddData(taskExecuteDetail);
            }
            catch (Exception ex)
            {
            string getstastr = GetEnumDescription(taskState);
            string getrgvtasktyperema = GetEnumDescription2(TaskStateremark);

            }

            Dt_TaskExecuteDetail taskExecuteDetail = new()
            {
                IsManual = App.User.UserId > 0,
                IsNormal = isNormal,
                TaskNum = taskNum,
                TaskId = taskId,
                TaskState = taskState,
                Description = description,
                CurrentAddress = task.CurrentAddress,
                NextAddress = task.NextAddress,
                Roadway = task.Roadway,   //新增执行设备
                RGVTaskType = TaskStateremark,
                TaskStateremark = getstastr,
                RGVTaskTyperemark = getrgvtasktyperema
            };
            BaseDal.AddData(taskExecuteDetail);
        }

        public void AddTaskExecuteDetail(List<int> taskNums, string description = "")
@@ -202,8 +203,9 @@
                    active = steps.IndexOf(TaskState) + 1;

                }

                content = WebResponseContent.Instance.OK(data: new { active, list });
                string curradd = task.CurrentAddress;
                string nextadd = task.NextAddress;
                content = WebResponseContent.Instance.OK(data: new { active, list,curradd, nextadd });
            }
            catch (Exception ex)
            {
@@ -256,5 +258,48 @@
            }
            return content;
        }





        /// <summary>
        /// ä»»åŠ¡ç±»åž‹æžšä¸¾
        /// </summary>
        public string GetEnumDescription(int enumValue)
        {
            var enumType = typeof(TaskInStatusEnum);
            var field = enumType.GetFields()
                               .FirstOrDefault(f => f.FieldType == enumType &&
                                                   (int)f.GetValue(null) == enumValue);

            if (field != null)
            {
                var descriptionAttribute = field.GetCustomAttributes(typeof(DescriptionAttribute), false)
                                              .FirstOrDefault() as DescriptionAttribute;

                return descriptionAttribute?.Description ?? field.Name;
            }

            return string.Empty;
        }

        public string GetEnumDescription2(int enumValue)
        {
            var enumType = typeof(RGVTaskTypeEnum);
            var field = enumType.GetFields()
                               .FirstOrDefault(f => f.FieldType == enumType &&
                                                   (int)f.GetValue(null) == enumValue);

            if (field != null)
            {
                var descriptionAttribute = field.GetCustomAttributes(typeof(DescriptionAttribute), false)
                                              .FirstOrDefault() as DescriptionAttribute;

                return descriptionAttribute?.Description ?? field.Name;
            }

            return string.Empty;
        }
    }
}

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -256,8 +256,6 @@
                }
                task.RGVTaskType = RGvtype;
                bool updatesta = BaseDal.UpdateData(task);
                string Meesgt = $"目标地址：{task.CurrentAddress},任务类型：{rwlx}，修改状态：{updatesta}";
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, Meesgt);

                content = WebResponseContent.Instance.OK();
            }
@@ -294,7 +292,7 @@
                task.ExceptionMessage = message;
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "更新任务异常："+task.ExceptionMessage);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -352,7 +350,14 @@
                task.Modifier = "System";
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"人工手动将任务状态从【{oldState}】跳转到【{task.TaskState}】" : $"系统自动流程，任务状态从【{oldState}】转到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? 
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】" 
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -402,7 +407,9 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{task.TaskState}】");
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -427,7 +434,20 @@
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                int oldState = task.TaskState;
                Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                Dt_TaskExecuteDetail taskExecuteDetail = null;
                
                if (task.CurrentAddress == "1061")
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                }
                else
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });

                }
                
                

                if (taskExecuteDetail != null)
                {
                    task.TaskState = taskExecuteDetail.TaskState;
@@ -443,7 +463,13 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工将任务状态从【{oldState}】回滚到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
                    $"人工手动将任务状态从【{oldstaterem}】回归到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -515,7 +541,7 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent UpdateTaskStatus(int taskNum)
        public WebResponseContent UpdateTaskStatus(int taskNum, int Completetype)
        {
            WebResponseContent content = new WebResponseContent();

@@ -543,10 +569,19 @@
                task.ExceptionMessage = string.Empty;
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(
                    task.TaskId,
                    $"自动任务状态从【{oldState}】进入到【{task.TaskState}】"
                );
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】"
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");


                if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish && Completetype==2)   //入库任务完成
                {
                    CompletedManually(task.TaskId, Completetype);
                }

                return WebResponseContent.Instance.OK();
            }
@@ -1075,7 +1110,13 @@
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id)
        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å®Œæˆ
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id, int CompletionType)
        {

            var db = BaseDal.Db as SqlSugarClient;
@@ -1087,6 +1128,8 @@

                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                string Remark = CompletionType == 1 ? "人工手动完成" : "自动完成";


                var res = _task_HtyService.AddData(new Dt_Task_hty
                {
@@ -1101,38 +1144,33 @@
                    NextAddress = dt_task.NextAddress,
                    WMSId = dt_task.WMSId,
                    Dispatchertime = dt_task.Dispatchertime,
                    Remark = "人工手动完成",
                    Remark = Remark,
                    Creater = App.User.UserName,
                    CreateDate = DateTime.Now,
                    RGVTaskType = dt_task.RGVTaskType,
                    RGVCurrentexecution = dt_task.RGVCurrentexecution
                });

                int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_task.TaskState}】"
);

                if (res.Status == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("手动完成失败！");
                    return WebResponseContent.Instance.Error($"{Remark}失败！");
                }

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) { 
                if (deletetask == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！"); 
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！");
                }
                db.Ado.CommitTran();
                return WebResponseContent.Instance.OK("手动完成成功！");
                return WebResponseContent.Instance.OK($"{Remark}成功！");

            }
            catch (Exception ex)
            {
                db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error("手动完成失败！");
                return WebResponseContent.Instance.Error("任务完成失败！");
            }
        }

@@ -1186,11 +1224,11 @@
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("取消任务失败！");
                }
                int oldState = dt_task.TaskState;
                /*int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);
);*/

                bool deletetask = BaseDal.DeleteData(dt_task);
                if (!deletetask) {
@@ -1258,8 +1296,10 @@
                case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
                    //出库状态
                    //调取完成接口
                    responseContent = UpdateTaskStatus(task.TaskNum);
                    responseContent = UpdateTaskStatus(task.TaskNum, 1);
                    break;
                case (int)TaskInStatusEnum.RGV_InMothercarFinish:
                    return WebResponseContent.Instance.Error("任务已");
                default:
                    return WebResponseContent.Instance.Error("任务状态错误，执行下一步失败");
            }

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs

@@ -69,7 +69,7 @@
                    //读取设备完成信息
                    if (getStackerObject.StaclerkJobJobStatusValue == RgvJobCraneStatus.Completed && getStackerObject.CurrentRgvtaskid != 0)
                    {
                        _taskService.UpdateTaskStatus(getStackerObject.CurrentRgvtaskid);
                        _taskService.UpdateTaskStatus(getStackerObject.CurrentRgvtaskid,2);
                    }


@@ -302,8 +302,6 @@
        {
            RgvCraneTaskCommand standardCommands = ConvertMotherCarTaskCommand(RGVAdders);
            bool sendFlag = SendCommand2(standardCommands, ChildPosiDeviceCode);
            _taskExecuteDetailService.AddTaskExecuteDetail(taskid, $"系统自动流程，执行母车移动任务，母车编号：{ChildPosiDeviceCode}，移动地址：{RGVAdders}，是否下发成功：{sendFlag}");

            return sendFlag;
        }


 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_BasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_DTO.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_DTO.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_IBasicInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ISystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ISystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Model.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Model.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_SystemRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_SystemServices.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_SystemServices.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll

Binary files differ

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb

Binary files differ