From 10775e2b00cee12fb4b405e18a507c629990051a Mon Sep 17 00:00:00 2001 From: zhanghonglin <zhanghonglin@hnkhzn.com> Date: 星期一, 04 八月 2025 17:26:15 +0800 Subject: [PATCH] 新增切换库位与切换货物状态功能 --- 项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 74 ++--- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs | 4 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs | 6 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs | 2 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 18 + 项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 80 +++--- 项目代码/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue | 184 +++++++++----- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs | 273 ++++++++++++++++++++++ 项目代码/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue | 29 +- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs | 14 + 10 files changed, 517 insertions(+), 167 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue" index a6f4b0a..4ddfee5 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/locationimg.vue" @@ -989,6 +989,13 @@ </div> </div> <div id="kuang"> + <div id="qiehuan"> + <div class="qiean" @click="qiehuan(4)"></div> + <div class="qiean" @click="qiehuan(3)"></div> + <div class="qiean" @click="qiehuan(2)"></div> + <div class="qiean" @click="qiehuan(1)"></div> + <div class="qiean" @click="baohu()" style="background-color: green;">X</div> + </div> <div id="ti"> <div class="ge" id="a" style="width: 6%;height:60%;margin-top: 1%;margin-left: 1%;"></div> <div class="wen">绌洪棽</div> @@ -1024,6 +1031,7 @@ const weis = ref(""); const swei = ref(""); const lie = ref(""); +const bao = ref(0); const qu = ref(0); const ji = ref(0); @@ -1039,6 +1047,36 @@ const store = useStore(); const data = ref({}); +//淇敼搴撲綅淇濇姢鎸夐挳 +const baohu = k => { + bao.value = 0; + let t = document.getElementsByClassName("qiean"); + t[4].style.background = "green"; + alert("鍙栨秷鎴愬姛"); +}; + +//鍒囨崲搴撲綅 +const qiehuan = k => { + let t = document.getElementsByClassName("qiean"); + if (bao.value == 0) { + bao.value = 1; + alert("宸叉縺娲讳慨鏀瑰簱浣�"); + t[4].style.background = "red"; + } else { + axios.post("api/LocationInfo/setlocations/?k=" + k, {}).then(x => { + if (x.data.message == 1) { + alert("淇敼鎴愬姛"); + } else if (x.data.message == 2) { + alert("搴撳瓨閲屾湁璐э紝鏃犳硶淇敼"); + } else if (x.data.message == 4) { + alert("淇敼澶辫触"); + } + bao.value = 0; + t[4].style.background = "green"; + }); + } +}; + //鍑哄簱 const kc = () => { let t = document.getElementById("zxj"); @@ -1047,58 +1085,51 @@ if (wei.value != "") { //鏅�氳揣鍗婅嚜鍔ㄥ嚭搴� if (ji.value == 1) { - //鍒ゆ柇鍒� - if (lie.value < 37) { - //data.value.R_ZXJ_isWork == true && - if (R_ZXJ_TCMode.value == true && R_HC_isReadyWork.value == true) { - axios - .post( - "api/Task/banzidong/?wei=" + wei.value + "&weis=" + weis.value, - {} - ) - .then(x => { - qu.value = 0; - t.style.background = "#f60"; - if (x.data.message == 1) { - alert("鍑哄簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); - } else if (x.data.message == 3) { - alert("鍑哄簱澶辫触锛堟壘涓嶅埌搴撳瓨锛�"); - } else { - alert("鍑哄簱鎴愬姛"); - } - console.log(x); - }); - } else { - alert("淇″彿涓嶆纭�"); - } + //data.value.R_ZXJ_isWork == true && + if (R_ZXJ_TCMode.value == true && R_HC_isReadyWork.value == true) { + axios + .post( + "api/Task/banzidong/?wei=" + wei.value + "&weis=" + weis.value, + {} + ) + .then(x => { + qu.value = 0; + t.style.background = "#f60"; + if (x.data.message == 1) { + alert("鍑哄簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); + } else if (x.data.message == 3) { + alert("鍑哄簱澶辫触锛堟壘涓嶅埌搴撳瓨锛�"); + } else if (x.data.message == 5) { + alert("鏅�氬嚭搴撴棤娉曢�変腑鍓旈櫎搴撲綅"); + } else { + alert("鍑哄簱鎴愬姛"); + } + }); } else { - alert("鏅�氬嚭搴撲笉鑳介�変腑38鍒楃殑搴�"); + alert("淇″彿涓嶆纭�"); } //鍓旈櫎璐у崐鑷姩鍑哄簱 } else if (ji1.value == 1) { - //鍒ゆ柇鍒� - if (lie.value >= 37) { - //鍒ゆ柇淇″彿//////////////////////////////////////////////////////////////////////////////// - if (R_TC_isready.value == true) { - axios.post("api/Task/tichuchuku/?wei=" + wei.value, {}).then(x => { - qu1.value = 0; - s.style.background = "#f60"; - if (x.data.message == 1) { - alert("鍑哄簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); - } else if (x.data.message == 2) { - alert("鍑哄簱鎴愬姛"); - } else if (x.data.message == 3) { - alert("鍑哄簱澶辫触"); - } else if (x.data.message == 4) { - alert("搴撳瓨閲岄潰鏃犺揣"); - } - }); - }else{ - alert("淇″彿涓嶆纭�"); + //鍒ゆ柇淇″彿//////////////////////////////////////////////////////////////////////////////// + if (R_TC_isready.value == true) { + axios.post("api/Task/tichuchuku/?wei=" + wei.value, {}).then(x => { + qu1.value = 0; + s.style.background = "#f60"; + if (x.data.message == 1) { + alert("鍑哄簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); + } else if (x.data.message == 2) { + alert("鍑哄簱鎴愬姛"); + } else if (x.data.message == 3) { + alert("鍑哄簱澶辫触"); + } else if (x.data.message == 4) { + alert("搴撳瓨閲岄潰鏃犺揣"); + } else if (x.data.message == 5) { + alert("鍓旈櫎鍑哄簱鏃犳硶閫変腑鏅�氬簱浣�"); } + }); } else { - alert("鏅�氬嚭搴撳彧鑳介�変腑38鍒楃殑搴�"); + alert("淇″彿涓嶆纭�"); } } //鍓旈櫎鐩存帴鍑哄簱 @@ -1128,29 +1159,29 @@ } }; -//鍏ュ簱 +//鍓旈櫎鍏ュ簱 const kr = () => { let t = document.getElementById("zxj"); if (ji.value == 1 && wei.value != "") { - if (lie.value >= 37) { - //鍒ゆ柇淇″彿//////////////////////////////////////////////////////////////////////////////// - if (R_ZXJ_TC_isready.value == true && R_TCMode_TC.value == true) { - axios.post("api/Task/tichuruku/?wei=" + wei.value, {}).then(x => { - qu.value = 0; - t.style.background = "#f60"; - if (x.data.message == 1) { - alert("鍏ュ簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); - } else if (x.data.message == 2) { - alert("鍏ュ簱鎴愬姛"); - } else if (x.data.message == 3) { - alert("鍏ュ簱澶辫触"); - } else if (x.data.message == 4) { - alert("搴撳瓨閲岄潰宸叉湁璐�"); - } - }); - } + //鍒ゆ柇淇″彿//////////////////////////////////////////////////////////////////////////////// + if (R_ZXJ_TC_isready.value == true && R_TCMode_TC.value == true) { + axios.post("api/Task/tichuruku/?wei=" + wei.value, {}).then(x => { + qu.value = 0; + t.style.background = "#f60"; + if (x.data.message == 1) { + alert("鍏ュ簱澶辫触锛堝彲鑳芥槸 鈥滄槸鍚﹀嚭搴撯�� 鐨勯棶棰橈級"); + } else if (x.data.message == 2) { + alert("鍏ュ簱鎴愬姛"); + } else if (x.data.message == 3) { + alert("鍏ュ簱澶辫触"); + } else if (x.data.message == 4) { + alert("搴撳瓨閲岄潰宸叉湁璐�"); + } else if (x.data.message == 5) { + alert("鍓旈櫎鍏ュ簱蹇呴』閫夋嫨鍓旈櫎搴撲綅"); + } + }); } else { - alert("鍓旈櫎鍏ュ簱鍙兘閫変腑38鍒楃殑搴�"); + alert("淇″彿涓嶆纭�"); } } else { alert("璇峰厛閫変腑搴撲綅鍜屾暣褰㈡満"); @@ -1312,6 +1343,27 @@ </script> <style scoped> +.qiean { + width: 15%; + height: 70%; + border: 1px solid green; + float: left; + margin-left: 5%; + text-align: center; + line-height: 3vh; + font-size: 2vh; +} +.qiean:hover { + border: 2px solid yellow; +} +#qiehuan { + width: 13%; + height: 5%; + position: absolute; + left: 85.7%; + top: 71%; + cursor: pointer; +} #kr { width: 4%; height: 4%; @@ -1334,7 +1386,7 @@ width: 10%; height: 15%; position: absolute; - top: 75%; + top: 80%; left: 87%; text-align: center; line-height: 700%; @@ -1371,7 +1423,7 @@ width: 10%; height: 15%; position: absolute; - top: 75%; + top: 80%; left: 2%; text-align: center; line-height: 700%; diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue" index 2f1c0ef..18be238 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Client/src/views/wmsPart/stockInfo.vue" @@ -25,25 +25,26 @@ url: "/StockInfo/", sortName: "id" }); - const editFormFields = ref({ - deviceCode: "", - deviceName: "", - deviceType: "", - deviceStatus: "", - deviceIp: "", - devicePort: "", - devicePlcType: "", - deviceRemark: "" - }); + const editFormFields = ref({}); const editFormOptions = ref([ [ - { field: "palletCode", title: "鎵樼洏缂栧彿", type: "string" }, - { field: "locationCode", title: "璐т綅缂栧彿", type: "string" } + { + title: "鐗╂枡淇℃伅", + field: "remark", + type: "select", + dataKey: "mateType", + }, + { + title: "搴撳瓨鐘舵��", + field: "stockStatus", + type: "select", + dataKey: "stock", + } ] ]); const searchFormFields = ref({ - palletCode: "", - locationCode: "" + remark: "", + stockStatus: "" }); const searchFormOptions = ref([ [ 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 f72448a..7e4d923 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" @@ -7,14 +7,6 @@ "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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" - }, - { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, @@ -23,8 +15,16 @@ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|solutionrelative:wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -42,28 +42,29 @@ }, { "$type": "Document", - "DocumentIndex": 1, - "Title": "appsettings.json", - "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-07-17T08:36:45.301Z", + "DocumentIndex": 5, + "Title": "LocationEnum.cs", + "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", + "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", + "RelativeToolTip": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", + "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAQAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-07-29T06:28:32.954Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, - "Title": "TaskStatusEnum.cs", - "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "ViewState": "AgIAAI4AAAAAAAAAAAAqwJAAAAAcAAAAAAAAAA==", + "DocumentIndex": 4, + "Title": "LocationInfoService.cs", + "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "RelativeToolTip": "WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "ViewState": "AgIAAPkBAAAAAAAAAAAowPwBAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T13:03:23.848Z" + "WhenOpened": "2025-07-29T06:20:23.748Z", + "EditorCaption": "" }, { "$type": "Document", @@ -73,46 +74,49 @@ "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs", - "ViewState": "AgIAAI8AAAAAAAAAAAAswAEGAAAjAAAAAAAAAA==", + "ViewState": "AgIAAOsDAAAAAAAAAAAvwP0DAAAMAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T02:06:47.617Z", + "WhenOpened": "2025-07-24T08:17:28.019Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, + "DocumentIndex": 1, "Title": "GZJJob.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", - "ViewState": "AgIAAL0AAAAAAAAAAAAswPoAAAAhAAAAAAAAAA==", + "ViewState": "AgIAALQAAAAAAAAAAAD4v78AAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-16T07:03:59.279Z" + "WhenOpened": "2025-05-16T07:03:59.279Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 2, "Title": "OHTJob.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", - "ViewState": "AgIAAA8AAAAAAAAAAAAAAOcAAAAoAAAAAAAAAA==", + "ViewState": "AgIAAD8AAAAAAAAAAAAYwOcAAAAoAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-16T07:49:36.171Z" + "WhenOpened": "2025-05-16T07:49:36.171Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 3, "Title": "ZXJJob.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAaAAAAAAAAAA==", + "ViewState": "AgIAALkAAAAAAAAAAAAhwOEAAAAuAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-03T02:04:31.648Z" + "WhenOpened": "2025-04-03T02:04:31.648Z", + "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 f1dce15..7e4d923 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" @@ -11,24 +11,20 @@ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\gzj\\gzjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" - }, - { - "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}", - "RelativeMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|solutionrelative:wideseawcs_server\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}" + "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\zxj\\zxjjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\oht\\ohtjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{B17BAF3C-2BAD-4162-B6DC-46ED7A1E3D8D}|WIDESEAWCS_WMSPart\\WIDESEAWCS_WMSPart.csproj|solutionrelative:wideseawcs_wmspart\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" }, { - "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", - "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\taskenum\\taskstatusenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + "AbsoluteMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|f:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\yangjipingku\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", + "RelativeMoniker": "D:0:0:{9FBC654C-51DE-422D-9E1E-6A38268DE1E2}|WIDESEAWCS_Common\\WIDESEAWCS_Common.csproj|solutionrelative:wideseawcs_common\\locationenum\\locationenum.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -38,7 +34,7 @@ "DocumentGroups": [ { "DockedWidth": 200, - "SelectedChildIndex": 4, + "SelectedChildIndex": 3, "Children": [ { "$type": "Bookmark", @@ -46,41 +42,29 @@ }, { "$type": "Document", - "DocumentIndex": 2, + "DocumentIndex": 5, "Title": "LocationEnum.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", "RelativeToolTip": "WIDESEAWCS_Common\\LocationEnum\\LocationEnum.cs", - "ViewState": "AgIAACMAAAAAAAAAAAAIwAAAAAAAAAAAAAAAAA==", + "ViewState": "AgIAAAAAAAAAAAAAAAAswAwAAAAQAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-23T05:22:53.555Z", + "WhenOpened": "2025-07-29T06:28:32.954Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 3, - "Title": "appsettings.json", - "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json", - "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json", - "RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json", - "ViewState": "AgIAAAAAAAAAAAAAAADwvwAAAAAAAAAAAAAAAA==", - "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|", - "WhenOpened": "2025-07-17T08:36:45.301Z", - "EditorCaption": "" - }, - { - "$type": "Document", - "DocumentIndex": 6, - "Title": "TaskStatusEnum.cs", - "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "RelativeDocumentMoniker": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "RelativeToolTip": "WIDESEAWCS_Common\\TaskEnum\\TaskStatusEnum.cs", - "ViewState": "AgIAAI4AAAAAAAAAAAAqwJAAAAAcAAAAAAAAAA==", + "DocumentIndex": 4, + "Title": "LocationInfoService.cs", + "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "RelativeDocumentMoniker": "WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "RelativeToolTip": "WIDESEAWCS_WMSPart\\LocationInfoService.cs", + "ViewState": "AgIAAPkBAAAAAAAAAAAowPwBAAARAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-07-01T13:03:23.848Z" + "WhenOpened": "2025-07-29T06:20:23.748Z", + "EditorCaption": "" }, { "$type": "Document", @@ -90,9 +74,9 @@ "RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs", "RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs", - "ViewState": "AgIAALoFAAAAAAAAAAAMwP0DAAAMAAAAAAAAAA==", + "ViewState": "AgIAAOsDAAAAAAAAAAAvwP0DAAAMAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-19T02:06:47.617Z", + "WhenOpened": "2025-07-24T08:17:28.019Z", "EditorCaption": "" }, { @@ -103,34 +87,36 @@ "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\GZJ\\GZJJob.cs", - "ViewState": "AgIAAFsBAAAAAAAAAAAjwAgBAAAYAAAAAAAAAA==", + "ViewState": "AgIAALQAAAAAAAAAAAD4v78AAAAYAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2025-05-16T07:03:59.279Z", "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 5, + "DocumentIndex": 2, "Title": "OHTJob.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\OHT\\OHTJob.cs", - "ViewState": "AgIAAA8AAAAAAAAAAAAAAOcAAAAoAAAAAAAAAA==", + "ViewState": "AgIAAD8AAAAAAAAAAAAYwOcAAAAoAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-05-16T07:49:36.171Z" + "WhenOpened": "2025-05-16T07:49:36.171Z", + "EditorCaption": "" }, { "$type": "Document", - "DocumentIndex": 4, + "DocumentIndex": 3, "Title": "ZXJJob.cs", "DocumentMoniker": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "ToolTip": "F:\\\u4E34\u65F6\u5B58\u653E\\\u9879\u76EE\\YangJiPingKu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", "RelativeToolTip": "WIDESEAWCS_Tasks\\ZXJ\\ZXJJob.cs", - "ViewState": "AgIAAAAAAAAAAAAAAAAAAC8AAAAaAAAAAAAAAA==", + "ViewState": "AgIAALkAAAAAAAAAAAAhwOEAAAAuAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", - "WhenOpened": "2025-04-03T02:04:31.648Z" + "WhenOpened": "2025-04-03T02:04:31.648Z", + "EditorCaption": "" } ] } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs" index e455237..596d91c 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_IWMSPart/ILocationInfoService.cs" @@ -28,5 +28,7 @@ /// <param name="InMode"></param> /// <returns></returns> Dt_LocationInfo GetInLocation(int InMode); + + WebResponseContent setlocations(int k); } } diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs" index c200a93..3624ceb 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/WMSPart/Dt_StockInfo.cs" @@ -23,13 +23,13 @@ /// <summary> /// 鎵规鍙� /// </summary> - [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵规鍙�")] + [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵规鍙�")] public string BatchNo { get; set; } /// <summary> /// 閲嶉噺 /// </summary> - [SugarColumn(IsNullable = false, ColumnDescription = "閲嶉噺")] + [SugarColumn(IsNullable = true, ColumnDescription = "閲嶉噺")] public decimal Weight { get; set; } /// <summary> diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs" index c8e36dd..5f4d108 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/WMSPart/LocationInfoController.cs" @@ -49,5 +49,11 @@ { return Service.getlocation(); } + + [HttpPost, Route("setlocations"), AllowAnonymous] + public WebResponseContent setlocations(int k) + { + return Service.setlocations(k); + } } } 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 b99a451..b78c6e0 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" @@ -1357,6 +1357,11 @@ //{ // throw new Exception($"鏁村舰鏈哄ぉ杞︽斁鏉夸俊鍙蜂负false"); //} + var location = _locationRepository.QueryFirst(v => v.LocationCode == wei); + if (location.LocationType != (int)LocationTypeEnum.Flat) + { + return content.OK("5"); + } //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉� var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); if (oldtask != null) @@ -1454,11 +1459,15 @@ //{ // throw new Exception($"瑙勬暣鏈哄墧闄ゆ灦瀛愬彲鏀炬澘鎴栧墧闄や笂鏂欐ā寮忎俊鍙蜂负false"); //} - //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉� + var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); var isout = _outStockRepository.QueryFirst(v => v.Id == 1); if (isout.isout == 0) { - var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound); + var location = _locationRepository.QueryFirst(v => v.LocationCode == wei); + if(location.LocationType != (int)LocationTypeEnum.Cube) + { + return content.OK("5"); + } if (oldtask != null) { throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�"); @@ -1517,6 +1526,11 @@ var isout = _outStockRepository.QueryFirst(v => v.Id == 1); if (isout.isout == 0) { + var location = _locationRepository.QueryFirst(v => v.LocationCode == wei); + if (location.LocationType != (int)LocationTypeEnum.Cube) + { + return content.OK("5"); + } //鍒ゆ柇搴撳瓨鏄惁鏈夎揣 //鏌ヨ璐т綅 Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei); diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs" index 7292299..97c97d1 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs" @@ -295,6 +295,279 @@ } } + public WebResponseContent setlocations(int k) + { + WebResponseContent content = new WebResponseContent(); + if (k == 1) + { + List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id<=2537&&v.Id>=2526); + //鍒ゆ柇鏄惁鏈夎揣 + if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock) + { + return content.OK("2"); + } + //鍓旈櫎鏀规垚姝e父 + if (ben[0].LocationType == (int)LocationTypeEnum.Cube) + { + ben[0].LocationType = (int)LocationTypeEnum.Flat; + ben[1].LocationType = (int)LocationTypeEnum.Flat; + ben[1].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[2].LocationType = (int)LocationTypeEnum.Flat; + ben[3].LocationType = (int)LocationTypeEnum.Flat; + ben[3].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[4].LocationType = (int)LocationTypeEnum.Flat; + ben[5].LocationType = (int)LocationTypeEnum.Flat; + ben[5].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[6].LocationType = (int)LocationTypeEnum.Flat; + ben[7].LocationType = (int)LocationTypeEnum.Flat; + ben[7].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[8].LocationType = (int)LocationTypeEnum.Flat; + ben[9].LocationType = (int)LocationTypeEnum.Flat; + ben[9].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[10].LocationType = (int)LocationTypeEnum.Flat; + ben[11].LocationType = (int)LocationTypeEnum.Flat; + ben[11].EnableStatus = (int)EnableStatusEnum.Normal; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + //姝e父鏀规垚鍓旈櫎 + else + { + ben[0].LocationType = (int)LocationTypeEnum.Cube; + ben[1].LocationType = (int)LocationTypeEnum.Cube; + ben[1].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[2].LocationType = (int)LocationTypeEnum.Cube; + ben[3].LocationType = (int)LocationTypeEnum.Cube; + ben[3].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[4].LocationType = (int)LocationTypeEnum.Cube; + ben[5].LocationType = (int)LocationTypeEnum.Cube; + ben[5].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[6].LocationType = (int)LocationTypeEnum.Cube; + ben[7].LocationType = (int)LocationTypeEnum.Cube; + ben[7].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[8].LocationType = (int)LocationTypeEnum.Cube; + ben[9].LocationType = (int)LocationTypeEnum.Cube; + ben[9].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[10].LocationType = (int)LocationTypeEnum.Cube; + ben[11].LocationType = (int)LocationTypeEnum.Cube; + ben[11].EnableStatus = (int)EnableStatusEnum.Disable; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + } + else if (k == 2) + { + List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2515 && v.Id >= 2504); + //鍒ゆ柇鏄惁鏈夎揣 + if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock) + { + return content.OK("2"); + } + //鍓旈櫎鏀规垚姝e父 + if (ben[0].LocationType == (int)LocationTypeEnum.Cube) + { + ben[0].LocationType = (int)LocationTypeEnum.Flat; + ben[1].LocationType = (int)LocationTypeEnum.Flat; + ben[1].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[2].LocationType = (int)LocationTypeEnum.Flat; + ben[3].LocationType = (int)LocationTypeEnum.Flat; + ben[3].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[4].LocationType = (int)LocationTypeEnum.Flat; + ben[5].LocationType = (int)LocationTypeEnum.Flat; + ben[5].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[6].LocationType = (int)LocationTypeEnum.Flat; + ben[7].LocationType = (int)LocationTypeEnum.Flat; + ben[7].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[8].LocationType = (int)LocationTypeEnum.Flat; + ben[9].LocationType = (int)LocationTypeEnum.Flat; + ben[9].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[10].LocationType = (int)LocationTypeEnum.Flat; + ben[11].LocationType = (int)LocationTypeEnum.Flat; + ben[11].EnableStatus = (int)EnableStatusEnum.Normal; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + //姝e父鏀规垚鍓旈櫎 + else + { + ben[0].LocationType = (int)LocationTypeEnum.Cube; + ben[1].LocationType = (int)LocationTypeEnum.Cube; + ben[1].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[2].LocationType = (int)LocationTypeEnum.Cube; + ben[3].LocationType = (int)LocationTypeEnum.Cube; + ben[3].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[4].LocationType = (int)LocationTypeEnum.Cube; + ben[5].LocationType = (int)LocationTypeEnum.Cube; + ben[5].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[6].LocationType = (int)LocationTypeEnum.Cube; + ben[7].LocationType = (int)LocationTypeEnum.Cube; + ben[7].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[8].LocationType = (int)LocationTypeEnum.Cube; + ben[9].LocationType = (int)LocationTypeEnum.Cube; + ben[9].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[10].LocationType = (int)LocationTypeEnum.Cube; + ben[11].LocationType = (int)LocationTypeEnum.Cube; + ben[11].EnableStatus = (int)EnableStatusEnum.Disable; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + } + else if (k == 3) + { + List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2493 && v.Id >= 2482); + //鍒ゆ柇鏄惁鏈夎揣 + if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock) + { + return content.OK("2"); + } + //鍓旈櫎鏀规垚姝e父 + if (ben[0].LocationType == (int)LocationTypeEnum.Cube) + { + ben[0].LocationType = (int)LocationTypeEnum.Flat; + ben[1].LocationType = (int)LocationTypeEnum.Flat; + ben[1].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[2].LocationType = (int)LocationTypeEnum.Flat; + ben[3].LocationType = (int)LocationTypeEnum.Flat; + ben[3].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[4].LocationType = (int)LocationTypeEnum.Flat; + ben[5].LocationType = (int)LocationTypeEnum.Flat; + ben[5].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[6].LocationType = (int)LocationTypeEnum.Flat; + ben[7].LocationType = (int)LocationTypeEnum.Flat; + ben[7].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[8].LocationType = (int)LocationTypeEnum.Flat; + ben[9].LocationType = (int)LocationTypeEnum.Flat; + ben[9].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[10].LocationType = (int)LocationTypeEnum.Flat; + ben[11].LocationType = (int)LocationTypeEnum.Flat; + ben[11].EnableStatus = (int)EnableStatusEnum.Normal; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + //姝e父鏀规垚鍓旈櫎 + else + { + ben[0].LocationType = (int)LocationTypeEnum.Cube; + ben[1].LocationType = (int)LocationTypeEnum.Cube; + ben[1].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[2].LocationType = (int)LocationTypeEnum.Cube; + ben[3].LocationType = (int)LocationTypeEnum.Cube; + ben[3].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[4].LocationType = (int)LocationTypeEnum.Cube; + ben[5].LocationType = (int)LocationTypeEnum.Cube; + ben[5].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[6].LocationType = (int)LocationTypeEnum.Cube; + ben[7].LocationType = (int)LocationTypeEnum.Cube; + ben[7].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[8].LocationType = (int)LocationTypeEnum.Cube; + ben[9].LocationType = (int)LocationTypeEnum.Cube; + ben[9].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[10].LocationType = (int)LocationTypeEnum.Cube; + ben[11].LocationType = (int)LocationTypeEnum.Cube; + ben[11].EnableStatus = (int)EnableStatusEnum.Disable; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + } + else if (k == 4) + { + List<Dt_LocationInfo> ben = BaseDal.QueryData(v => v.Id <= 2471 && v.Id >= 2460); + //鍒ゆ柇鏄惁鏈夎揣 + if (ben[0].LocationStatus == (int)LocationStatusEnum.InStock || ben[1].LocationStatus == (int)LocationStatusEnum.InStock || ben[2].LocationStatus == (int)LocationStatusEnum.InStock || ben[3].LocationStatus == (int)LocationStatusEnum.InStock || ben[4].LocationStatus == (int)LocationStatusEnum.InStock || ben[5].LocationStatus == (int)LocationStatusEnum.InStock || ben[6].LocationStatus == (int)LocationStatusEnum.InStock || ben[7].LocationStatus == (int)LocationStatusEnum.InStock || ben[8].LocationStatus == (int)LocationStatusEnum.InStock || ben[9].LocationStatus == (int)LocationStatusEnum.InStock || ben[10].LocationStatus == (int)LocationStatusEnum.InStock || ben[11].LocationStatus == (int)LocationStatusEnum.InStock) + { + return content.OK("2"); + } + //鍓旈櫎鏀规垚姝e父 + if (ben[0].LocationType == (int)LocationTypeEnum.Cube) + { + ben[0].LocationType = (int)LocationTypeEnum.Flat; + ben[1].LocationType = (int)LocationTypeEnum.Flat; + ben[1].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[2].LocationType = (int)LocationTypeEnum.Flat; + ben[3].LocationType = (int)LocationTypeEnum.Flat; + ben[3].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[4].LocationType = (int)LocationTypeEnum.Flat; + ben[5].LocationType = (int)LocationTypeEnum.Flat; + ben[5].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[6].LocationType = (int)LocationTypeEnum.Flat; + ben[7].LocationType = (int)LocationTypeEnum.Flat; + ben[7].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[8].LocationType = (int)LocationTypeEnum.Flat; + ben[9].LocationType = (int)LocationTypeEnum.Flat; + ben[9].EnableStatus = (int)EnableStatusEnum.Normal; + + ben[10].LocationType = (int)LocationTypeEnum.Flat; + ben[11].LocationType = (int)LocationTypeEnum.Flat; + ben[11].EnableStatus = (int)EnableStatusEnum.Normal; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + //姝e父鏀规垚鍓旈櫎 + else + { + ben[0].LocationType = (int)LocationTypeEnum.Cube; + ben[1].LocationType = (int)LocationTypeEnum.Cube; + ben[1].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[2].LocationType = (int)LocationTypeEnum.Cube; + ben[3].LocationType = (int)LocationTypeEnum.Cube; + ben[3].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[4].LocationType = (int)LocationTypeEnum.Cube; + ben[5].LocationType = (int)LocationTypeEnum.Cube; + ben[5].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[6].LocationType = (int)LocationTypeEnum.Cube; + ben[7].LocationType = (int)LocationTypeEnum.Cube; + ben[7].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[8].LocationType = (int)LocationTypeEnum.Cube; + ben[9].LocationType = (int)LocationTypeEnum.Cube; + ben[9].EnableStatus = (int)EnableStatusEnum.Disable; + + ben[10].LocationType = (int)LocationTypeEnum.Cube; + ben[11].LocationType = (int)LocationTypeEnum.Cube; + ben[11].EnableStatus = (int)EnableStatusEnum.Disable; + BaseDal.UpdateData(ben); + return content.OK("1"); + } + } + return content.OK("4"); + } } public class LocationConfig diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs" index 60446fd..b0fd05e 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/StockInfoService.cs" @@ -1,4 +1,6 @@ 锘縰sing AutoMapper; +using WIDESEAWCS_Core.Helper; +using WIDESEAWCS_Core; using WIDESEAWCS_Core.BaseRepository; using WIDESEAWCS_Core.BaseServices; using WIDESEAWCS_IWMSPart; @@ -19,6 +21,16 @@ { _mapper = mapper; } - + public override WebResponseContent UpdateData(SaveModel saveModel) + { + int id = saveModel.MainData["id"].ObjToInt(); + int StockStatus = saveModel.MainData["stockStatus"].ObjToInt(); + int Remark = saveModel.MainData["remark"].ObjToInt(); + Dt_StockInfo locationInfo = BaseDal.QueryFirst(x => x.Id == id); + locationInfo.StockStatus = StockStatus; + locationInfo.Remark = Remark; + return UpdateData(locationInfo); + //return base.UpdateData(saveModel); + } } } -- Gitblit v1.9.3