huanghongfeng
20 小时以前 78d5eca8ea11c60ac88ebf133329fddad7c2aad2
任务
已修改47个文件
已添加5个文件
202 ■■■■■ 文件已修改
代码管理/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/任务接收/2025-09-19/任务重复250919.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/任务接收/2025-09-19/接收兰剑下发任务250919.txt 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/任务接收/2025-09-22/接收兰剑下发任务250922.txt 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Server.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref/WIDESEAWCS_Server.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint/WIDESEAWCS_Server.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 122 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_ITaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_TaskInfoService.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0/WIDESEAWCS_Tasks.pdb 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.dll 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.pdb 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue
@@ -105,6 +105,7 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
export default {
  components: { VolBox },
  data() {
@@ -175,6 +176,7 @@
          if (!x.status) return this.$message.error(x.message);
          this.$message.success("操作成功");
          this.getSteps();
          this.getDetailDatas();
        });
    },
    recovery(){
@@ -188,12 +190,13 @@
          if (!x.status) return this.$message.error(x.message);
          this.$message.success("操作成功");
          this.getSteps();
          this.getDetailDatas();
        });
    },
    next() {
      this.http
        .post(
          "/api/Task/UpdateTaskStatusToNext?taskNum=" + this.row.taskNum,
          "/api/Task/NextStepeXecuted?taskNum=" + this.row.taskNum,
          {},
          true
        )
@@ -201,6 +204,7 @@
          if (!x.status) return this.$message.error(x.message);
          this.$message.success("操作成功");
          this.getSteps();
          this.getDetailDatas();
        });
    },
    switchView() {
@@ -212,6 +216,17 @@
        this.height = "200px";
      }
    },
    getPageData(){
      this.http
        .post(
          "/api/Task/getPageData",
          {},
          true
        )
        .then((x) => {
          console.log('进行刷新')
        });
    },
    tableRowClassName({ row, rowIndex }) {
      if (!row.isNormal) {
        return "error-row";
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js
@@ -157,6 +157,7 @@
                },
                click: (row) => {
                    this.$refs.gridBody.open(row);
                }
            });
            this.maxBtnLength = 11;
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v7.bin
Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v7.bin
Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild/.dtbcache.v2
Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2
Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo
Binary files differ
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs
@@ -82,6 +82,13 @@
        /// <returns></returns>
        WebResponseContent UpdateTaskStatusToNext([NotNull] Dt_Task task);
        /// <summary>
        /// æ‰‹åŠ¨å°†ä»»åŠ¡çŠ¶æ€ä¿®æ”¹ä¸ºä¸‹ä¸€ä¸ªçŠ¶æ€
        /// </summary>
        /// <param name="task"></param>
        /// <returns></returns>
        WebResponseContent NextStepeXecuted(int taskNum);
        /// <summary>
        /// æ¢å¤æŒ‚起任务
´úÂë¹ÜÀí/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/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_Server/Controllers/Task/TaskController.cs
@@ -37,6 +37,12 @@
            return Service.RollbackTaskStatusToLast(taskNum);
        }
        [HttpPost, HttpGet, Route("NextStepeXecuted")]
        public WebResponseContent NextStepeXecuted(int taskNum)
        {
            return Service.NextStepeXecuted(taskNum);
        }
        /// <summary>
        /// æ‰¹é‡æ‰‹åŠ¨å®Œæˆ
        /// </summary>
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/ÈÎÎñ½ÓÊÕ/2025-09-19/ÈÎÎñÖØ¸´250919.txt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
2025/9/19 15:12:32.457
异常任务
"任务号:999重复,兰剑系统下发重复任务!!!"
-------------------------------
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/ÈÎÎñ½ÓÊÕ/2025-09-19/½ÓÊÕÀ¼½£Ï·¢ÈÎÎñ250919.txt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,5 @@
2025/9/19 15:12:21.859
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Log/ÈÎÎñ½ÓÊÕ/2025-09-22/½ÓÊÕÀ¼½£Ï·¢ÈÎÎñ250922.txt
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,35 @@
2025/9/22 9:05:20.259
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 9:10:01.37
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 9:16:44.482
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 9:18:14.699
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 9:22:03.44
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 9:55:03.303
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
2025/9/22 10:08:33.849
成功
"接收到的数据为:{\"data\":[{\"taskNo\":999,\"type\":1,\"containerNo\":\"TEST0003\",\"priority\":10,\"startAddress\":\"1015\",\"endAddress\":\"4\"}]}"
-------------------------------
´úÂë¹ÜÀí/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_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_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
@@ -23,7 +23,7 @@
  //连接字符串
  //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
  //"ConnectionString": "Data Source=.;Initial Catalog=JX_WIDESEAWCS_RGV;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=JX_WIDESEAWCS_RGV;User ID=sa;Password=357753;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  "ConnectionString": "Data Source=.;Initial Catalog=JX_WIDESEAWCS_RGV;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //跨域
  "Cors": {
    "PolicyName": "CorsIpAccess", //策略名称
´úÂë¹ÜÀí/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_TaskInfoService/TaskExecuteDetailService.cs
@@ -173,7 +173,7 @@
                    }
                    else if (!int.TryParse(Enum.Parse<TaskInboundTypeEnum>(TaskType.ToString()).ToString(), out result))
                    {
                        steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().ToList();
                        steps = Enum.GetValues(typeof(TaskInStatusEnum)).Cast<int>().Where(x => x <= (int)TaskInStatusEnum.InPending).ToList();
                        foreach (var item in steps)
                        {
                            object obj;
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -60,6 +60,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;
namespace WIDESEAWCS_TaskInfoService
{
@@ -149,11 +150,14 @@
                        dt_Task.SourceAddress = item.startAddress;
                        dt_Task.TargetAddress = item.endAddress;
                        dt_Task.CurrentAddress = item.startAddress;
                        dt_Task.NextAddress = "0";   //目前暂无
                        dt_Task.NextAddress = "1021";   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;
                        int taskidt= BaseDal.QueryFirst(x=>x.TaskNum== dt_Task.TaskNum).TaskId;
                        _taskExecuteDetailService.AddTaskExecuteDetail(taskidt, $"系统自动流程,创建任务");
                    }
                    else if (item.type == 2)    //出库
                    {
@@ -195,6 +199,8 @@
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;
                        _taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskId,$"系统自动流程,创建任务");
                    }
                    else
                    {
@@ -614,20 +620,42 @@
        private void HandleInboundZichemove(Dt_Task task)
        {
            var route = _routerRepository.QueryFirst(x =>
                x.IsEnd == true &&
                x.ChildPosi == task.NextAddress &&
                x.InOutType == 1
            );
            try
            {
                Dt_Router dt_Router = null;
                task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
                if (task.TargetAddress == "4" || task.TargetAddress == "3")
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.StartPosi == task.NextAddress &&
                    x.InOutType == 1);
                    if (task.CurrentAddress != "1061") task.TaskState = (int)TaskInStatusEnum.RGV_InReleaseFinish;
            if (route == null)
                throw new InvalidOperationException("未找到对应的结束路由");
                }
                else
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.IsEnd == true &&
                    x.ChildPosi == task.NextAddress &&
                    x.InOutType == 1);
                }
            task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
            task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
            task.CurrentAddress = route.StartPosi;
            task.NextAddress = route.NextPosi;
            task.Roadway = route.ChildPosiDeviceCode;
                if (dt_Router == null)
                    throw new InvalidOperationException("未找到对应的结束路由");
                task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
                task.CurrentAddress = dt_Router.StartPosi;
                task.NextAddress = dt_Router.NextPosi;
                task.Roadway = dt_Router.ChildPosiDeviceCode;
            }
            catch (Exception ex)
            {
                throw;
            }
        }
        #endregion
@@ -1124,7 +1152,7 @@
                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                //if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew || dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                /*if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                {
                    if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
@@ -1132,7 +1160,7 @@
                {
                    if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
                }*/
                Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
                {
@@ -1164,8 +1192,8 @@
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);
                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) {
                bool deletetask = BaseDal.DeleteData(dt_task);
                if (!deletetask) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚!");
                }
@@ -1178,5 +1206,65 @@
                return WebResponseContent.Instance.Error("取消任务失败!");
            }
        }
        /// <summary>
        /// ä»»åŠ¡ä¸‹ä¸€æ­¥æ‰§è¡Œ
        /// </summary>
        /// <param name="sCErrorStatus"></param>
        /// <returns></returns>
        public WebResponseContent NextStepeXecuted(int taskid)
        {
            WebResponseContent responseContent = new WebResponseContent();
            Dt_Task task = BaseDal.QueryData().Where(x => x.TaskNum == taskid).FirstOrDefault();
            if (task == null) return WebResponseContent.Instance.Error($"未查询到任务");
            switch (task.TaskState)
            {
                //入库状态
                case (int)TaskInStatusEnum.RGV_InNew:
                case (int)TaskInStatusEnum.RGV_InPickupFinish:
                case (int)TaskInStatusEnum.RGV_InReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZicheFinish:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZichemoveFinish:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.OutNew:
                case (int)TaskOutStatusEnum.RGV_OutMothercarFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish:
                case (int)TaskOutStatusEnum.RGV_OutPickupFinish:
                    //出库状态
                    //调取下发的接口
                    responseContent = UpdateTaskStatusToNext(task);
                    break;
                //入库状态
                case (int)TaskInStatusEnum.RGV_InPickupExecuting:
                case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZichemoveExecuting:
                case (int)TaskInStatusEnum.RGV_InMothercarExecuting:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.RGV_OutMothercarExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting:
                case (int)TaskOutStatusEnum.RGV_OutPickupExecuting:
                case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
                    //出库状态
                    //调取完成接口
                    responseContent = UpdateTaskStatus(task.TaskNum);
                    break;
                default:
                    return WebResponseContent.Instance.Error("任务状态错误,执行下一步失败");
            }
            // åˆ›å»ºå¹¶èµ‹å€¼
            return responseContent;
        }
    }
}
´úÂë¹ÜÀí/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_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/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_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