From cbfc5ac3c45eff75e912ba6aeaad83533a1a4296 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期二, 07 四月 2026 16:16:22 +0800
Subject: [PATCH] fix: 修复机器人任务信息等bug
---
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs | 22 ++
Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs | 17 +
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocolDetail.vue | 2
Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs | 2
Code/WCS/WIDESEAWCS_Client/src/views/Index.vue | 40 ++--
Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/robotTask.vue | 262 +++++++++++++++++++++++++++++
Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue | 100 +++++-----
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue | 2
Code/WCS/WIDESEAWCS_Client/src/router/viewGird.js | 4
Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue | 6
Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/robotTask.js | 69 +++++++
11 files changed, 451 insertions(+), 75 deletions(-)
diff --git a/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/robotTask.js b/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/robotTask.js
new file mode 100644
index 0000000..642855b
--- /dev/null
+++ b/Code/WCS/WIDESEAWCS_Client/src/extension/taskinfo/robotTask.js
@@ -0,0 +1,69 @@
+// 璇ユ墿灞曟枃浠剁敤浜庝换鍔″巻鍙查〉闈㈢殑涓氬姟鎵╁睍銆�
+// 鏂规硶鐩殑锛氱粺涓�棰勭暀鍒楄〃鏌ヨ銆佷繚瀛樺墠鍚庡拰寮圭獥鎵撳紑鏃剁殑鎵╁睍鍏ュ彛锛屼繚鎸佷笌椤圭洰鍐� task 椤甸潰涓�鑷寸殑鎵╁睍鐐广��
+// 鍙傛暟鍚箟锛氱敱妗嗘灦鎸夌敓鍛藉懆鏈熶紶鍏ワ紝鍖呭惈鏌ヨ鍙傛暟銆佽〃鍗曟暟鎹�佽鏁版嵁绛変笂涓嬫枃銆�
+// 杩斿洖鍊艰鏄庯細杩斿洖 true 浠ｈ〃缁х画榛樿琛屼负锛岃繑鍥� false 浠ｈ〃涓柇榛樿琛屼负銆�
+// 寮傚父澶勭悊璇存槑锛氬綋鍓嶆湭寮曞叆澶栭儴璋冪敤锛涜嫢鍚庣画鏂板鎺ュ彛璋冪敤锛岄渶鍦ㄦ柟娉曞唴琛ュ厖 try-catch 骞惰褰曞叧閿笟鍔″弬鏁般��
+
+let extension = {
+ components: {
+ gridHeader: "",
+ gridBody: "",
+ gridFooter: "",
+ modelHeader: "",
+ modelBody: "",
+ modelFooter: "",
+ },
+ tableAction: "",
+ buttons: { view: [], box: [], detail: [] },
+ methods: {
+ // 鏂规硶鐩殑锛氶〉闈㈠垵濮嬪寲鏃舵墽琛岃嚜瀹氫箟閫昏緫銆�
+ // 鍙傛暟锛氭棤銆�
+ // 杩斿洖鍊硷細鏃犮��
+ onInit() {},
+
+ // 鏂规硶鐩殑锛氶〉闈㈠垵濮嬪寲瀹屾垚鍚庢墽琛岃嚜瀹氫箟閫昏緫銆�
+ // 鍙傛暟锛氭棤銆�
+ // 杩斿洖鍊硷細鏃犮��
+ onInited() {},
+
+ // 鏂规硶鐩殑锛氭煡璇㈠墠澶勭悊鏌ヨ鏉′欢銆�
+ // 鍙傛暟锛歱aram 鏌ヨ鍙傛暟瀵硅薄銆�
+ // 杩斿洖鍊硷細true 缁х画鏌ヨ锛宖alse 缁堟鏌ヨ銆�
+ searchBefore(param) {
+ return true;
+ },
+
+ // 鏂规硶鐩殑锛氭煡璇㈠悗澶勭悊杩斿洖缁撴灉銆�
+ // 鍙傛暟锛歳esult 鍚庣杩斿洖鏁版嵁銆�
+ // 杩斿洖鍊硷細true 缁х画娓叉煋锛宖alse 缁堟鍚庣画澶勭悊銆�
+ searchAfter(result) {
+ return true;
+ },
+
+ // 鏂规硶鐩殑锛氭柊澧炲墠鏍￠獙鎴栬ˉ鍏呮彁浜ゅ瓧娈点��
+ // 鍙傛暟锛歠ormData 琛ㄥ崟鎻愪氦瀵硅薄銆�
+ // 杩斿洖鍊硷細true 缁х画鎻愪氦锛宖alse 缁堟鎻愪氦銆�
+ addBefore(formData) {
+ return true;
+ },
+
+ // 鏂规硶鐩殑锛氱紪杈戝墠鏍￠獙鎴栬ˉ鍏呮彁浜ゅ瓧娈点��
+ // 鍙傛暟锛歠ormData 琛ㄥ崟鎻愪氦瀵硅薄銆�
+ // 杩斿洖鍊硷細true 缁х画鎻愪氦锛宖alse 缁堟鎻愪氦銆�
+ updateBefore(formData) {
+ return true;
+ },
+
+ // 鏂规硶鐩殑锛氱偣鍑昏鏃舵墿灞曞鐞嗐��
+ // 鍙傛暟锛歳ow 琛屾暟鎹紝column 鍒楅厤缃紝event 鍘熷浜嬩欢銆�
+ // 杩斿洖鍊硷細鏃犮��
+ rowClick({ row, column, event }) {},
+
+ // 鏂规硶鐩殑锛氱紪杈戝脊绐楁墦寮�鍚庢墽琛屾墿灞曢�昏緫銆�
+ // 鍙傛暟锛歳ow 褰撳墠琛屾暟鎹��
+ // 杩斿洖鍊硷細鏃犮��
+ modelOpenAfter(row) {},
+ },
+};
+
+export default extension;
diff --git a/Code/WCS/WIDESEAWCS_Client/src/router/viewGird.js b/Code/WCS/WIDESEAWCS_Client/src/router/viewGird.js
index 9ad5891..584bb6c 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/router/viewGird.js
+++ b/Code/WCS/WIDESEAWCS_Client/src/router/viewGird.js
@@ -63,6 +63,10 @@
path: '/scheduler',
name: 'scheduler',
component: () => import('@/views/quartzJob/scheduler.vue')
+ },{
+ path: '/robotTask',
+ name: 'robotTask',
+ component: () => import('@/views/taskinfo/robotTask.vue')
},
{
path: '/task',
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/Index.vue b/Code/WCS/WIDESEAWCS_Client/src/views/Index.vue
index 94e55a7..87753e2 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/Index.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/Index.vue
@@ -501,26 +501,26 @@
}, 0);
const defaultMenus = [
- {
- id: maxId + 1001,
- name: "绉熸埛绠＄悊",
- url: "/Sys_Tenant",
- parentId: 0,
- icon: "el-icon-office-building",
- enable: 1,
- tableName: "Sys_Tenant",
- permission: ["Search", "Add", "Update", "Delete"],
- },
- {
- id: maxId + 1002,
- name: "浠诲姟鍘嗗彶",
- url: "/taskHty",
- parentId: 0,
- icon: "el-icon-time",
- enable: 1,
- tableName: "taskHty",
- permission: ["Search", "Export"],
- },
+ // {
+ // id: maxId + 1001,
+ // name: "绉熸埛绠＄悊",
+ // url: "/Sys_Tenant",
+ // parentId: 0,
+ // icon: "el-icon-office-building",
+ // enable: 1,
+ // tableName: "Sys_Tenant",
+ // permission: ["Search", "Add", "Update", "Delete"],
+ // },
+ // {
+ // id: maxId + 1002,
+ // name: "浠诲姟鍘嗗彶",
+ // url: "/taskHty",
+ // parentId: 0,
+ // icon: "el-icon-time",
+ // enable: 1,
+ // tableName: "taskHty",
+ // permission: ["Search", "Export"],
+ // },
{
id: maxId + 1003,
name: "璋冨害鎺у埗",
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
index 48bb529..0d044e9 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceInfo.vue
@@ -129,7 +129,7 @@
field: "deviceCode",
title: "璁惧缂栧彿",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocolDetail.vue b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocolDetail.vue
index 6dd1be7..cff0406 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocolDetail.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/deviceProtocolDetail.vue
@@ -116,7 +116,7 @@
field: "deviceType",
title: "璁惧绫诲瀷",
type: "string",
- width: 180,
+ width: 120,
align: "left",
bind: { key: "deviceType", data: [] },
},
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
index 3e88503..094887e 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/quartzJob/dispatchInfo.vue
@@ -142,14 +142,14 @@
field: "name",
title: "浠诲姟鍚嶇О",
type: "string",
- width: 90,
+ width: 120,
align: "left",
},
{
field: "jobGroup",
title: "浠诲姟鍒嗙粍",
type: "string",
- width: 180,
+ width: 120,
align: "left",
bind: { key: "deviceType", data: [] },
},
@@ -164,7 +164,7 @@
field: "className",
title: "浠诲姟鎵�鍦ㄧ被",
type: "int",
- width: 200,
+ width: 220,
align: "left",
},
{
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue b/Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue
index b403132..84602fd 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/system/Sys_Log.vue
@@ -45,36 +45,36 @@
const searchFormOptions = ref([
[
{ title: "璇锋眰鍦板潃", field: "url", type: "like" },
- { title: "鐢ㄦ埛IP", field: "userIP", type: "like" },
- { title: "鏈嶅姟鍣↖P", field: "serviceIP", type: "like" },
+ { title: "璇锋眰鍙傛暟", field: "requestParam", type: "like" },
+ { title: "鍝嶅簲鍙傛暟", field: "responseParam", type: "like" },
],
[
{ title: "寮�濮嬫椂闂�", field: "beginDate", type: "datetime" },
- {
- dataKey: "restatus",
- data: [],
- title: "鍝嶅簲鐘舵��",
- field: "success",
- type: "selectList",
- },
- {
- dataKey: "roles",
- data: [],
- title: "瑙掕壊ID",
- field: "role_Id",
- type: "select",
- },
+ // {
+ // dataKey: "restatus",
+ // data: [],
+ // title: "鍝嶅簲鐘舵��",
+ // field: "success",
+ // type: "selectList",
+ // },
+ // {
+ // dataKey: "roles",
+ // data: [],
+ // title: "瑙掕壊ID",
+ // field: "role_Id",
+ // type: "select",
+ // },
],
- [
- {
- dataKey: "log",
- data: [],
- title: "鏃ュ織绫诲瀷",
- field: "logType",
- colSize: 12,
- type: "checkbox",
- },
- ],
+ // [
+ // {
+ // dataKey: "log",
+ // data: [],
+ // title: "鏃ュ織绫诲瀷",
+ // field: "logType",
+ // colSize: 12,
+ // type: "checkbox",
+ // },
+ // ],
]);
const columns = ref([
{
@@ -91,7 +91,7 @@
field: "beginDate",
title: "寮�濮嬫椂闂�",
type: "datetime",
- width: 140,
+ width: 120,
align: "left",
sortable: true,
},
@@ -99,51 +99,51 @@
field: "userName",
title: "鐢ㄦ埛鍚嶇О",
type: "string",
- width: 90,
+ width: 60,
align: "left",
},
{
field: "url",
title: "璇锋眰鍦板潃",
type: "string",
- width: 110,
+ width: 150,
align: "left",
},
- {
- field: "logType",
- title: "鏃ュ織绫诲瀷",
- type: "string",
- bind: { key: "log", data: [] },
- width: 80,
- align: "left",
- },
- {
- field: "success",
- title: "鍝嶅簲鐘舵��",
- type: "int",
- bind: { key: "restatus", data: [] },
- width: 80,
- align: "left",
- },
+ // {
+ // field: "logType",
+ // title: "鏃ュ織绫诲瀷",
+ // type: "string",
+ // bind: { key: "log", data: [] },
+ // width: 80,
+ // align: "left",
+ // },
+ // {
+ // field: "success",
+ // title: "鍝嶅簲鐘舵��",
+ // type: "int",
+ // bind: { key: "restatus", data: [] },
+ // width: 80,
+ // align: "left",
+ // },
{
field: "elapsedTime",
title: "鏃堕暱",
type: "int",
- width: 60,
+ width: 50,
align: "left",
},
{
- field: "requestParameter",
+ field: "requestParam",
title: "璇锋眰鍙傛暟",
type: "string",
- width: 70,
+ width: 120,
align: "left",
},
{
- field: "responseParameter",
+ field: "responseParam",
title: "鍝嶅簲鍙傛暟",
type: "string",
- width: 70,
+ width: 120,
align: "left",
},
{
diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/robotTask.vue b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/robotTask.vue
new file mode 100644
index 0000000..4d39a38
--- /dev/null
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/robotTask.vue
@@ -0,0 +1,262 @@
+<template>
+ <view-grid
+ ref="grid"
+ :columns="columns"
+ :detail="detail"
+ :editFormFields="editFormFields"
+ :editFormOptions="editFormOptions"
+ :searchFormFields="searchFormFields"
+ :searchFormOptions="searchFormOptions"
+ :table="table"
+ :extend="extend"
+ >
+ </view-grid>
+</template>
+
+<script>
+import extend from "@/extension/taskinfo/robotTask.js";
+import { ref, defineComponent } from "vue";
+
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: "robotTaskId", // 涓婚敭瀛楁鍚�
+ footer: "Foots",
+ cnName: "鏈哄櫒浜轰换鍔′俊鎭�", // 涓枃鍚嶇О
+ name: "robotTask", // 琛ㄥ悕
+ url: "/robotTask/", // API璺緞
+ sortName: "createDate", // 榛樿鎺掑簭瀛楁
+ });
+
+ // 缂栬緫琛ㄥ崟瀛楁锛堝垵濮嬩负绌猴紝鏍规嵁瀹為檯缂栬緫闇�姹傞厤缃級
+ const editFormFields = ref({});
+ const editFormOptions = ref([]);
+
+ // 鎼滅储琛ㄥ崟瀛楁
+ const searchFormFields = ref({
+ robotTaskNum: "",
+ robotRoadway: "",
+ robotTaskType: "",
+ robotTaskState: "",
+ robotSourceAddress: "",
+ robotTargetAddress: "",
+ creater: "",
+ createDate: "",
+ });
+
+ // 鎼滅储琛ㄥ崟閰嶇疆
+ const searchFormOptions = ref([
+ [
+ { title: "浠诲姟缂栧彿", field: "robotTaskNum", type: "int" },
+ { title: "宸烽亾", field: "robotRoadway", type: "like" },
+ {
+ title: "浠诲姟绫诲瀷",
+ field: "robotTaskType",
+ type: "selectList",
+ dataKey: "taskType",
+ data: [],
+ },
+ {
+ title: "浠诲姟鐘舵��",
+ field: "robotTaskState",
+ type: "selectList",
+ dataKey: "taskState",
+ data: [],
+ },
+ ],
+ [
+ { title: "鏉ユ簮鍦板潃", field: "robotSourceAddress", type: "like" },
+ { title: "鐩爣鍦板潃", field: "robotTargetAddress", type: "like" },
+ { title: "鍒涘缓浜�", field: "creater", type: "like" },
+ { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+ ],
+ ]);
+
+ // 鍒楅厤缃�
+ const columns = ref([
+ {
+ field: "robotTaskId",
+ title: "浠诲姟ID",
+ type: "int",
+ width: 90,
+ hidden: true, // 闅愯棌涓婚敭
+ readonly: true,
+ require: true,
+ align: "left",
+ },
+ {
+ field: "robotTaskNum",
+ title: "浠诲姟缂栧彿",
+ type: "int",
+ width: 100,
+ align: "left",
+ sortable: true, // 鍙帓搴�
+ },
+ {
+ field: "robotRoadway",
+ title: "宸烽亾",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "robotTaskType",
+ title: "浠诲姟绫诲瀷",
+ type: "int",
+ width: 100,
+ align: "left",
+ bind: { key: "taskType", data: [] },
+ },
+ {
+ field: "robotTaskState",
+ title: "浠诲姟鐘舵��",
+ type: "int",
+ width: 120,
+ align: "left",
+ bind: { key: "taskState", data: [] },
+ },
+ {
+ field: "robotTaskTotalNum",
+ title: "浠诲姟鎬绘暟",
+ type: "int",
+ width: 90,
+ align: "left",
+ },
+ {
+ field: "robotSourceAddress",
+ title: "鏉ユ簮鍦板潃",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "robotTargetAddress",
+ title: "鐩爣鍦板潃",
+ type: "string",
+ width: 120,
+ align: "left",
+ },
+ {
+ field: "robotSourceAddressLineCode",
+ title: "鏉ユ簮绾夸唬鐮�",
+ type: "string",
+ width: 130,
+ align: "left",
+ },
+ {
+ field: "robotTargetAddressLineCode",
+ title: "鐩爣绾夸唬鐮�",
+ type: "string",
+ width: 130,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "robotSourceAddressPalletCode",
+ title: "鏉ユ簮鎵樼洏浠ｇ爜",
+ type: "string",
+ width: 130,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "robotTargetAddressPalletCode",
+ title: "鐩爣鎵樼洏浠ｇ爜",
+ type: "string",
+ width: 130,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "robotExceptionMessage",
+ title: "寮傚父淇℃伅",
+ type: "string",
+ width: 200,
+ align: "left",
+ hidden: true,
+ overflow: "ellipsis",
+ },
+ {
+ field: "robotGrade",
+ title: "浼樺厛绾�",
+ type: "int",
+ width: 80,
+ align: "left",
+ bind: {
+ key: "robotGrade",
+ data: [
+ { id: 1, name: "浣�" },
+ { id: 2, name: "鏅��" },
+ { id: 3, name: "楂�" },
+ { id: 4, name: "绱ф��" },
+ ],
+ },
+ },
+ {
+ field: "robotDispatchertime",
+ title: "璋冨害鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ {
+ field: "robotremark",
+ title: "澶囨敞",
+ type: "string",
+ width: 150,
+ align: "left",
+ hidden: true,
+ },
+ {
+ field: "creater",
+ title: "鍒涘缓浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "createDate",
+ title: "鍒涘缓鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ sortable: true,
+ },
+ {
+ field: "modifier",
+ title: "淇敼浜�",
+ type: "string",
+ width: 100,
+ align: "left",
+ },
+ {
+ field: "modifyDate",
+ title: "淇敼鏃堕棿",
+ type: "datetime",
+ width: 160,
+ align: "left",
+ },
+ ]);
+
+ // 璇︽儏寮圭獥閰嶇疆锛堝闇�鏌ョ湅璇︽儏鍔熻兘锛�
+ const detail = ref({
+ cnName: "鏈哄櫒浜轰换鍔¤鎯�",
+ table: "robotTask",
+ key: "robotTaskId",
+ sortName: "CreateDate",
+ columns: columns.value.filter(col => !col.hidden), // 浣跨敤闈為殣钘忓瓧娈�
+ });
+
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
index cb7c013..7296558 100644
--- a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_DictionaryController.cs
@@ -267,6 +267,28 @@
}
#endregion
+ #region RobotTaskTypeEnum
+ {
+ Type type = typeof(RobotTaskTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(RobotTaskTypeEnum)).Cast<int>().ToList();
+ int index = 0;
+ foreach (var item in enums)
+ {
+ FieldInfo? fieldInfo = typeof(RobotTaskTypeEnum).GetField(((RobotTaskTypeEnum)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++;
+ }
+ }
+ #endregion
+
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
diff --git a/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs
new file mode 100644
index 0000000..c35c454
--- /dev/null
+++ b/Code/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/RobotTaskController.cs
@@ -0,0 +1,17 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_ISystemServices;
+using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
+
+namespace WIDESEAWCS_Server.Controllers.Task
+{
+ [Route("api/robotTask")]
+ [ApiController]
+ public class RobotTaskController : ApiBaseController<IRobotTaskService, Dt_RobotTask>
+ {
+ public RobotTaskController(IRobotTaskService service) : base(service)
+ {
+ }
+ }
+}
diff --git a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
index 6425d1b..b054e73 100644
--- a/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
+++ b/Code/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService_AGV.cs
@@ -299,6 +299,8 @@
if (stockInfo != null)
return response.Error($"褰撳墠鎵樼洏{dto.TrayNumber}宸茬粡鍏ュ簱浜�");
+ // 鍒涘缓搴撳瓨鏄庣粏
+
task.TaskType = (int)TaskInboundTypeEnum.Inbound;
task.TaskStatus = (int)TaskInStatusEnum.InNew;
task.CurrentAddress = task.SourceAddress;
--
Gitblit v1.9.3