From 3296ae7c136f405db78c395635e72efa1c0d0125 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 06 八月 2025 12:42:07 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 152 ++-
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 21
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 169 ++-
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs | 15
项目代码/WCS/WIDESEAWCS_Client/src/views/LineInfo.vue | 2
项目代码/WCS/WIDESEAWCS_Client/src/views/LineInfocopy.vue | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml.user | 9
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/OperateTypeEnum.cs | 12
项目代码/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue | 1
项目代码/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationManager.vue | 44
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/IDt_WMSErrorMessageRepository.cs | 26
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PublishOutputs.9e149ac049.txt | 286 ++++++
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs | 45 +
项目代码/WCS/WIDESEAWCS_Client/src/extension/basicinfo/Dt_WMSErrorMessage.js | 58 +
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2 | 0
项目代码/WCS/WIDESEAWCS_Client/config/buttons.js | 4
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs | 481 ++++++-----
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs | 126 +-
项目代码/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue | 2
项目代码/WCS/WIDESEAWCS_Client/src/views/Home.vue | 48
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml | 15
项目代码/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js | 47 +
项目代码/WCS/WIDESEAWCS_Client/src/router/viewGird.js | 5
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs | 1
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/Dt_WMSErrorMessageController.cs | 20
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 25
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_WMSErrorMessageService.cs | 56 +
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_WMSErrorMessageService.cs | 25
项目代码/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_WMSErrorMessage.vue | 64 +
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin | 0
项目代码/WCS/WIDESEAWCS_Client/src/api/http.js | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 483 +++++++++--
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs | 29
项目代码/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin | 0
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_WMSErrorMessage.cs | 60 +
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs | 35
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/Dt_WMSErrorMessageRepository.cs | 29
40 files changed, 1,815 insertions(+), 586 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/config/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/config/buttons.js"
index e8a3296..469499c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/config/buttons.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/config/buttons.js"
@@ -37,7 +37,7 @@
icon: '',
class: '',
value: 'TaskCompleted',
- type: 'primary',
+ type: '',
onClick: function () {
}
},
@@ -46,7 +46,7 @@
icon: '',
class: '',
value: 'TaskCancel',
- type: 'danger',
+ type: '',
onClick: function () {
}
},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/api/http.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/api/http.js"
index 80b0362..7915470 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/api/http.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/api/http.js"
@@ -20,7 +20,7 @@
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://192.168.76.251:9291/';
+ axios.defaults.baseURL = 'http://192.168.32.240:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/basicinfo/Dt_WMSErrorMessage.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/basicinfo/Dt_WMSErrorMessage.js"
new file mode 100644
index 0000000..0c319b9
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/basicinfo/Dt_WMSErrorMessage.js"
@@ -0,0 +1,58 @@
+
+//姝s鏂囦欢鏄敤鏉ヨ嚜瀹氫箟鎵╁睍涓氬姟浠ｇ爜锛屽彲浠ユ墿灞曚竴浜涜嚜瀹氫箟椤甸潰鎴栬�呴噸鏂伴厤缃敓鎴愮殑浠ｇ爜
+
+let extension = {
+ components: {
+ //鏌ヨ鐣岄潰鎵╁睍缁勪欢
+ gridHeader: '',
+ gridBody: '',
+ gridFooter: '',
+ //鏂板缓銆佺紪杈戝脊鍑烘鎵╁睍缁勪欢
+ modelHeader: '',
+ modelBody: '',
+ modelFooter: ''
+ },
+ tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
+ buttons: { view: [], box: [], detail: [] }, //鎵╁睍鐨勬寜閽�
+ methods: {
+ //涓嬮潰杩欎簺鏂规硶鍙互淇濈暀涔熷彲浠ュ垹闄�
+ onInit() {
+ },
+ onInited() {
+ //妗嗘灦鍒濆鍖栭厤缃悗
+ //濡傛灉瑕侀厤缃槑缁嗚〃,鍦ㄦ鏂规硶鎿嶄綔
+ //this.detailOptions.columns.forEach(column=>{ });
+ },
+ searchBefore(param) {
+ //鐣岄潰鏌ヨ鍓�,鍙互缁檖aram.wheres娣诲姞鏌ヨ鍙傛暟
+ //杩斿洖false锛屽垯涓嶄細鎵ц鏌ヨ
+ return true;
+ },
+ searchAfter(result) {
+ //鏌ヨ鍚庯紝result杩斿洖鐨勬煡璇㈡暟鎹�,鍙互鍦ㄦ樉绀哄埌琛ㄦ牸鍓嶅鐞嗚〃鏍肩殑鍊�
+ return true;
+ },
+ addBefore(formData) {
+ //鏂板缓淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛紝鍙互缁欑粰琛ㄥ崟璁剧疆鍊硷紝鑷繁杈撳嚭鐪媐ormData鐨勫��
+ return true;
+ },
+ updateBefore(formData) {
+ //缂栬緫淇濆瓨鍓峟ormData涓哄璞★紝鍖呮嫭鏄庣粏琛ㄣ�佸垹闄よ鐨処d
+ return true;
+ },
+ rowClick({ row, column, event }) {
+ //鏌ヨ鐣岄潰鐐瑰嚮琛屼簨浠�
+ //this.$refs.table.$refs.table.toggleRowSelection(row); //鍗曞嚮琛屾椂閫変腑褰撳墠琛�;
+ },
+ modelOpenAfter(row) {
+ //鐐瑰嚮缂栬緫銆佹柊寤烘寜閽脊鍑烘鍚庯紝鍙互鍦ㄦ澶勫啓閫昏緫锛屽锛屼粠鍚庡彴鑾峰彇鏁版嵁
+ //(1)鍒ゆ柇鏄紪杈戣繕鏄柊寤烘搷浣滐細 this.currentAction=='Add';
+ //(2)缁欏脊鍑烘璁剧疆榛樿鍊�
+ //(3)this.editFormFields.瀛楁='xxx';
+ //濡傛灉闇�瑕佺粰涓嬫媺妗嗚缃粯璁ゅ�硷紝璇烽亶鍘唗his.editFormOptions鎵惧埌瀛楁閰嶇疆瀵瑰簲data灞炴�х殑key鍊�
+ //鐪嬩笉鎳傚氨鎶婅緭鍑虹湅锛歝onsole.log(this.editFormOptions)
+ }
+ }
+ };
+ export default extension;
+
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
index ced7068..379d880 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/extend/taskExecuteDetail.vue"
@@ -193,7 +193,7 @@
next() {
this.http
.post(
- "/api/Task/UpdateTaskStatusToNext?taskNum=" + this.row.taskNum,
+ "/api/Task/HandUpdateTaskStatusToNext?taskNum=" + this.row.taskNum,
{},
true
)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
index 8db2354..58554a2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/extension/taskinfo/task.js"
@@ -43,6 +43,53 @@
}
});
+ var btnTaskComplete = this.buttons.find(x => x.value == "TaskCompleted");
+ if (btnTaskComplete != null) {
+ btnTaskComplete.onClick = () => {
+ let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
+ if (row <= 0) {
+ //濡傛灉娌℃湁閫変腑琛�
+ this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
+ return
+ }
+ let taskNum = row[0].taskNum
+ this.http.post(`/api/Task/TaskComplete?taskNum=${taskNum}`, {}, "姝ｅ湪瀹屾垚浠诲姟")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ this.refresh();
+ }
+ });
+ }
+ }
+
+ var btnTaskCancel = this.buttons.find(x => x.value == "TaskCancel");
+ if (btnTaskCancel != null) {
+ btnTaskCancel.onClick = () => {
+ let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
+ if (row <= 0) {
+ //濡傛灉娌℃湁閫変腑琛�
+ this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
+ return
+ }
+ let taskNum = row[0].taskNum
+ this.http.post(`/api/Task/HandTaskCancel?taskNum=${taskNum}`, {}, "姝ｅ湪鍙栨秷浠诲姟")
+ .then((x) => {
+ if (x.status) {
+ this.$Message.success('鎴愬姛.');
+ this.refresh();
+ } else {
+ return this.$error(x.message);
+ this.refresh();
+ }
+ });
+ }
+ }
+
+
},
onInited() {
//妗嗘灦鍒濆鍖栭厤缃悗
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/router/viewGird.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/router/viewGird.js"
index 9a3f011..051880f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/router/viewGird.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/router/viewGird.js"
@@ -72,6 +72,11 @@
name: 'Dt_StationManager',
component: () => import('@/views/basicinfo/Dt_StationManager.vue')
},
+ {
+ path: '/Dt_WMSErrorMessage',
+ name: 'Dt_WMSErrorMessage',
+ component: () => import('@/views/basicinfo/Dt_WMSErrorMessage.vue')
+ },
]
export default viewgird
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
index 67ec81d..78ebf31 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/Home.vue"
@@ -604,14 +604,14 @@
}, {
equipNo: "2002",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2001",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
@@ -619,14 +619,14 @@
{
equipNo: "2004",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2003",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -663,28 +663,28 @@
}, {
equipNo: "2006",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2005",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2008",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2007",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -721,28 +721,28 @@
}, {
equipNo: "2010",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2009",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2012",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2011",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -779,28 +779,28 @@
}, {
equipNo: "2014",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2013",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2016",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2015",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -837,28 +837,28 @@
}, {
equipNo: "2018",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2017",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2020",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2019",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
@@ -895,28 +895,28 @@
}, {
equipNo: "2022",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2021",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 8,
condition: false,
},
{
equipNo: "2024",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
{
equipNo: "2023",
imgType: "1",
- positionX: 26,
+ positionX: 28,
positionY: 20,
condition: false,
},
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfo.vue"
index 1390ffe..91eeab6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfo.vue"
@@ -48,7 +48,7 @@
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="涓嬩竴鐩爣鍦板潃:">
- <el-input size="large" v-model="form.SourceAddress" placeholder="璇疯緭鍏ヨ捣鐐硅鍒楀眰" />
+ <el-input size="large" v-model="form.TargetAddress" placeholder="璇疯緭鍏ヨ捣鐐硅鍒楀眰" />
</el-form-item>
</el-col>
</el-row>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfocopy.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfocopy.vue"
index 87a9778..28a7853 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfocopy.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/LineInfocopy.vue"
@@ -48,7 +48,7 @@
<el-row :gutter="20" type="flex" justify="start" align="top" tag="div">
<el-col :span="16" :offset="0" :push="0" :pull="0" tag="div">
<el-form-item label="涓嬩竴鐩爣鍦板潃:">
- <el-input size="large" v-model="form.SourceAddress" placeholder="璇疯緭鍏ヨ捣鐐硅鍒楀眰" />
+ <el-input size="large" v-model="form.TargetAddress" placeholder="璇疯緭鍏ヨ捣鐐硅鍒楀眰" />
</el-form-item>
</el-col>
</el-row>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationManager.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationManager.vue"
index 187bb42..20c642a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationManager.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_StationManager.vue"
@@ -16,7 +16,7 @@
export default defineComponent({
setup() {
const table = ref({
- key: 'areaID',
+ key: 'stationID',
footer: "Foots",
cnName: '绔欏彴淇℃伅',
name: 'basicinfo/Dt_StationManager',
@@ -24,10 +24,27 @@
sortName: "AreaCode"
});
const editFormFields = ref({
-
+ stationStatus:"",
+ stationType:"",
+ stationPLC:"",
+ roadway:"",
+ stationChildCode:"",
+ stationArea:"",
+ remark:"",
+ stationRemark:"",
+ stationNextChildCode:"",
+ stationLocation:"",
+ stationFloor:"",
+ rGVName:"",
+ levelPointFist:"",
+ levelPointSecond:""
});
const editFormOptions = ref([
-
+ [
+ { "title": "鐘舵��", "field": "stationStatus",type: "select",dataKey: "deviceStatus",data: [],},
+
+
+ ],
]);
const searchFormFields = ref({});
const searchFormOptions = ref([
@@ -36,29 +53,18 @@
{ "title": "鎵�灞濸LC", "field": "stationPLC", type: "text" },
{ "title": "宸烽亾鍙�", "field": "roadway", type: "text" },
- ],
- [
- { "title": "璁惧鍖哄煙", "field": "stationArea", type: "text" },
- { "title": "MOM璁惧缂栧彿", "field": "stationEquipMOM", type: "text" },
- { "title": "NG瀛愯澶囩紪鍙�", "field": "stationNGChildCode", type: "text" },
-
- ],
- [
- { "title": "NG瀛愯澶囧潗鏍�", "field": "remark", type: "text" },
- { "title": "绾夸綋缂栧彿", "field": "stationChildCode", type: "text" },
- { "title": "浜х嚎", "field": "productLine", type: "text" },
-
]
]);
const columns = ref([{ field: 'stationID', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
{ field: 'stationType', title: '绔欏彴绫诲瀷', type: 'int', sort: true, width: 110, require: true, align: 'left', sort: true },
{ field: 'stationPLC', title: '鎵�灞濸LC', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'roadway', title: '宸烽亾鍙�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'roadway', title: '宸烽亾鍙�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'stationLocation', title: '鍫嗗灈鏈哄嚭鍏ュ簱鍧愭爣', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'stationChildCode', title: '绾夸綋缂栧彿', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'stationArea', title: '璁惧鍖哄煙', type: 'int', sort: true, width: 100, align: 'left' },
- { field: 'remark', title: '澶囨敞', type: 'string', sort: true, width: 110, align: 'left' },
- { field: 'stationRemark', title: '澶囨敞', type: 'int', sort: true, width: 110, align: 'left', },
- { field: 'stationStatus', title: '鐘舵��', type: 'int', sort: true, width: 110, align: 'left', },
+ { field: 'stationNextChildCode', title: '涓嬩竴绔欏彴', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'stationRemark', title: '宸ヤ綅', type: 'int', sort: true, width: 110, align: 'left', },
+ { field: 'stationStatus', title: '鐘舵��', type: 'int', sort: true, width: 110, align: 'left', bind: { key: "deviceStatus", data: [] }, },
{ field: 'creater', title: '鍒涘缓浜�', type: 'string', sort: true, width: 110, align: 'left' },
{ field: 'createDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
{ field: 'modifier', title: '淇敼浜�', type: 'string', sort: true, width: 100, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_WMSErrorMessage.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_WMSErrorMessage.vue"
new file mode 100644
index 0000000..606134b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/basicinfo/Dt_WMSErrorMessage.vue"
@@ -0,0 +1,64 @@
+<!--
+*Author锛歫xx
+ *Contact锛�283591387@qq.com
+ *浠ｇ爜鐢辨鏋剁敓鎴�,浠讳綍鏇存敼閮藉彲鑳藉鑷磋浠ｇ爜鐢熸垚鍣ㄨ鐩�
+ *涓氬姟璇峰湪@/extension/widesea_wms/basicinfo/Dt_AreaInfo.js姝ゅ缂栧啓
+ -->
+<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/basicinfo/Dt_WMSErrorMessage.js";
+import { ref, defineComponent } from "vue";
+export default defineComponent({
+ setup() {
+ const table = ref({
+ key: 'id',
+ footer: "Foots",
+ cnName: 'WMS寮傚父淇℃伅',
+ name: 'basicinfo/Dt_WMSErrorMessage',
+ url: "/Dt_WMSErrorMessage/",
+ sortName: "AreaCode"
+ });
+ const editFormFields = ref({
+
+ });
+ const editFormOptions = ref([
+
+ ]);
+ const searchFormFields = ref({});
+ const searchFormOptions = ref([
+ [
+ { "title": "鎵樼洏鍙�", "field": "palletCode", type: "text" },
+ ]
+ ]);
+ const columns = ref([{ field: 'id', title: '涓婚敭', type: 'int', sort: true, hidden: true, width: 110, readonly: true, require: true, align: 'left' },
+ { field: 'taskNum', title: '浠诲姟鍙�', type: 'int', sort: true, width: 110, require: true, align: 'left', sort: true },
+ { field: 'palletCode', title: '鎵樼洏鍙�', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'errorMessage', title: '寮傚父淇℃伅', type: 'string', sort: true, width: 110, align: 'left' },
+ { field: 'CreateDate', title: '鍒涘缓鏃堕棿', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
+
+ ]);
+ const detail = ref({
+ cnName: "#detailCnName",
+ table: "#detailTable",
+ columns: [],
+ sortName: "",
+ key: ""
+ });
+ return {
+ table,
+ extend,
+ editFormFields,
+ editFormOptions,
+ searchFormFields,
+ searchFormOptions,
+ columns,
+ detail,
+ };
+ },
+});
+</script>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
index 3fcb653..ca8b5fa 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/taskinfo/task_hty.vue"
@@ -74,6 +74,7 @@
{ field: "grade", title: "浼樺厛绾�", type: "int", width: 80, align: "left", },
{ field: "rgvName", title: "RGV鍚嶇О", type: "string", width: 100, align: "left", },
{ field: "dispatchertime", title: "浠诲姟涓嬪彂鏃堕棿", type: "datetime", width: 150, align: "left", },
+ { field: "operateType", title: "鎿嶄綔绫诲瀷", type: "string", width: 100, align: "left",bind: { key: "operateTypeEnum", data: [] } },
{ field: "wMSId", title: "WMS浠诲姟涓婚敭", type: "int", width: 120, align: "left", hidden: true, },
{ field: "creater", title: "鍒涘缓浜�", type: "string", width: 90, align: "left", },
{ field: "createDate", title: "鍒涘缓鏃堕棿", type: "datetime", width: 150, align: "left", },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin"
index f835c92..7c29816 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.metadata.v9.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin"
index a93ada5..555e5d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.projects.v9.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin"
index b33c359..eaf609b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/ProjectEvaluation/wideseawcs_server.strings.v9.bin"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
index 1a2a3bf..25d0254 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.futdcache.v2"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
index e8d0e4a..6e93d8e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/.suo"
Binary files differ
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
index 1620644..24ed8af 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json"
@@ -3,20 +3,12 @@
"WorkspaceRootPath": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|solutionrelative:wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -27,12 +19,28 @@
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob\\commonrgvjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|solutionrelative:wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\basicinfo\\dt_wmserrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\basicinfo\\dt_wmserrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\basicinfo\\dt_stationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\basicinfo\\dt_stationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\stackercranejob\\commonstackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|solutionrelative:wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -42,7 +50,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 2,
"Children": [
{
"$type": "Bookmark",
@@ -54,106 +62,129 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
- "Title": "DeviceInfoService.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "RelativeToolTip": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "ViewState": "AgIAAO4CAAAAAAAAAAA9wEAEAAAYAAAAAAAAAA==",
+ "DocumentIndex": 0,
+ "Title": "RequestInbound.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "ViewState": "AgIAAKUAAAAAAAAAAAAUwJsAAABWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-31T01:13:44.444Z",
+ "WhenOpened": "2025-08-06T01:22:38.368Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 6,
+ "Title": "Dt_WMSErrorMessage.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "ViewState": "AgIAADIAAAAAAAAAAAAQwDkAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-08-04T04:04:34.858Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 4,
"Title": "TaskService.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAABMCAAAAAAAAAAAhwCMCAAAdAAAAAAAAAA==",
+ "ViewState": "AgIAACEDAAAAAAAAAAAswPoCAABIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-31T01:00:10.426Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 1,
"Title": "CommonRGV_FirstFloorJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
- "ViewState": "AgIAAKMBAAAAAAAAAAAxwLkBAAALAQAAAAAAAA==",
+ "ViewState": "AgIAAIsCAAAAAAAAAAAYwJ8CAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-30T09:52:26.156Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
- "Title": "CommonConveyorLineJob.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ViewState": "AgIAAMIAAAAAAAAAAAAUwNUAAAAxAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-24T03:47:03.579Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 8,
"Title": "CommonStackerCraneJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "ViewState": "AgIAAL4AAAAAAAAAAAAAwMsAAAA+AAAAAAAAAA==",
+ "ViewState": "AgIAAMgAAAAAAAAAAAAQwNoAAABYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-24T03:54:34.335Z",
- "EditorCaption": ""
+ "WhenOpened": "2025-07-24T03:54:34.335Z"
},
{
"$type": "Document",
- "DocumentIndex": 6,
- "Title": "RequestInbound.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ViewState": "AgIAAEkAAAAAAAAAAAAAwFgAAAAOAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-24T04:21:01.123Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 3,
"Title": "CommonRGVJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
- "ViewState": "AgIAAAQBAAAAAAAAAADwv/sAAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAKkAAAAAAAAAAAAQwLsAAABlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-28T04:13:17.74Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
- "Title": "ITaskService.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "RelativeToolTip": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "ViewState": "AgIAAHwAAAAAAAAAAIA7wJcAAABBAAAAAAAAAA==",
+ "DocumentIndex": 2,
+ "Title": "CommonConveyorLineJob.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "ViewState": "AgIAAKkAAAAAAAAAAAAUwA4BAAB8AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-31T04:54:23.912Z",
+ "WhenOpened": "2025-07-24T03:47:03.579Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "Title": "Dt_StationManager.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-08-04T04:04:50.26Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 5,
+ "Title": "TaskController.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "ViewState": "AgIAABsAAAAAAAAAAAAcwCoAAAA5AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-08-05T02:40:43.927Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "DeviceInfoService.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "RelativeToolTip": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "ViewState": "AgIAAPMCAAAAAAAAAAAqwAQDAABXAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-31T01:13:44.444Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
index 16f6333..5d90eff 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json"
@@ -3,14 +3,6 @@
"WorkspaceRootPath": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
"AbsoluteMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{6236BFFF-173D-44A8-9FC3-7C001EA30347}|WIDESEAWCS_QuartzJob\\WIDESEAWCS_QuartzJob.csproj|solutionrelative:wideseawcs_quartzjob\\service\\deviceinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
@@ -23,16 +15,32 @@
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\commonconveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\rgvjob\\commonrgvjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob\\commonrgvjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|solutionrelative:wideseawcs_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\conveyorlinejob\\task\\requestinbound.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7279A2AE-8D1F-4E66-A73A-01AF7927A336}|WIDESEAWCS_ITaskInfoService\\WIDESEAWCS_ITaskInfoService.csproj|solutionrelative:wideseawcs_itaskinfoservice\\itaskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob_firstfloor\\commonrgv_firstfloorjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\rgvjob\\commonrgvjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\rgvjob\\commonrgvjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\controllers\\task\\taskcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\basicinfo\\dt_wmserrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\basicinfo\\dt_wmserrormessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|e:\\get\\aotansiwcs\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_model\\models\\basicinfo\\dt_stationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7F200FE8-CAF6-4131-BD25-8D438FE0ABAC}|WIDESEAWCS_Model\\WIDESEAWCS_Model.csproj|solutionrelative:wideseawcs_model\\models\\basicinfo\\dt_stationmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
}
],
"DocumentGroupContainers": [
@@ -42,7 +50,7 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 4,
+ "SelectedChildIndex": 7,
"Children": [
{
"$type": "Bookmark",
@@ -54,106 +62,130 @@
},
{
"$type": "Document",
- "DocumentIndex": 2,
- "Title": "DeviceInfoService.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "RelativeToolTip": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
- "ViewState": "AgIAAO4CAAAAAAAAAAA9wEAEAAAYAAAAAAAAAA==",
+ "DocumentIndex": 4,
+ "Title": "RequestInbound.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
+ "ViewState": "AgIAAKUAAAAAAAAAAAAUwJsAAABWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-31T01:13:44.444Z",
+ "WhenOpened": "2025-08-06T01:22:38.368Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 3,
"Title": "TaskService.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAABMCAAAAAAAAAAAhwCMCAAAdAAAAAAAAAA==",
+ "ViewState": "AgIAACwBAAAAAAAAAAAAAEQBAAAyAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-31T01:00:10.426Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 5,
"Title": "CommonRGV_FirstFloorJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs*",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs*",
- "ViewState": "AgIAALkCAAAAAAAAAAAAANEAAAAgAAAAAAAAAA==",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\RGVJob_FirstFloor\\CommonRGV_FirstFloorJob.cs",
+ "ViewState": "AgIAAIsCAAAAAAAAAAAYwJ8CAAAlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-30T09:52:26.156Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 4,
- "Title": "CommonConveyorLineJob.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
- "ViewState": "AgIAAMIAAAAAAAAAAAAUwNUAAAAxAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-24T03:47:03.579Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "CommonStackerCraneJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\StackerCraneJob\\CommonStackerCraneJob.cs",
- "ViewState": "AgIAAL4AAAAAAAAAAAAAwMsAAAA+AAAAAAAAAA==",
+ "ViewState": "AgIAAJYBAAAAAAAAAAAAAI4BAABhAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-24T03:54:34.335Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 6,
- "Title": "RequestInbound.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\Task\\RequestInbound.cs",
- "ViewState": "AgIAAEkAAAAAAAAAAAAAwFgAAAAOAAAAAAAAAA==",
+ "DocumentIndex": 2,
+ "Title": "CommonConveyorLineJob.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "RelativeToolTip": "WIDESEAWCS_Tasks\\ConveyorLineJob\\CommonConveyorLineJob.cs",
+ "ViewState": "AgIAAK4AAAAAAAAAAAAUwMEAAAAWAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-24T04:21:01.123Z",
+ "WhenOpened": "2025-07-24T03:47:03.579Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 5,
+ "DocumentIndex": 0,
+ "Title": "DeviceInfoService.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "RelativeToolTip": "WIDESEAWCS_QuartzJob\\Service\\DeviceInfoService.cs",
+ "ViewState": "AgIAADwAAAAAAAAAAAAIwEcAAAAIAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-07-31T01:13:44.444Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 6,
"Title": "CommonRGVJob.cs",
"DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\RGVJob\\CommonRGVJob.cs",
- "ViewState": "AgIAAAQBAAAAAAAAAADwv/sAAAAgAAAAAAAAAA==",
+ "ViewState": "AgIAAKkAAAAAAAAAAAAQwLsAAABlAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-07-28T04:13:17.74Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 7,
- "Title": "ITaskService.cs",
- "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "RelativeDocumentMoniker": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "RelativeToolTip": "WIDESEAWCS_ITaskInfoService\\ITaskService.cs",
- "ViewState": "AgIAAHwAAAAAAAAAAIA7wJcAAABBAAAAAAAAAA==",
+ "DocumentIndex": 8,
+ "Title": "Dt_WMSErrorMessage.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_WMSErrorMessage.cs",
+ "ViewState": "AgIAADIAAAAAAAAAAAAQwDkAAAAAAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-07-31T04:54:23.912Z",
+ "WhenOpened": "2025-08-04T04:04:34.858Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 9,
+ "Title": "Dt_StationManager.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "RelativeToolTip": "WIDESEAWCS_Model\\Models\\BasicInfo\\Dt_StationManager.cs",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABgAAAAvAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-08-04T04:04:50.26Z"
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 7,
+ "Title": "TaskController.cs",
+ "DocumentMoniker": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "RelativeDocumentMoniker": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "ToolTip": "E:\\GET\\AoTanSiWCS\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "RelativeToolTip": "WIDESEAWCS_Server\\Controllers\\Task\\TaskController.cs",
+ "ViewState": "AgIAABsAAAAAAAAAAAAcwCoAAAA5AAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2025-08-05T02:40:43.927Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/Dt_WMSErrorMessageRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/Dt_WMSErrorMessageRepository.cs"
new file mode 100644
index 0000000..ba5177a
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/Dt_WMSErrorMessageRepository.cs"
@@ -0,0 +1,29 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoRepository
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_Model.BasicInfo;
+
+namespace WIDESEAWCS_BasicInfoRepository
+{
+ public class Dt_WMSErrorMessageRepository : RepositoryBase<Dt_WMSErrorMessage>, IDt_WMSErrorMessageRepository
+ {
+ public Dt_WMSErrorMessageRepository(IUnitOfWorkManage unitOfWorkManage) : base(unitOfWorkManage)
+ {
+ }
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_WMSErrorMessageService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_WMSErrorMessageService.cs"
new file mode 100644
index 0000000..0c1874f
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Dt_WMSErrorMessageService.cs"
@@ -0,0 +1,56 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_TaskInfoService
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using AutoMapper;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using NetTaste;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using SqlSugar;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Core.Enums;
+using WIDESEAWCS_DTO.Enum;
+using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_IBasicInfoService;
+using WIDESEAWCS_Model.BasicInfo;
+
+namespace WIDESEAWCS_BasicInfoService
+{
+ public class Dt_WMSErrorMessageService : ServiceBase<Dt_WMSErrorMessage, IDt_WMSErrorMessageRepository>, IDt_WMSErrorMessageService
+ {
+ public Dt_WMSErrorMessageService(IDt_WMSErrorMessageRepository BaseDal) : base(BaseDal)
+ {
+
+ }
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/OperateTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/OperateTypeEnum.cs"
index 67925e8..9b048a8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/OperateTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/OperateTypeEnum.cs"
@@ -10,6 +10,12 @@
public enum OperateTypeEnum
{
/// <summary>
+ /// 鏁版嵁搴撴搷浣�
+ /// </summary>
+ [Description("鏁版嵁搴撴搷浣�")]
+ 鏁版嵁搴撴搷浣� = 0,
+
+ /// <summary>
/// 浜哄伐鍒犻櫎
/// </summary>
[Description("浜哄伐鍒犻櫎")]
@@ -50,5 +56,11 @@
/// </summary>
[Description("WMS鍙栨秷")]
WMS鍙栨秷 = 7,
+
+ /// <summary>
+ /// WCS浜哄伐鍙栨秷
+ /// </summary>
+ [Description("WCS浜哄伐鍙栨秷")]
+ WCS浜哄伐鍙栨秷 = 7,
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/IDt_WMSErrorMessageRepository.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/IDt_WMSErrorMessageRepository.cs"
new file mode 100644
index 0000000..8a10333
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/IDt_WMSErrorMessageRepository.cs"
@@ -0,0 +1,26 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_ITaskInfoRepository
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+using WIDESEAWCS_Core.BaseRepository;
+using WIDESEAWCS_Model.BasicInfo;
+
+namespace WIDESEAWCS_IBasicInfoRepository
+{
+ public interface IDt_WMSErrorMessageRepository : IRepository<Dt_WMSErrorMessage>
+ {
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_WMSErrorMessageService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_WMSErrorMessageService.cs"
new file mode 100644
index 0000000..425714b
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_WMSErrorMessageService.cs"
@@ -0,0 +1,25 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_ITaskInfoService
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_Model.BasicInfo;
+
+namespace WIDESEAWCS_IBasicInfoService
+{
+ public interface IDt_WMSErrorMessageService : IService<Dt_WMSErrorMessage>
+ {
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs"
index c2f8e3b..210d039 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskExecuteDetailService.cs"
@@ -29,6 +29,7 @@
public interface ITaskExecuteDetailService : IService<Dt_TaskExecuteDetail>
{
void AddTaskExecuteDetail(int taskId, string description = "");
+ void AddTaskExecuteDetailS(int taskNum, string description = "");
WebResponseContent GetDetailInfo(int taskNum);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
index d51cf4c..a08a5df 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs"
@@ -76,6 +76,20 @@
WebResponseContent TaskCancel(WMSTaskDTO taskDTO);
/// <summary>
+ /// 浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskDTO"></param>
+ /// <returns></returns>
+ WebResponseContent TaskCancel(int taskNum);
+
+ /// <summary>
+ /// 浠诲姟鎵嬪姩瀹屾垚
+ /// </summary>
+ /// <param name="taskId"></param>
+ /// <returns></returns>
+ WebResponseContent TaskComplete(int taskNum);
+
+ /// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
@@ -159,6 +173,11 @@
/// <param name="message">寮傚父淇℃伅</param>
WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message);
+ /// <summary>
+ /// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
+ WebResponseContent HandUpdateTaskStatusToNext(int taskNum);
/// <summary>
/// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
@@ -200,8 +219,6 @@
/// <param name="taskNum">浠诲姟鍙�</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
WebResponseContent RollbackTaskStatusToLast(int taskNum);
- WebResponseContent TaskComplete();
- WebResponseContent RequestTask();
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_WMSErrorMessage.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_WMSErrorMessage.cs"
new file mode 100644
index 0000000..01e92f6
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_WMSErrorMessage.cs"
@@ -0,0 +1,60 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_Model.Models.TaskInfo
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using WIDESEAWCS_Core.DB.Models;
+
+namespace WIDESEAWCS_Model.BasicInfo
+{
+ [SugarTable(nameof(Dt_WMSErrorMessage), "WMS寮傚父淇℃伅")]
+ public class Dt_WMSErrorMessage: BaseEntity
+ {
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int ID { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ [ImporterHeader(Name = "浠诲姟鍙�")]
+ [ExporterHeader(DisplayName = "浠诲姟鍙�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�")]
+ public int TaskNum { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ [ImporterHeader(Name = "鎵樼洏鍙�")]
+ [ExporterHeader(DisplayName = "鎵樼洏鍙�")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏鍙�")]
+ public string PalletCode { get; set; }
+
+ /// <summary>
+ /// 寮傚父淇℃伅
+ /// </summary>
+ [ImporterHeader(Name = "寮傚父淇℃伅")]
+ [ExporterHeader(DisplayName = "寮傚父淇℃伅")]
+ [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "寮傚父淇℃伅")]
+ public string ErrorMessage { get; set; }
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
index cb98ede..328e0b2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceInfoService.cs"
@@ -90,8 +90,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -102,8 +102,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -117,8 +117,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -128,8 +128,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -143,8 +143,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -155,8 +155,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -170,8 +170,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(0);
stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(0);
@@ -193,8 +193,8 @@
stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(0);
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -205,8 +205,10 @@
{
return content.Error("鏈壘鍒颁换鍔″懡浠�");
}
+
StackerSendCommand(stackerCraneTaskCommand, stackerhand.DeviceCode);
- return content;
+
+ return content.OK("鍛戒护涓嬪彂鎴愬姛锛�");
}
catch (Exception ex)
{
@@ -225,7 +227,7 @@
{
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)device;
- commonStackerCrane.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(2));
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkType, Convert.ToSByte(2));
return content.OK();
}
else
@@ -250,7 +252,7 @@
{
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)device;
- commonStackerCrane.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(2));
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkType, Convert.ToSByte(2));
return content.OK();
}
else
@@ -282,7 +284,7 @@
commonStackerCrane.SetValue(StackerCraneDBName.StartColumn, command.StartColumn);
Thread.Sleep(100);
- commonStackerCrane.SetValue(StackerCraneDBName.StartColumn, command.StartLayer);
+ commonStackerCrane.SetValue(StackerCraneDBName.StartLayer, command.StartLayer);
Thread.Sleep(100);
commonStackerCrane.SetValue(StackerCraneDBName.EndRow, command.EndRow);
@@ -292,11 +294,11 @@
Thread.Sleep(100);
commonStackerCrane.SetValue(StackerCraneDBName.EndLayer, command.EndLayer);
Thread.Sleep(100);
- commonStackerCrane.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(command.WorkType));
+ commonStackerCrane.SetValue(StackerCraneDBName.WorkType, Convert.ToSByte(command.WorkType));
}
else
{
- throw new Exception("璇峰湪鍫嗗灈鏈鸿仈鏈烘ā寮忋�佸緟鏈虹姸鎬併�佹棤鏁呴殰鐨勬儏鍐典笅涓嬪彂浠诲姟");
+ throw new Exception($"璇峰湪{commonStackerCrane.DeviceName}鑱旀満妯″紡銆佸緟鏈虹姸鎬併�佹棤鏁呴殰鐨勬儏鍐典笅涓嬪彂浠诲姟");
}
}
else
@@ -554,6 +556,12 @@
if (device != null)
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
+ short x = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, stationManager.stationChildCode);
+ var structs = BitConverter.GetBytes(x).ToArray().ToBoolArray();
+ if (!structs[2])
+ {
+ return content.Error($"璇峰湪{stationManager.stationChildCode}杈撻�佺嚎灏辩华鎯呭喌涓嬩笅鍙戝懡浠�");
+ }
//鍏ュ簱
if (ConveyorLinehand.TaskType == "1")
{
@@ -763,227 +771,241 @@
if (RGVhand.DeviceCode == "RGV01" || RGVhand.DeviceCode == "RGV02")
{
CommonRGV_FirstFloor RGVcommand = (CommonRGV_FirstFloor)device;
- if (RGVhand.TaskType == "1")
+ if (RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Automatic) && !RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Fault) && !RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Running))
{
- if (RGVhand.SourceAddress != null)
+ if (RGVhand.TaskType == "1")
{
- RGVTaskCommand command = new RGVTaskCommand()
+ if (RGVhand.SourceAddress != null)
{
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栧畾浣嶅懡浠や笅鍙戞垚鍔�");
- }
- else
- {
- return content.Error($"{device.DeviceName}鍙栧畾浣嶅懡浠ゅ彇璐т綅涓嶈兘涓虹┖");
- }
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鍙栧畾浣嶅懡浠ゅ彇璐т綅涓嶈兘涓虹┖");
+ }
- }
- else if (RGVhand.TaskType == "2")
- {
- if (RGVhand.TargetAddress != null)
+ }
+ else if (RGVhand.TaskType == "2")
{
- RGVTaskCommand command = new RGVTaskCommand()
+ if (RGVhand.TargetAddress != null)
{
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鏀惧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鏀惧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鏀惧畾浣嶅懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ }
+ }
+ else if (RGVhand.TaskType == "3")
+ {
+ if (RGVhand.SourceAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栬揣鍛戒护涓嬪彂鎴愬姛");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鍙栬揣鍛戒护鍙栬揣浣嶄笉鑳戒负绌�");
+ }
+ }
+ else if (RGVhand.TaskType == "4")
+ {
+ if (RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鏀捐揣鍛戒护涓嬪彂鎴愬姛");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鏀捐揣鍛戒护鏀捐揣浣嶄笉鑳戒负绌�");
+ }
+ }
+ else if (RGVhand.TaskType == "5")
+ {
+ if (RGVhand.TargetAddress != null && RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栨斁璐у懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鍙栨斁璐у懡浠ゆ斁璐т綅鍜屽彇璐т綅涓嶈兘涓虹┖");
+ }
+ }
+ else if (RGVhand.TaskType == "6")
+ {
+ if (RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(4),
+ };
+ SendCommandFirstFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}閫�鍛戒护涓嬪彂鎴愬姛");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}閫�鍥炲懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ }
}
else
{
- return content.Error($"{device.DeviceName}鏀惧畾浣嶅懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
- }
- }
- else if (RGVhand.TaskType == "3")
- {
- if (RGVhand.SourceAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栬揣鍛戒护涓嬪彂鎴愬姛");
- }
- else
- {
- return content.Error($"{device.DeviceName}鍙栬揣鍛戒护鍙栬揣浣嶄笉鑳戒负绌�");
- }
- }
- else if (RGVhand.TaskType == "4")
- {
- if (RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鏀捐揣鍛戒护涓嬪彂鎴愬姛");
- }
- else
- {
- return content.Error($"{device.DeviceName}鏀捐揣鍛戒护鏀捐揣浣嶄笉鑳戒负绌�");
- }
- }
- else if (RGVhand.TaskType == "5")
- {
- if (RGVhand.TargetAddress != null && RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栨斁璐у懡浠や笅鍙戞垚鍔�");
- }
- else
- {
- return content.Error($"{device.DeviceName}鍙栨斁璐у懡浠ゆ斁璐т綅鍜屽彇璐т綅涓嶈兘涓虹┖");
- }
- }
- else if (RGVhand.TaskType == "6")
- {
- if (RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(4),
- };
- SendCommandFirstFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}閫�鍛戒护涓嬪彂鎴愬姛");
- }
- else
- {
- return content.Error($"{device.DeviceName}閫�鍥炲懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ return content.Error($"{device.DeviceName}鏈煡浠诲姟鍛戒护");
}
}
else
{
- return content.Error($"{device.DeviceName}鏈煡浠诲姟鍛戒护");
+ return content.Error($"璇峰湪鑱旀満妯″紡銆佹棤鏁呴殰銆佸緟鏈虹姸鎬佹椂鍐嶄笅鍙憑RGVcommand.DeviceName}鍛戒护");
}
}
else
{
CommonRGV RGVcommand = (CommonRGV)device;
- if (RGVhand.TaskType == "1")
+ if (RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Automatic) && !RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Fault) && !RGVcommand.GetValue<RGVDBName, bool>(RGVDBName.Running))
{
- if (RGVhand.SourceAddress != null)
+ if (RGVhand.TaskType == "1")
{
- RGVTaskCommand command = new RGVTaskCommand()
+ if (RGVhand.SourceAddress != null)
{
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栧畾浣嶅懡浠や笅鍙戞垚鍔�");
- }
- else
- {
- return content.Error($"{device.DeviceName}鍙栧畾浣嶅懡浠ゅ彇璐т綅涓嶈兘涓虹┖");
- }
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鍙栧畾浣嶅懡浠ゅ彇璐т綅涓嶈兘涓虹┖");
+ }
- }
- else if (RGVhand.TaskType == "2")
- {
- if (RGVhand.TargetAddress != null)
+ }
+ else if (RGVhand.TaskType == "2")
{
- RGVTaskCommand command = new RGVTaskCommand()
+ if (RGVhand.TargetAddress != null)
{
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鏀惧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鏀惧畾浣嶅懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鏀惧畾浣嶅懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ }
+ }
+ else if (RGVhand.TaskType == "3")
+ {
+ if (RGVhand.SourceAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栬揣鍛戒护涓嬪彂鎴愬姛");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鍙栬揣鍛戒护鍙栬揣浣嶄笉鑳戒负绌�");
+ }
+ }
+ else if (RGVhand.TaskType == "4")
+ {
+ if (RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鏀捐揣鍛戒护涓嬪彂鎴愬姛");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}鏀捐揣鍛戒护鏀捐揣浣嶄笉鑳戒负绌�");
+ }
+ }
+ else if (RGVhand.TaskType == "5")
+ {
+ if (RGVhand.TargetAddress != null && RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}鍙栨斁璐у懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error("鍙栨斁璐у懡浠ゆ斁璐т綅鍜屽彇璐т綅涓嶈兘涓虹┖");
+ }
+ }
+ else if (RGVhand.TaskType == "6")
+ {
+ if (RGVhand.TargetAddress != null)
+ {
+ RGVTaskCommand command = new RGVTaskCommand()
+ {
+ PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
+ TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
+ };
+ SendCommandSecondFloor(RGVcommand, command);
+ return content.OK($"{device.DeviceName}閫�鍥炲懡浠や笅鍙戞垚鍔�");
+ }
+ else
+ {
+ return content.Error($"{device.DeviceName}閫�鍥炲懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ }
}
else
{
- return content.Error($"{device.DeviceName}鏀惧畾浣嶅懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
- }
- }
- else if (RGVhand.TaskType == "3")
- {
- if (RGVhand.SourceAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栬揣鍛戒护涓嬪彂鎴愬姛");
- }
- else
- {
- return content.Error($"{device.DeviceName}鍙栬揣鍛戒护鍙栬揣浣嶄笉鑳戒负绌�");
- }
- }
- else if (RGVhand.TaskType == "4")
- {
- if (RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鏀捐揣鍛戒护涓嬪彂鎴愬姛");
- }
- else
- {
- return content.Error($"{device.DeviceName}鏀捐揣鍛戒护鏀捐揣浣嶄笉鑳戒负绌�");
- }
- }
- else if (RGVhand.TaskType == "5")
- {
- if (RGVhand.TargetAddress != null && RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PickupLocation = (byte)Convert.ToSByte(RGVhand.SourceAddress),
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}鍙栨斁璐у懡浠や笅鍙戞垚鍔�");
- }
- else
- {
- return content.Error("鍙栨斁璐у懡浠ゆ斁璐т綅鍜屽彇璐т綅涓嶈兘涓虹┖");
- }
- }
- else if (RGVhand.TaskType == "6")
- {
- if (RGVhand.TargetAddress != null)
- {
- RGVTaskCommand command = new RGVTaskCommand()
- {
- PutcargoLocation = (byte)Convert.ToSByte(RGVhand.TargetAddress),
- TaskType = (byte)Convert.ToSByte(RGVhand.TaskType),
- };
- SendCommandSecondFloor(RGVcommand, command);
- return content.OK($"{device.DeviceName}閫�鍥炲懡浠や笅鍙戞垚鍔�");
- }
- else
- {
- return content.Error($"{device.DeviceName}閫�鍥炲懡浠ゆ斁璐т綅涓嶈兘涓虹┖");
+ return content.Error($"{device.DeviceName}鏈煡浠诲姟鍛戒护");
}
}
else
{
- return content.Error($"{device.DeviceName}鏈煡浠诲姟鍛戒护");
+ return content.Error($"璇峰湪鑱旀満妯″紡銆佹棤鏁呴殰銆佸緟鏈虹姸鎬佹椂鍐嶄笅鍙憑RGVcommand.DeviceName}鍛戒护");
}
- }
+ }
}
return content.Error("鏈壘鍒拌澶囦俊鎭鑱旂郴IT");
}
@@ -1004,12 +1026,12 @@
if (DeviceCode == "RGV01" || DeviceCode == "RGV02")
{
CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ commonRGV.SetValue(RGVDBName.TaskType, Convert.ToSByte(9));
}
else
{
CommonRGV commonRGV = (CommonRGV)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(9));
+ commonRGV.SetValue(RGVDBName.TaskType, Convert.ToSByte(9));
}
return content.OK($"{device.DeviceName}澶嶄綅鎴愬姛");
}
@@ -1088,15 +1110,21 @@
{
CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;
DeviceProDTO? devicePro = commonRGV.DeviceProDTOs.Where(x => x.DeviceChildCode == commonRGV.DeviceCode && x.DeviceProParamName == "TaskType").FirstOrDefault();
- byte[] byt = Encoding.UTF8.GetBytes("08");
- commonRGV.Communicator.Write(devicePro.DeviceProAddress, byt);
+ //byte[] byt = Encoding.UTF8.GetBytes("08");
+ byte valueToWrite = 8;
+
+ byte[] buffer = new byte[] { valueToWrite };
+
+ commonRGV.Communicator.Write(devicePro.DeviceProAddress, buffer);
}
else
{
CommonRGV commonRGV = (CommonRGV)device;
DeviceProDTO? devicePro = commonRGV.DeviceProDTOs.Where(x => x.DeviceChildCode == commonRGV.DeviceCode && x.DeviceProParamName == "TaskType").FirstOrDefault();
- byte[] byt = Encoding.UTF8.GetBytes("8");
- commonRGV.Communicator.Write(devicePro.DeviceProAddress, byt);
+ byte valueToWrite = 8;
+
+ byte[] buffer = new byte[] { valueToWrite };
+ commonRGV.Communicator.Write(devicePro.DeviceProAddress, buffer);
}
return content.OK($"{device.DeviceName}鍒濆鍖栨垚鍔�");
}
@@ -1194,6 +1222,25 @@
#endregion <Public Menber>
}
+ public enum RGVDBName
+ {
+ SendTask,
+ Automatic,
+ WorkCompleted,
+ Running,
+ Fault,
+ InStock,
+ RGVTargetAddress,
+ RGVTaskNum,
+ PickupLocation,
+ PutcargoLocation,
+ TaskType,
+ TaskNum,
+ LevelPoint,
+ CurrentTaskNum,
+ RGVAlarm,
+ }
+
#endregion
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/Dt_WMSErrorMessageController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/Dt_WMSErrorMessageController.cs"
new file mode 100644
index 0000000..a5b5af3
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/BasicInfo/Dt_WMSErrorMessageController.cs"
@@ -0,0 +1,20 @@
+锘縰sing Microsoft.AspNetCore.Mvc;
+using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_IBasicInfoService;
+using WIDESEAWCS_Model.BasicInfo;
+
+namespace WIDESEAWCS_Server.Controllers.BasicInfo
+{
+ [Route("api/Dt_WMSErrorMessage")]
+ [ApiController]
+ public class Dt_WMSErrorMessageController : ApiBaseController<IDt_WMSErrorMessageService, Dt_WMSErrorMessage>
+ {
+ private readonly IHttpContextAccessor _httpContextAccessor;
+ public Dt_WMSErrorMessageController(IDt_WMSErrorMessageService service, IHttpContextAccessor httpContextAccessor) : base(service)
+ {
+ _httpContextAccessor = httpContextAccessor;
+ }
+
+
+ }
+}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
index b87da56..fe594bd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs"
@@ -39,6 +39,18 @@
return Service.TaskCancel(taskDTOs);
}
+ [HttpPost,HttpGet, Route("HandTaskCancel"), AllowAnonymous]
+ public WebResponseContent TaskCancel(int taskNum)
+ {
+ return Service.TaskCancel(taskNum);
+ }
+
+ [HttpPost,HttpGet, Route("TaskComplete"), AllowAnonymous]
+ public WebResponseContent TaskComplete(int taskNum)
+ {
+ return Service.TaskComplete(taskNum);
+ }
+
[HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
{
@@ -51,6 +63,12 @@
return Service.UpdateTaskStatusToNext(taskNum);
}
+ [HttpPost, HttpGet, Route("HandUpdateTaskStatusToNext")]
+ public WebResponseContent HandUpdateTaskStatusToNext(int taskNum)
+ {
+ return Service.HandUpdateTaskStatusToNext(taskNum);
+ }
+
[HttpPost, HttpGet, Route("TaskStatusRecovery")]
public WebResponseContent TaskStatusRecovery(int taskNum)
{
@@ -61,17 +79,6 @@
public WebResponseContent RollbackTaskStatusToLast(int taskNum)
{
return Service.RollbackTaskStatusToLast(taskNum);
- }
-
- [HttpPost, HttpGet, Route("TaskComplete"), AllowAnonymous]
- public WebResponseContent TaskComplete()
- {
- return Service.TaskComplete();
- }
- [HttpPost, HttpGet, Route("RequestTask"), AllowAnonymous]
- public WebResponseContent RequestTask()
- {
- return Service.RequestTask();
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml"
new file mode 100644
index 0000000..19f43e1
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml"
@@ -0,0 +1,15 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
+<Project>
+ <PropertyGroup>
+ <DeleteExistingFiles>false</DeleteExistingFiles>
+ <ExcludeApp_Data>false</ExcludeApp_Data>
+ <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <PublishProvider>FileSystem</PublishProvider>
+ <PublishUrl>bin\Release\net6.0\publish\</PublishUrl>
+ <WebPublishMethod>FileSystem</WebPublishMethod>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml.user" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml.user"
new file mode 100644
index 0000000..875d1cc
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile2.pubxml.user"
@@ -0,0 +1,9 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<!-- https://go.microsoft.com/fwlink/?LinkID=208121. -->
+<Project>
+ <PropertyGroup>
+ <_PublishTargetUrl>E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl>
+ <History>True|2025-08-06T01:53:47.1995016Z||;True|2025-08-06T09:23:43.4599118+08:00||;True|2025-08-06T09:17:41.5263742+08:00||;True|2025-08-01T13:15:58.0733845+08:00||;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user"
index f1f6968..ef253f8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user"
@@ -1,6 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>E:\GET\JiangXiJiuJiang\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\Properties\PublishProfiles\FolderProfile2.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PublishOutputs.9e149ac049.txt" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PublishOutputs.9e149ac049.txt"
new file mode 100644
index 0000000..6413825
--- /dev/null
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PublishOutputs.9e149ac049.txt"
@@ -0,0 +1,286 @@
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\index.html
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_TaskExecuteDetail.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Dictionary.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_DictionaryList.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Menu.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Role.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_RoleAuth.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_User.tsv
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Server.exe
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\appsettings.Development.json
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\appsettings.json
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Server.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Server.deps.json
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Server.runtimeconfig.json
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Server.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\AngleSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\AngleSharp.Css.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Autofac.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Autofac.Extensions.DependencyInjection.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Autofac.Extras.DynamicProxy.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\AutoMapper.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Ben.Demystifier.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Castle.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\DnsClient.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\DynamicExpresso.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Furion.Extras.ObjectMapper.Mapster.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\HslCommunication.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Humanizer.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Magicodes.IE.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Magicodes.IE.EPPlus.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Magicodes.IE.Excel.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Mapster.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Mapster.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Mapster.DependencyInjection.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Masuit.Tools.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Masuit.Tools.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.AspNetCore.Authentication.JwtBearer.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.AspNetCore.JsonPatch.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.AspNetCore.Razor.Language.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Bcl.AsyncInterfaces.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.CodeAnalysis.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.CodeAnalysis.CSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.CodeAnalysis.CSharp.Workspaces.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.CodeAnalysis.Workspaces.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Data.SqlClient.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Data.Sqlite.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.EntityFrameworkCore.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.EntityFrameworkCore.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Caching.Memory.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Configuration.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Configuration.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Configuration.FileExtensions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Configuration.Json.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.DependencyInjection.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.DependencyModel.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.FileProviders.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.FileProviders.Physical.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.FileSystemGlobbing.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Extensions.Primitives.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Identity.Client.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.JsonWebTokens.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.Logging.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.Protocols.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IdentityModel.Tokens.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.IO.RecyclableMemoryStream.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.OpenApi.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Microsoft.Win32.SystemEvents.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MiniProfiler.AspNetCore.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MiniProfiler.AspNetCore.Mvc.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MiniProfiler.Shared.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MoYu.Pure.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MoYu.Pure.Extras.DependencyModel.CodeAnalysis.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\MySqlConnector.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Newtonsoft.Json.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Newtonsoft.Json.Bson.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Npgsql.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\OfficeOpenXml.Core.ExcelPackage.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Oracle.ManagedDataAccess.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Oscar.Data.SqlClient.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Quartz.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Scrutor.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SharpCompress.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SixLabors.Fonts.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SixLabors.ImageSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SixLabors.ImageSharp.Drawing.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SkiaSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SQLitePCLRaw.batteries_v2.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SQLitePCLRaw.core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SQLitePCLRaw.provider.e_sqlite3.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\SqlSugar.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\DmProvider.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Kdbndp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.Filters.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.Filters.Abstractions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.Newtonsoft.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.Swagger.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.SwaggerGen.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\Swashbuckle.AspNetCore.SwaggerUI.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.CodeDom.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Collections.Immutable.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Composition.AttributedModel.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Composition.Convention.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Composition.Hosting.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Composition.Runtime.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Composition.TypedParts.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Configuration.ConfigurationManager.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Diagnostics.DiagnosticSource.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Diagnostics.PerformanceCounter.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.DirectoryServices.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.DirectoryServices.Protocols.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Drawing.Common.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.IdentityModel.Tokens.Jwt.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.IO.Packaging.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.IO.Pipelines.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.IO.Ports.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Linq.Dynamic.Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Management.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Reflection.Metadata.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Runtime.Caching.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Security.Cryptography.Pkcs.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Security.Cryptography.ProtectedData.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Security.Permissions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Text.Encoding.CodePages.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Text.Encodings.Web.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Text.Json.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Threading.Channels.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\System.Windows.Extensions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ZstdSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hans\Magicodes.IE.Core.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\cs\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\de\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\es\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\fr\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\it\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ja\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ko\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pl\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pt-BR\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ru\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\tr\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hans\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hant\Microsoft.CodeAnalysis.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\cs\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\de\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\es\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\fr\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\it\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ja\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ko\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pl\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ru\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\tr\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\cs\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\de\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\es\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\fr\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\it\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ja\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ko\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pl\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pt-BR\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ru\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\tr\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hans\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hant\Microsoft.CodeAnalysis.CSharp.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\cs\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\de\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\es\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\fr\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\it\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ja\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ko\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pl\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\pt-BR\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\ru\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\tr\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hans\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\zh-Hant\Microsoft.CodeAnalysis.Workspaces.resources.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-arm\native\Microsoft.Data.SqlClient.SNI.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-arm64\native\Microsoft.Data.SqlClient.SNI.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x86\native\Microsoft.Data.SqlClient.SNI.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\Microsoft.Win32.SystemEvents.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm\native\libSystem.IO.Ports.Native.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm64\native\libSystem.IO.Ports.Native.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-x64\native\libSystem.IO.Ports.Native.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx-arm64\native\libSystem.IO.Ports.Native.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx-x64\native\libSystem.IO.Ports.Native.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm\native\libSkiaSharp.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm64\native\libSkiaSharp.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-musl-x64\native\libSkiaSharp.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-x64\native\libSkiaSharp.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx\native\libSkiaSharp.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-arm64\native\libSkiaSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x64\native\libSkiaSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x86\native\libSkiaSharp.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-arm64\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-armel\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-mips64\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-musl-arm\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-musl-arm64\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-musl-x64\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-ppc64le\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-s390x\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-x64\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux-x86\native\libe_sqlite3.so
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\maccatalyst-arm64\native\libe_sqlite3.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\maccatalyst-x64\native\libe_sqlite3.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx-arm64\native\libe_sqlite3.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx-x64\native\libe_sqlite3.dylib
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-arm\native\e_sqlite3.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-arm64\native\e_sqlite3.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x64\native\e_sqlite3.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win-x86\native\e_sqlite3.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Diagnostics.PerformanceCounter.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.DirectoryServices.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\linux\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\osx\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\unix\lib\net6.0\System.Drawing.Common.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Drawing.Common.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\unix\lib\net6.0\System.IO.Ports.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.IO.Ports.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Management.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\netstandard2.0\System.Runtime.Caching.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Security.Cryptography.Pkcs.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Text.Encoding.CodePages.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\browser\lib\net6.0\System.Text.Encodings.Web.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\runtimes\win\lib\net6.0\System.Windows.Extensions.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoService.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Common.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Communicator.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Core.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_DTO.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_IBasicInfoRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_IBasicInfoService.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ISystemRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ISystemServices.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ITaskInfoRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ITaskInfoService.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Model.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_QuartzJob.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SignalR.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemServices.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_TaskInfoRepository.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCs_TaskInfoService.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Tasks.dll
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_QuartzJob.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SignalR.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemServices.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCs_TaskInfoService.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Tasks.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoRepository.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_BasicInfoService.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Common.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Communicator.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Core.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_DTO.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_IBasicInfoService.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ISystemRepository.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ISystemServices.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_ITaskInfoService.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_Model.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_SystemRepository.pdb
+E:\GET\AoTanSiWCS\椤圭洰浠ｇ爜\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Release\net6.0\PubTmp\Out\WIDESEAWCS_TaskInfoRepository.pdb
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
index 945eb64..89c68ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskExecuteDetailService.cs"
@@ -85,6 +85,51 @@
}
}
+ public void AddTaskExecuteDetailS(int taskNum, string description = "")
+ {
+ try
+ {
+ bool isNormal = true;
+ Dt_Task task = _taskRepository.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return;
+ int NewtaskNum = task.TaskNum;
+ int taskState = task.TaskState;
+
+ if (!int.TryParse(Enum.Parse<TaskOutStatusEnum>(taskState.ToString()).ToString(), out int result))
+ {
+ if ((int)(TaskOutStatusEnum)result > (int)TaskOutStatusEnum.OutFinish)
+ isNormal = false;
+ }
+ else if (!int.TryParse(Enum.Parse<TaskInStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(TaskInStatusEnum)result > (int)TaskInStatusEnum.InFinish)
+ isNormal = false;
+ }
+ else if (!int.TryParse(Enum.Parse<AGVTaskStatusEnum>(taskState.ToString()).ToString(), out result))
+ {
+ if ((int)(AGVTaskStatusEnum)result > (int)AGVTaskStatusEnum.AGVFinish)
+ isNormal = false;
+ }
+ Dt_TaskExecuteDetail taskExecuteDetail = new()
+ {
+ IsManual = App.User.UserId > 0,
+ IsNormal = isNormal,
+ TaskNum = NewtaskNum,
+ TaskId = task.TaskId,
+ TaskState = taskState,
+ Description = description,
+ CurrentAddress = task.CurrentAddress,
+ NextAddress = task.NextAddress,
+ };
+ BaseDal.AddData(taskExecuteDetail);
+
+ }
+ catch (Exception ex)
+ {
+
+ }
+ }
+
public void AddTaskExecuteDetail(List<int> taskNums, string description = "")
{
try
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 955d7d3..1465b4e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -46,6 +46,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_TaskInfoRepository;
+using static WIDESEAWCS_QuartzJob.Service.DeviceInfoService;
namespace WIDESEAWCS_TaskInfoService
{
@@ -60,6 +61,7 @@
private readonly IMapper _mapper;
private readonly IDeviceInfoRepository _deviceInfoRepository;
private readonly IDt_StationManagerRepository _stationManagerRepository;
+ private readonly IDt_WMSErrorMessageRepository _errorMessageRepository;
private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -76,7 +78,7 @@
public List<int> TaskRelocationboundTypes => typeof(TaskRelocationTypeEnum).GetEnumIndexList();
public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService taskHtyService, ISys_ConfigService sys_ConfigService, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository taskHtyRepository,
- IDeviceInfoRepository deviceInfoRepository) : base(BaseDal)
+ IDeviceInfoRepository deviceInfoRepository, IDt_WMSErrorMessageRepository errorMessageRepository) : base(BaseDal)
{
_routerService = routerService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -88,6 +90,7 @@
_mapper = mapper;
_sys_ConfigService = sys_ConfigService;
_deviceInfoRepository = deviceInfoRepository;
+ _errorMessageRepository = errorMessageRepository;
}
/// <summary>
@@ -100,7 +103,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- List<Dt_Task> tasks = new List<Dt_Task>();
+ Dt_Task task =null;
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄嚭搴撲换鍔�
if (taskDTOs.TaskType == "2")
{
@@ -111,7 +114,7 @@
{
return content.Error("鏈壘鍒板嚭搴撶珯鍙颁俊鎭�");
}
- Dt_Task taskIn = new Dt_Task()
+ task = new Dt_Task()
{
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "WMS",
@@ -128,12 +131,30 @@
Floor = stationManagerStart.stationFloor,
RGVName = ""
};
- BaseDal.AddData(taskIn);
+ BaseDal.AddData(task);
}
else
{
-
string[] targetCodes = taskDTOs.BeginPoint.Split("-");
+
+ if(GetScCode(Convert.ToInt32(targetCodes[0]))=="SC01"&&(taskDTOs.EndPoint=="1030"|| taskDTOs.EndPoint == "1029"))
+ {
+ return content.Error($"涓�鍙峰爢鍨涙満涓嶈兘鍑哄簱鑷宠鐐逛綅{taskDTOs.EndPoint}");
+ }
+ if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC06" && (taskDTOs.EndPoint == "1002" || taskDTOs.EndPoint == "1004"))
+ {
+ return content.Error($"鍏彿鍫嗗灈鏈轰笉鑳藉嚭搴撹嚦璇ョ偣浣峽taskDTOs.EndPoint}");
+ }
+
+ if (taskDTOs.EndPoint == "3004")
+ {
+ var newTask = BaseDal.QueryFirst(x => x.SourceAddress == "3001" && x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState != (int)TaskInStatusEnum.HoistNew && x.TaskState != (int)TaskInStatusEnum.HoistInExecuting && x.TaskState > 225);
+ if (newTask != null)
+ {
+ return content.Error("宸插瓨鍦ㄥ叆搴撲换鍔★紝鍑哄簱浠诲姟涓嶅彲涓嬪彂");
+ }
+ }
+
Dt_StationManager stationManagerEnd = _stationManagerRepository.QueryFirst(x => x.stationChildCode == taskDTOs.EndPoint);
if (stationManagerEnd == null)
@@ -148,7 +169,7 @@
{
RGVName = stationManager.RGVName;
}
- Dt_Task taskOut = new Dt_Task()
+ task = new Dt_Task()
{
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "WMS",
@@ -167,7 +188,7 @@
TargetStation= stationManagerEnd.remark,
SourceStation= 0,
};
- BaseDal.AddData(taskOut);
+ BaseDal.AddData(task);
}
}
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄叆搴撲换鍔�
@@ -181,7 +202,7 @@
return content.Error("鏈壘鍒板叆搴撶珯鍙颁俊鎭�");
}
string[] targetCodes = taskDTOs.EndPoint.Split("-");
- Dt_Task taskIn = new Dt_Task()
+ task = new Dt_Task()
{
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "WMS",
@@ -198,7 +219,7 @@
Floor = stationManagerStart.stationFloor,
RGVName = "RGV03"
};
- BaseDal.AddData(taskIn);
+ BaseDal.AddData(task);
}
else if (Convert.ToInt32(taskDTOs.BeginPoint) > 1999 && Convert.ToInt32(taskDTOs.BeginPoint) < 3000)
{
@@ -207,7 +228,7 @@
{
return content.Error("鏈壘鍒板嚭搴撶珯鍙颁俊鎭�");
}
- Dt_Task taskIn = new Dt_Task()
+ task = new Dt_Task()
{
TaskNum = BaseDal.GetTaskNo().Result,
Creater = "WMS",
@@ -224,11 +245,23 @@
Floor = stationManagerStart.stationFloor,
RGVName = ""
};
- BaseDal.AddData(taskIn);
+ BaseDal.AddData(task);
}
else
{
- var task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
+ task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
+ string[] targetCodes = taskDTOs.EndPoint.Split("-");
+
+ if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC01" && (taskDTOs.BeginPoint == "1030" || taskDTOs.EndPoint == "1029"))
+ {
+ return content.Error($"璇ョ偣浣峽taskDTOs.EndPoint}涓嶈兘鍏ュ簱涓�鍙峰爢鍨涙満");
+ }
+
+ if (GetScCode(Convert.ToInt32(targetCodes[0])) == "SC06" && (taskDTOs.BeginPoint == "1002" || taskDTOs.BeginPoint == "1004"))
+ {
+ return content.Error($"璇ョ偣浣峽taskDTOs.EndPoint}涓嶈兘鍏ュ簱鍏彿鍫嗗灈鏈�");
+ }
+
if (task != null)
{
task.Creater = "WMS";
@@ -244,8 +277,6 @@
task.WMSTaskNum = taskDTOs.TaskId;
task.TargetAddress = taskDTOs.EndPoint;
-
- string[] targetCodes = taskDTOs.EndPoint.Split("-");
task.Roadway = GetScCode(Convert.ToInt32(targetCodes[0]));
@@ -270,7 +301,7 @@
else if (taskDTOs.TaskType == "3")
{
string[] targetCodes = taskDTOs.BeginPoint.Split("-");
- Dt_Task taskRelocation = new Dt_Task()
+ task = new Dt_Task()
{
TaskType = (int)TaskRelocationTypeEnum.Relocation,
@@ -289,13 +320,80 @@
Grade = 3,
};
- BaseDal.AddData(taskRelocation);
+ BaseDal.AddData(task);
+ }
+ else if (taskDTOs.TaskType == "4")
+ {
+ task = BaseDal.QueryFirst(x => x.PalletCode == taskDTOs.TPbarcode);
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
+ if (stationManager == null)
+ {
+ return content.Error("鏈壘鍒拌捣鐐圭珯鍙�");
+ }
+
+ if (task != null)
+ {
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+
+ BaseDal.DeleteData(task);
+ _taskHtyRepository.AddData(task_Hty);
+ Dt_WMSErrorMessage message = new Dt_WMSErrorMessage()
+ {
+ TaskNum = task.TaskNum,
+ PalletCode=taskDTOs.TPbarcode,
+ ErrorMessage=taskDTOs.EndPoint,
+ CreateDate=DateTime.Now,
+ };
+ _errorMessageRepository.AddData(message);
+ IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == task.RGVName);
+ if (device != null)
+ {
+ if (task.RGVName == "RGV01" || task.RGVName == "RGV02")
+ {
+ CommonRGV_FirstFloor commonRGV = (CommonRGV_FirstFloor)device;
+
+ commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
+ commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
+ commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
+ }
+ else
+ {
+ CommonRGV commonRGV = (CommonRGV)device;
+ commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
+ commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
+ commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
+ }
+ }
+ }
+ else
+ {
+ IDevice? deviceconveyorline = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
+ if (deviceconveyorline != null)
+ {
+ CommonConveyorLine conveyorLine = (CommonConveyorLine)deviceconveyorline;
+
+ conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
+
+ Dt_WMSErrorMessage message = new Dt_WMSErrorMessage()
+ {
+ PalletCode = taskDTOs.TPbarcode,
+ ErrorMessage = taskDTOs.EndPoint,
+ CreateDate = DateTime.Now,
+ };
+ _errorMessageRepository.AddData(message);
+ }
+ }
+ return content.OK();
}
else
{
return content.Error($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵taskDTOs.TaskId}銆�,浠诲姟绫诲瀷:銆恵taskDTOs.TaskType}銆�");
}
- _taskExecuteDetailService.AddTaskExecuteDetail(tasks.Select(x => x.TaskId).ToList(), "鎺ユ敹WMS浠诲姟");
+ _taskExecuteDetailService.AddTaskExecuteDetailS(task.TaskNum, "鎺ユ敹WMS浠诲姟");
content = WebResponseContent.Instance.OK("鎴愬姛");
}
catch (Exception ex)
@@ -640,6 +738,147 @@
/// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
+ public WebResponseContent HandUpdateTaskStatusToNext(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
+ int oldState = task.TaskState;
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();
+
+ task.TaskState = nextStatus;
+
+ if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutFinish)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+ task_Hty.OperateType = (int)OperateTypeEnum.浜哄伐瀹屾垚;
+ BaseDal.DeleteData(task);
+ _taskHtyRepository.AddData(task_Hty);
+
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskId = task.WMSTaskNum,
+ TPbarcode = task.PalletCode,
+ WhCode = "1001",
+ BeginPoint = task.SourceAddress,
+ EndPoint = task.TargetAddress,
+ Results = "1"
+ };
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + requestTask;
+ var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV鍑哄簱瀹屾垚");
+ }
+
+ if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == task.Roadway && x.stationChildCode == task.NextAddress);
+ Dt_StationManager stationManagerend = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.TargetAddress);
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = task.TargetAddress;
+ task.SourceStation = stationManager.stationRemark;
+ task.TargetStation = stationManagerend.remark;
+ }
+
+ if (task.TaskState == (int)TaskOutStatusEnum.SC_OutFinish)
+ {
+ content = StackCraneTaskCompleted(task.TaskNum);
+ return content;
+ }
+ }
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ {
+ int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskInStatusEnum>();
+ task.TaskState = nextStatus;
+
+ if (task.TaskState == (int)TaskInStatusEnum.Line_InFinish)
+ {
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = task.TargetAddress;
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
+ {
+ return content.Error("璇风瓑寰匴MS涓嬪彂鍏ュ簱浠诲姟");
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_InExecutingFinish)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress && x.stationFloor == task.Floor);
+ task.CurrentAddress = task.NextAddress;
+ task.NextAddress = stationManager.stationNextChildCode;
+ task.ModifyDate = DateTime.Now;
+ BaseDal.UpdateData(task);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV鍏ュ簱瀹屾垚");
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.SC_InFinish)
+ {
+ if (App.User.UserId > 0)
+ {
+ content = StackCraneTaskCompleted(task.TaskNum);
+ return content;
+ }
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+ task_Hty.OperateType = (int)OperateTypeEnum.浜哄伐瀹屾垚;
+ BaseDal.DeleteData(task);
+ _taskHtyRepository.AddData(task_Hty);
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish || task.TaskState == (int)TaskInStatusEnum.RGV_InExecutingFinish)
+ {
+ RGVTaskCompleted(task.TaskNum);
+ }
+ }
+ else
+ {
+ throw new Exception($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+ }
+
+ if (task.TaskState <= 0)
+ {
+ return content = WebResponseContent.Instance.Error($"璇ヤ换鍔＄姸鎬佷笉鍙烦杞埌涓嬩竴姝�,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟鐘舵��:銆恵task.TaskState}銆�");
+ }
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+ BaseDal.UpdateData(task);
+
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"浜哄伐鎵嬪姩灏嗕换鍔＄姸鎬佷粠銆恵oldState}銆戣烦杞埌銆恵task.TaskState}銆�" : $"绯荤粺鑷姩娴佺▼锛屼换鍔＄姸鎬佷粠銆恵oldState}銆戣浆鍒般�恵task.TaskState}銆�");
+
+ content = WebResponseContent.Instance.OK();
+
+ return content;
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ /// <summary>
+ /// 灏嗕换鍔＄姸鎬佷慨鏀逛负涓嬩竴涓姸鎬�
+ /// </summary>
+ /// <param name="taskNum">浠诲姟鍙�</param>
public WebResponseContent UpdateTaskStatusToNext(int taskNum)
{
WebResponseContent content = new WebResponseContent();
@@ -675,14 +914,16 @@
if (task.TaskState == (int)TaskOutStatusEnum.RGV_OutFinish)
{
- task.ModifyDate = DateTime.Now;
- task.Modifier = "System";
+ //task.ModifyDate = DateTime.Now;
+ //task.Modifier = "System";
- Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
- task_Hty.TaskId = 0;
+ //Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ //task_Hty.TaskId = 0;
- BaseDal.DeleteData(task);
- _taskHtyRepository.AddData(task_Hty);
+ //BaseDal.DeleteData(task);
+ //_taskHtyRepository.AddData(task_Hty);
+
+ RGVTaskCompleted(task.TaskNum);
}
if (task.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting)
{
@@ -726,6 +967,10 @@
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
+ }
+ else if (task.TaskState == (int)TaskInStatusEnum.InFinish|| task.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
+ {
+ RGVTaskCompleted(task.TaskNum);
}
}
else
@@ -786,9 +1031,6 @@
var wmsIpAddress = wmsBase + requestTask;
var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
-
-
-
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV璋冨害瀹屾垚绛夊緟WMS浠诲姟");
}
else if (task.TaskState == (int)TaskInStatusEnum.RGV_InExecuting)
@@ -806,7 +1048,7 @@
task.TaskState = (int)TaskOutStatusEnum.RGV_OutdispatchFinish;
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
-
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"RGV鍑哄簱璋冨害");
}
else if (task.TaskState == (int)TaskInStatusEnum.InRetuen)
{
@@ -828,7 +1070,7 @@
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
+ task_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
@@ -886,7 +1128,7 @@
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
+ task_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
@@ -951,7 +1193,7 @@
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
+ task_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�");
@@ -1011,6 +1253,128 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "浜哄伐鍙栨秷浠诲姟");
}
content = WebResponseContent.Instance.OK("鍙栨秷浠诲姟鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent TaskCancel(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return content.Error("鏈壘鍒拌浠诲姟淇℃伅");
+
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.OutCancel;
+ }
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ {
+ task.TaskState = (int)TaskInStatusEnum.InCancel;
+ }
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+ {
+ task.TaskState = (int)TaskRelocationStatusEnum.RelocationCancel;
+ }
+ else
+ {
+ return content.Error($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+ }
+ task.ModifyDate = DateTime.Now;
+ BaseDal.DeleteData(task);
+
+ Dt_Task_Hty taskHty = _mapper.Map<Dt_Task_Hty>(task);
+ taskHty.OperateType = (int)OperateTypeEnum.WCS浜哄伐鍙栨秷;
+ _taskHtyRepository.AddData(taskHty);
+
+ #region 涓婃姤WMS鎵ц缁撴灉
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskId = task.WMSTaskNum,
+ TPbarcode = task.PalletCode,
+ WhCode = "1001",
+ BeginPoint = task.SourceAddress,
+ EndPoint = task.TargetAddress,
+ Results = "3"
+ };
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + requestTask;
+ var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+ #endregion
+
+ content = WebResponseContent.Instance.OK("鍙栨秷浠诲姟鎴愬姛");
+ }
+ catch (Exception ex)
+ {
+ content = WebResponseContent.Instance.Error(ex.Message);
+ }
+ return content;
+ }
+
+ public WebResponseContent TaskComplete(int taskNum)
+ {
+ WebResponseContent content = new WebResponseContent();
+ try
+ {
+ var task=BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ if (task == null) return content.Error("鏈壘鍒拌浠诲姟淇℃伅");
+
+ if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
+ {
+ task.TaskState = (int)TaskOutStatusEnum.OutHandFinish;
+ }
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
+ {
+ task.TaskState = (int)TaskInStatusEnum.InHandFinish;
+ }
+ else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
+ {
+ task.TaskState = (int)TaskRelocationStatusEnum.RelocationHandFinish;
+ }
+ else
+ {
+ return content.Error($"浠诲姟绫诲瀷閿欒,鏈壘鍒拌浠诲姟绫诲瀷,浠诲姟鍙�:銆恵task.TaskNum}銆�,浠诲姟绫诲瀷:銆恵task.TaskType}銆�");
+ }
+ task.ModifyDate = DateTime.Now;
+ BaseDal.DeleteData(task);
+
+ Dt_Task_Hty taskHty = _mapper.Map<Dt_Task_Hty>(task);
+ taskHty.OperateType = (int)OperateTypeEnum.浜哄伐瀹屾垚;
+ _taskHtyRepository.AddData(taskHty);
+
+ #region 涓婃姤WMS瀹屾垚
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
+ WMSTaskDTO taskDTO = new WMSTaskDTO()
+ {
+ TaskId = task.WMSTaskNum,
+ TPbarcode = task.PalletCode,
+ WhCode = "1001",
+ BeginPoint = task.SourceAddress,
+ EndPoint = task.TargetAddress,
+ Results = "2"
+ };
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddress = wmsBase + requestTask;
+ var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
+ #endregion
+
+ content = WebResponseContent.Instance.OK("鎵嬪姩瀹屾垚鎴愬姛");
}
catch (Exception ex)
{
@@ -1167,65 +1531,6 @@
((SqlSugarClient)BaseDal.Db).RollbackTran();
return WebResponseContent.Instance.Error(ex.Message);
}
- }
- public WebResponseContent TaskComplete()
- {
- WebResponseContent content = new WebResponseContent();
- //var result = _stationManagerRepository.Db.Queryable<Dt_StationManager>()
- // .Where(t => SqlFunc.Abs(t.LevelPointFist - taskNum) <= 1000)
- // .ToList();
- var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
- var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TaskId="1",
- TPbarcode = "123456",
- WhCode = "1001",
- BeginPoint = "1013",
- EndPoint="1-1-1",
- Results="1"
- };
- if (wmsBase == null || requestTask == null)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddress = wmsBase + requestTask;
- var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
-
- return content.OK(data: result);
- }
-
- public WebResponseContent RequestTask()
- {
- WebResponseContent content = new WebResponseContent();
- //var result = _stationManagerRepository.Db.Queryable<Dt_StationManager>()
- // .Where(t => SqlFunc.Abs(t.LevelPointFist - taskNum) <= 1000)
- // .ToList();
- var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
- var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestTask)?.ConfigValue;
- //var keys = new Dictionary<string, object>()
- //{
- // {"TPbarcode", "123456"},
- // {"WhCode", "1001"},
- // {"BeginPoint", "1013"}
- //};
-
- WMSTaskDTO taskDTO = new WMSTaskDTO()
- {
- TPbarcode = "123456",
- WhCode = "1001",
- BeginPoint = "1013"
- };
- if (wmsBase == null || requestTask == null)
- {
- throw new InvalidOperationException("WMS IP 鏈厤缃�");
- }
- var wmsIpAddress = wmsBase + requestTask;
- var result = WIDESEA_Comm.Http.HttpHelper.PostAsync(wmsIpAddress, taskDTO.ToJsonString()).Result;
-
- return content.OK(data: result);
}
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs"
index 11a1b0c..67756a3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs"
@@ -94,12 +94,19 @@
{
if (stationManager.stationChildCode == "3002")
{
+
+ var newTask = _taskRepository.QueryFirst(x => x.TargetAddress == "3004");
+ if (newTask != null)
+ {
+ return;
+ }
+
DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == stationManager.stationChildCode && x.DeviceProParamName == "ConveyorLineBarcode").FirstOrDefault();
- var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress,10);
+ var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 10);
string Barcode = Encoding.UTF8.GetString(x);
- if (Barcode == null)
+ if (Barcode == null || Barcode==""|| Barcode.Trim().Contains("\0"))
{
conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
}
@@ -146,7 +153,7 @@
var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 10);
string Barcode = Encoding.UTF8.GetString(x);
- if (Barcode == "")
+ if (Barcode == null || Barcode == "" || Barcode.Trim().Contains("\0"))
{
conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
}
@@ -160,7 +167,7 @@
var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestTask)?.ConfigValue;
-
+
WMSTaskDTO taskDTO = new WMSTaskDTO()
{
TPbarcode = Barcode,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs"
index 9bf224f..2c01c08 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs"
@@ -40,6 +40,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
+using WIDESEAWCS_TaskInfoRepository;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_Tasks.RGVJob;
using WIDESEAWCS_Tasks.StackerCraneJob;
@@ -52,6 +53,7 @@
{
private readonly ITaskService _taskService;
private readonly ITaskRepository _taskRepository;
+ private readonly ITask_HtyRepository _task_HtyRepository;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly IRouterService _routerService;
private readonly IDt_StationManagerService _stationManagerService;
@@ -62,7 +64,7 @@
private static List<string>? userTokenIds;
private static List<int>? userIds;
- public CommonRGVJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository,IDt_StationManagerRepository stationManagerRepository)
+ public CommonRGVJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository,IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository task_HtyRepository)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -73,6 +75,7 @@
_noticeService = noticeService;
_taskRepository = taskRepository;
_stationManagerRepository = stationManagerRepository;
+ _task_HtyRepository = task_HtyRepository;
}
public Task Execute(IJobExecutionContext context)
@@ -157,24 +160,10 @@
{
if (commonRGV != null)
{
+ WriteInfo("RGV浠诲姟瀹屾垚", $"{commonRGV.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}");
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
- if (task.TaskState == (int)TaskInStatusEnum.InRetuen)
- {
- Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
- if (stationManager != null)
- {
- IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
- if (device != null)
- {
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
-
- var content = _taskService.RGVTaskCompleted(TaskNum);
- }
- }
- }
if (task.TaskState == (int)TaskInStatusEnum.RGV_Indispatch)
{
if (task.SourceAddress == "3002")
@@ -196,14 +185,20 @@
var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 5);
string Barcode = Encoding.UTF8.GetString(x);
- if (Barcode == null || Barcode == "")
+ if (Barcode == null || Barcode == "" || Barcode.Trim().Contains("\0"))
{
- //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
- task.TaskState = (int)TaskInStatusEnum.InRetuen;
- _taskRepository.UpdateData(task);
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+
+ _taskRepository.DeleteData(task);
+ _task_HtyRepository.AddData(task_Hty);
return;
}
var content = _taskService.RGVTaskCompleted(TaskNum, Barcode);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
index 73bf77f..a04b596 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob_FirstFloor/CommonRGV_FirstFloorJob.cs"
@@ -44,10 +44,10 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
+using WIDESEAWCS_TaskInfoRepository;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_Tasks.RGVJob;
using WIDESEAWCS_Tasks.StackerCraneJob;
-using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
namespace WIDESEAWCS_Tasks
{
@@ -55,6 +55,7 @@
public class CommonRGV_FirstFloorJob : JobBase, IJob
{
private readonly ITaskService _taskService;
+ private readonly ITask_HtyRepository _task_HtyRepository;
private readonly ITaskRepository _taskRepository;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
private readonly IRouterService _routerService;
@@ -66,7 +67,7 @@
private static List<string>? userTokenIds;
private static List<int>? userIds;
- public CommonRGV_FirstFloorJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, WIDESEAWCS_Core.Caches.ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository)
+ public CommonRGV_FirstFloorJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, WIDESEAWCS_Core.Caches.ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository, IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository task_HtyRepository)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
@@ -77,6 +78,7 @@
_noticeService = noticeService;
_taskRepository = taskRepository;
_stationManagerRepository = stationManagerRepository;
+ _task_HtyRepository = task_HtyRepository;
}
public Task Execute(IJobExecutionContext context)
@@ -310,7 +312,7 @@
{
if (commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic) && !commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault))
{
- var taskSecond = _taskRepository.QueryFirst(x => x.RGVName == "RGV02" && x.TaskNum == commonRGVSecond.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum));
+ var taskSecond = _taskRepository.QueryFirst(x => x.RGVName == "RGV02" && x.TaskNum == commonRGVSecond.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum) && ((x.TaskType == (int)TaskInboundTypeEnum.Inbound && x.TaskState < 230) || (x.TaskType == (int)TaskOutboundTypeEnum.Outbound)));
if (taskSecond != null)
{
if (taskSecond.TaskState == (int)TaskOutStatusEnum.RGV_Outdispatch || taskSecond.TaskState == (int)TaskOutStatusEnum.RGV_OutdispatchFinish || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_Indispatch || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_InAwaitWMS || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
@@ -320,6 +322,7 @@
if (task.TargetStation- taskSecond.SourceStation > 1 && task.TargetStation - taskSecond.TargetStation > 1)
{
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -331,6 +334,7 @@
if (task.TargetStation - taskSecond.TargetStation > 1)
{
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -350,6 +354,7 @@
SendCommand(commonRGVSecond, command);
}
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -364,7 +369,7 @@
if (commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic) && !commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault))
{
- var taskSecond = _taskRepository.QueryFirst(x => x.RGVName == "RGV01" && x.TaskNum == commonRGVFirst.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum));
+ var taskSecond = _taskRepository.QueryFirst(x => x.RGVName == "RGV01" && x.TaskNum == commonRGVFirst.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum)&&((x.TaskType==(int)TaskInboundTypeEnum.Inbound&&x.TaskState<230)||(x.TaskType == (int)TaskOutboundTypeEnum.Outbound)));
if (taskSecond != null)
{
@@ -375,6 +380,7 @@
if (taskSecond.SourceStation - task.TargetStation > 1 && taskSecond.TargetStation - task.TargetStation > 1)
{
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -386,6 +392,7 @@
if (taskSecond.TargetStation-task.TargetStation >1 )
{
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -405,6 +412,7 @@
SendCommand(commonRGVFirst, command);
}
LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
}
@@ -441,28 +449,35 @@
{
if (taskSecond.TaskState == (int)TaskOutStatusEnum.RGV_Outdispatch || taskSecond.TaskState == (int)TaskOutStatusEnum.RGV_OutdispatchFinish || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_Indispatch || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_InAwaitWMS || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
{
- //task = tasks.FirstOrDefault(x =>x.SourceStation- taskSecond.TargetStation > 1 && x.TargetStation - taskSecond.SourceStation > 1 && x.SourceStation - taskSecond.SourceStation > 1 && x.TargetStation - taskSecond.TargetStation> 1);
task = tasks.FirstOrDefault(x =>(x.SourceStation- taskSecond.TargetStation > 1 && x.SourceStation - taskSecond.SourceStation > 1&&x.TaskType==(int)TaskInboundTypeEnum.Inbound) ||(x.SourceStation - taskSecond.TargetStation > 1 && x.TargetStation - taskSecond.SourceStation > 1 && x.SourceStation - taskSecond.SourceStation > 1 && x.TargetStation - taskSecond.TargetStation > 1&&x.TaskType== (int)TaskOutboundTypeEnum.Outbound));
+ if (task == null)
+ {
+ task = tasks.FirstOrDefault(x => (x.SourceStation - taskSecond.TargetStation > 1 && x.SourceStation - taskSecond.SourceStation > 1 && x.TaskType == (int)TaskInboundTypeEnum.Inbound) || (x.SourceStation - taskSecond.TargetStation > 1 && x.TargetStation - taskSecond.SourceStation > 1 && x.SourceStation - taskSecond.SourceStation > 1 && x.TargetStation - taskSecond.TargetStation > 1 && x.TaskType == (int)TaskOutboundTypeEnum.Outbound));
+ }
+ LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task.TaskNum)}銆戙��");
-
- LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGV.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
-
-
+ Thread.Sleep(1000);
return task;
}
else if (taskSecond.TaskState == (int)TaskOutStatusEnum.RGV_OutExecuting || taskSecond.TaskState == (int)TaskInStatusEnum.RGV_InExecuting)
{
task = tasks.FirstOrDefault(x => x.SourceStation - taskSecond.TargetStation> 1 &&x.TargetStation - taskSecond.TargetStation > 1);
- LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
-
+ LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGV.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVSecond.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskSecond)}銆憑commonRGVSecond.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task.TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
return null;
}
else
{
+ var taskNews = tasks.Where(x => (x.TaskType == (int)TaskInboundTypeEnum.Inbound && Convert.ToInt32(x.SourceAddress) < 1015) || (x.TaskType == (int)TaskOutboundTypeEnum.Outbound && (x.Roadway == "SC01" || x.Roadway == "SC02" || x.Roadway == "SC03"))).ToList();
+ if (taskNews.Count== 0)
+ {
+ return null;
+ }
+
if (commonRGVSecond.GetValue<RGVDBName, int>(RGVDBName.LevelPoint) > 35000)
{
RGVTaskCommand command = new RGVTaskCommand()
@@ -475,13 +490,15 @@
}
if (tasks.FirstOrDefault(x => x.RGVName == "RGV01") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01"))}銆戙��");
- return tasks.FirstOrDefault(x => x.RGVName == "RGV01");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
+ return taskNews.FirstOrDefault(x => x.RGVName == "RGV01");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02"))}銆戙��");
- return tasks.FirstOrDefault(x => x.RGVName != "RGV02");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
+ return taskNews.FirstOrDefault(x => x.RGVName != "RGV02");
}
}
}
@@ -489,12 +506,14 @@
{
if (tasks.FirstOrDefault(x => x.RGVName == "RGV01") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName == "RGV01");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName != "RGV02");
}
}
@@ -503,12 +522,14 @@
{
if (tasks.FirstOrDefault(x => x.RGVName == "RGV01") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆愭湭鎵惧埌RGV02璁惧淇℃伅銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName == "RGV01");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVSecond.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVSecond.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆愭湭鎵惧埌RGV02璁惧淇℃伅銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName != "RGV02");
}
}
@@ -525,11 +546,11 @@
{
if (taskFirst.TaskState == (int)TaskOutStatusEnum.RGV_Outdispatch || taskFirst.TaskState == (int)TaskOutStatusEnum.RGV_OutdispatchFinish || taskFirst.TaskState == (int)TaskInStatusEnum.RGV_Indispatch || taskFirst.TaskState == (int)TaskInStatusEnum.RGV_InAwaitWMS || taskFirst.TaskState == (int)TaskInStatusEnum.RGV_IndispatchFinish)
{
- //task = tasks.FirstOrDefault(x =>taskFirst.TargetStation - x.SourceStation > 1 && taskFirst.SourceStation - x.TargetStation > 1 && taskFirst.SourceStation - x.SourceStation > 1 && taskFirst.TargetStation - x.TargetStation > 1);
task = tasks.FirstOrDefault(x => (x.SourceStation - taskFirst.TargetStation > 1 && x.SourceStation - taskFirst.SourceStation > 1 && x.TaskType == (int)TaskInboundTypeEnum.Inbound) || (x.SourceStation - taskFirst.TargetStation > 1 && x.TargetStation - taskFirst.SourceStation > 1 && x.SourceStation - taskFirst.SourceStation > 1 && x.TargetStation - taskFirst.TargetStation > 1 && x.TaskType == (int)TaskOutboundTypeEnum.Outbound));
- LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskFirst)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
+ LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskFirst)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task.TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
@@ -537,14 +558,19 @@
{
task = tasks.FirstOrDefault(x => taskFirst.TargetStation - x.SourceStation > 1 && taskFirst.TargetStation - x.TargetStation > 1);
- LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskFirst)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task)}銆戙��");
-
+ LogAndWarn("鎵ц璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戙�恵commonRGVFirst.DeviceCode}銆戜换鍔°�恵JsonConvert.SerializeObject(taskFirst)}銆憑commonRGVFirst.DeviceCode}杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(task.TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return task;
}
return null;
}
else
{
+ var taskNews = tasks.Where(x => (x.TaskType == (int)TaskInboundTypeEnum.Inbound && Convert.ToInt32(x.SourceAddress) > 1015) || (x.TaskType == (int)TaskOutboundTypeEnum.Outbound && (x.Roadway == "SC04" || x.Roadway == "SC05" || x.Roadway == "SC06"))).ToList();
+ if (taskNews.Count == 0)
+ {
+ return null;
+ }
if (commonRGVFirst.GetValue<RGVDBName, int>(RGVDBName.LevelPoint) < 420000)
{
RGVTaskCommand command = new RGVTaskCommand()
@@ -557,14 +583,16 @@
}
if (tasks.FirstOrDefault(x => x.RGVName == "RGV02") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName == "RGV02");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName != "RGV01");
}
}
@@ -573,14 +601,15 @@
{
if (tasks.FirstOrDefault(x => x.RGVName == "RGV02") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02"))}銆戙��");
-
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName == "RGV02");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName != "RGV01");
}
}
@@ -589,14 +618,16 @@
{
if (tasks.FirstOrDefault(x => x.RGVName == "RGV02") != null)
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆愭湭鎵惧埌RGV01璁惧淇℃伅銆� 杩斿洖浠诲姟锛氥�恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName == "RGV02").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName == "RGV02");
}
else
{
- LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆恵commonRGVFirst.DeviceCode}宸ヤ綔妯″紡锛氥�恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Automatic)}銆戜綔涓氱姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Running)}銆戣澶囩姸鎬侊細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.Fault)}銆戞槸鍚︽湁璐э細銆恵commonRGVFirst.GetValue<RGVDBName, bool>(RGVDBName.InStock)}銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01"))}銆戙��");
+ LogAndWarn("璋冨害浠诲姟鎺у埗", $"銆愭湭鎵惧埌RGV01璁惧淇℃伅銆戣繑鍥炰换鍔★細銆恵JsonConvert.SerializeObject(tasks.FirstOrDefault(x => x.RGVName != "RGV01").TaskNum)}銆戙��");
+ Thread.Sleep(1000);
return tasks.FirstOrDefault(x => x.RGVName != "RGV01");
}
}
@@ -618,24 +649,10 @@
{
if (commonRGV != null)
{
+ WriteInfo("RGV浠诲姟瀹屾垚", $"{commonRGV.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}");
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
- if (task.TaskState == (int)TaskInStatusEnum.InRetuen)
- {
- Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
- if (stationManager != null)
- {
- IDevice? device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == stationManager.stationPLC);
- if (device != null)
- {
- CommonConveyorLine conveyorLine = (CommonConveyorLine)device;
- commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
-
- var content = _taskService.RGVTaskCompleted(TaskNum);
- }
- }
- }
if (task.TaskState == (int)TaskInStatusEnum.RGV_Indispatch)
{
Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
@@ -648,17 +665,24 @@
Thread.Sleep(100);
DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == stationManager.stationChildCode && x.DeviceProParamName == "ConveyorLineBarcode").FirstOrDefault();
- var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 7);
+ var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 10);
string Barcode = Encoding.UTF8.GetString(x);
- if (Barcode == null || Barcode == "")
+ if (Barcode == null || Barcode == ""|| Barcode.Trim().Contains("\0"))
{
- conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, Convert.ToSByte(3), stationManager.stationChildCode);
commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark));
commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum));
- task.TaskState = (int)TaskInStatusEnum.InRetuen;
- _taskRepository.UpdateData(task);
+ commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4));
+
+ task.ModifyDate = DateTime.Now;
+ task.Modifier = "System";
+
+ Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
+ task_Hty.TaskId = 0;
+
+ _taskRepository.DeleteData(task);
+ _task_HtyRepository.AddData(task_Hty);
return;
}
var content = _taskService.RGVTaskCompleted(TaskNum, Barcode);
@@ -719,8 +743,6 @@
rgvTaskCommand.TaskNum = Convert.ToInt16(task.TaskNum);
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔�
{
- //rgvTaskCommand.TaskType = (byte)Convert.ToSByte(16);
- //rgvTaskCommand.TaskType = (byte)Convert.ToSByte(64); 閫�鍥�
if (task.TaskState == (int)TaskInStatusEnum.InNew)
{
Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 4045cd2..d14aab3 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -216,6 +216,7 @@
{
if (commonStackerCrane != null)
{
+ WriteInfo("鍫嗗灈鏈轰换鍔″畬鎴�", $"{commonStackerCrane.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}");
var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum);
if (task != null)
{
@@ -395,8 +396,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -409,8 +410,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -435,8 +436,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -448,8 +449,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
@@ -471,8 +472,8 @@
if (sourceCodes.Length == 3)
{
stackerCraneTaskCommand.StartRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(sourceCodes[0])));
- stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[1]);
- stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartColumn = (byte)Convert.ToSByte(sourceCodes[2]);
+ stackerCraneTaskCommand.StartLayer = (byte)Convert.ToSByte(sourceCodes[1]);
}
else
{
@@ -484,8 +485,8 @@
if (targetCodes.Length == 3)
{
stackerCraneTaskCommand.EndRow = (byte)Convert.ToSByte(GetRowCode(Convert.ToInt32(targetCodes[0])));
- stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[1]);
- stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndColumn = (byte)Convert.ToSByte(targetCodes[2]);
+ stackerCraneTaskCommand.EndLayer = (byte)Convert.ToSByte(targetCodes[1]);
}
else
{
--
Gitblit v1.9.3