From b4fe67964e65428d8be84e6aed1a48b864620972 Mon Sep 17 00:00:00 2001
From: zhanghonglin <zhanghonglin@hnkhzn.com>
Date: 星期二, 28 四月 2026 09:37:26 +0800
Subject: [PATCH] 111
---
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.json | 34 +++---
项目代码/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue | 25 +---
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json | 48 ++++----
项目代码/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_hty.vue | 27 ++---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs | 44 ++++++++
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 26 ++++-
项目代码/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/DocumentLayout.backup.json | 34 +++---
项目代码/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue | 8 +
项目代码/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json | 36 +++---
项目代码/WMS/WIDESEA_WMSClient/src/api/http.js | 2
项目代码/WMS/WIDESEA_WMSClient/src/views/Home.vue | 2
11 files changed, 169 insertions(+), 117 deletions(-)
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 39b127a..c4dac05 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,8 +3,12 @@
"WorkspaceRootPath": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\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:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\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|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -15,12 +19,8 @@
"RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\dt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\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|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -94,11 +94,11 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 16,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "Dt_FillingOrderService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
@@ -112,13 +112,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 0,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAAcBAAAAAAAAAAAuwGwAAAAVAAAAAAAAAA==",
+ "ViewState": "AgIAADIAAAAAAAAAAAAuwEQAAAAXAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T06:06:14.908Z",
"IsPinned": true,
@@ -290,13 +290,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"Title": "appsettings.json",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAEAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABMAAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2026-04-02T06:30:21.613Z",
"EditorCaption": ""
@@ -316,20 +316,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "StackerCraneJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
- "ViewState": "AgIAAGEAAAAAAAAAAAAuwHMAAAAUAAAAAAAAAA==",
+ "ViewState": "AgIAAMEAAAAAAAAAAAAuwNEAAAB8AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T11:18:20.339Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "ConveyorLineJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
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 39b127a..d7d90e4 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,8 +3,12 @@
"WorkspaceRootPath": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\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:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\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|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\conveyorlinejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -15,12 +19,8 @@
"RelativeMoniker": "D:0:0:{A14242DD-DA06-4DC3-8598-1761AA7C76D1}|WIDESEAWCS_SystemServices\\WIDESEAWCS_SystemServices.csproj|solutionrelative:wideseawcs_systemservices\\dt_fillingorderservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{294E4915-0241-4C8C-BA99-7588B945863A}|WIDESEAWCS_Tasks\\WIDESEAWCS_Tasks.csproj|solutionrelative:wideseawcs_tasks\\job\\stackercranejob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{83F18A31-5983-4587-A0B2-414BF70E50B5}|WIDESEAWCS_TaskInfoService\\WIDESEAWCS_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\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:{487FA45B-EA1A-4ACA-BB5B-0F6708F462C0}|WIDESEAWCS_Server\\WIDESEAWCS_Server.csproj|d:\\\u9879\u76EE\\hubeichu\\\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|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wcs\\wideseawcs_server\\wideseawcs_tasks\\job\\fillingjob.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -94,11 +94,11 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 16,
+ "SelectedChildIndex": 1,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "Dt_FillingOrderService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_SystemServices\\Dt_FillingOrderService.cs",
@@ -112,13 +112,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 4,
+ "DocumentIndex": 0,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEAWCS_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAAcBAAAAAAAAAAAuwGwAAAAVAAAAAAAAAA==",
+ "ViewState": "AgIAADIAAAAAAAAAAAAuwDwAAAAQAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T06:06:14.908Z",
"IsPinned": true,
@@ -290,13 +290,13 @@
},
{
"$type": "Document",
- "DocumentIndex": 0,
+ "DocumentIndex": 4,
"Title": "appsettings.json",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeDocumentMoniker": "WIDESEAWCS_Server\\appsettings.json",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\appsettings.json",
"RelativeToolTip": "WIDESEAWCS_Server\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAABQAAAAEAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAAABMAAAAEAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
"WhenOpened": "2026-04-02T06:30:21.613Z",
"EditorCaption": ""
@@ -316,20 +316,20 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 1,
"Title": "StackerCraneJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
"RelativeToolTip": "WIDESEAWCS_Tasks\\Job\\StackerCraneJob.cs",
- "ViewState": "AgIAAGEAAAAAAAAAAAAuwHMAAAAUAAAAAAAAAA==",
+ "ViewState": "AgIAAMEAAAAAAAAAAAAuwNEAAAB8AAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2025-09-23T11:18:20.339Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "ConveyorLineJob.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
"RelativeDocumentMoniker": "WIDESEAWCS_Tasks\\Job\\ConveyorLineJob.cs",
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 8e3d2ad..51a0c89 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"
@@ -26,6 +26,9 @@
private readonly IRepository<Dt_Task_Hty> _Task_HtyRepository;
private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private static int kkk = 1;
+ private static int ttt = 1;
+
public TaskService(IRepository<Dt_Task> BaseDal, IRepository<Dt_StationManger> StationMangerRepository, IRepository<Dt_Task_Hty> Task_HtyRepository, IUnitOfWorkManage unitOfWorkManage) : base(BaseDal)
{
_StationMangerRepository = StationMangerRepository;
@@ -50,11 +53,22 @@
//鑾峰彇浠诲姟
if (InorOuts.Equals("In"))
{
- task = BaseDal.QueryFirst(v => ( v.TaskType == (int)TaskTypeEnum.InEmpty || v.TaskType == (int)TaskTypeEnum.Infull) && v.TaskState == (int)TaskStatusEnum.InNew);
+ task = BaseDal.QueryFirst(v => (v.TaskType == (int)TaskTypeEnum.InEmpty || v.TaskType == (int)TaskTypeEnum.Infull) && v.TaskState == (int)TaskStatusEnum.InNew);
}
else if (InorOuts.Equals("Out"))
{
- task = BaseDal.QueryFirst(v => (v.TaskType == (int)TaskTypeEnum.OutDirect || v.TaskType == (int)TaskTypeEnum.OutEmpty || v.TaskType == (int)TaskTypeEnum.Outfull) && v.TaskState == (int)TaskStatusEnum.OutNew);
+ //涓�婊℃《鍑虹┖妗跺嚭
+ if (kkk == 1)
+ {
+ task = BaseDal.QueryFirst(v => (v.TaskType == (int)TaskTypeEnum.OutEmpty) && v.TaskState == (int)TaskStatusEnum.OutNew);
+ kkk = 2;
+ }
+ else if (kkk == 2)
+ {
+ task = BaseDal.QueryFirst(v => (v.TaskType == (int)TaskTypeEnum.OutDirect || v.TaskType == (int)TaskTypeEnum.Outfull) && v.TaskState == (int)TaskStatusEnum.OutNew);
+ kkk = 1;
+ }
+
}
return task;
}
@@ -80,12 +94,12 @@
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == TaskNum);
- if (task==null)
+ if (task == null)
{
return null;
}
//鍏ュ簱
- if (R_TaskPhases == 4 && (task.TaskType == (int)TaskTypeEnum.InEmpty|| task.TaskType == (int)TaskTypeEnum.Infull))
+ if (R_TaskPhases == 4 && (task.TaskType == (int)TaskTypeEnum.InEmpty || task.TaskType == (int)TaskTypeEnum.Infull))
{
task.TaskState = (int)TaskStatusEnum.Task_Put;
}
@@ -135,7 +149,7 @@
taskhty.Remark = task.Remark;
taskhty.TaskType = task.TaskType;
taskhty.TaskState = (int)TaskStatusEnum.Task_Finish;
-
+
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
//淇敼璐т綅鐘舵�佸拰鍒涘缓搴撳瓨
@@ -296,7 +310,7 @@
catch (Exception ex)
{
//content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父锛屼换鍔″彿锛歿TaskNum},{ex}");
- LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "浠诲姟瀹屾垚寮傚父锛屼换鍔″彿:", TaskNum+"|"+ex.ToString() });
+ LogLock.OutLogAOP("鎺ュ彛鏃ュ織", new string[] { "浠诲姟瀹屾垚寮傚父锛屼换鍔″彿:", TaskNum + "|" + ex.ToString() });
}
return content;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/http.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/http.js"
index 5fd1d6c..7bcff56 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/http.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/api/http.js"
@@ -11,7 +11,7 @@
let loadingInstance;
let loadingStatus = false;
-if (process.env.NODE_ENV == 'development') {
+if (process.env.NODE_ENV == 'development') {//192.168.10.203
axios.defaults.baseURL = 'http://127.0.0.1:9291/';
}
else if (process.env.NODE_ENV == 'debug') {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
index 78bb864..8ea48a2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/Home.vue"
@@ -95,7 +95,7 @@
shuliang.value = n;
zhonglei.value = m;
num.value = 4;
- tiwz.innerHTML = "鏄惁浜哄伐寮哄埗婊℃《鍑哄簱" + n + "缁�" + m;
+ tiwz.innerHTML = "鏄惁浜哄伐鍑哄簱" + n + "缁�" + m;
} else {
tiwz.innerHTML = "鏁伴噺鍜岀绫讳笉鑳戒负绌�";
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
index 6c47c91..66f90c6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/basic/locationInfo.vue"
@@ -33,6 +33,7 @@
[
{ title: "璐т綅鐘舵��", field: "locationStatus" ,type: "select",dataKey: "LocationStatusEnum",data: [],},
{ title: "绂佺敤鐘舵��", field: "enableStatus" ,type: "select",dataKey: "EnableStatusEnum",data: [],},
+ { title: "绌烘《浠ｅ彿", field: "remark",data: [],},
],
]);
const searchFormFields = ref({
@@ -84,6 +85,13 @@
align: "left",
},
{
+ field: "remark",
+ title: "绌烘《浠ｅ彿",
+ type: "string",
+ width: 50,
+ align: "left",
+ },
+ {
field: "roadwayNo",
title: "宸烽亾缂栧彿",
type: "string",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
index c3fc837..60f3229 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue"
@@ -42,8 +42,8 @@
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" }
+ { title: "鐗╂枡鍚嶇О", field: "materielName" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
]
]);
const columns = ref([
@@ -62,6 +62,13 @@
title: "鎵樼洏缂栧彿",
type: "string",
width: 90,
+ align: "left"
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
align: "left"
},
{
@@ -98,20 +105,6 @@
type: "string",
width: 90,
align: "left"
- },
- {
- field: "stockType",
- title: "鐗╂枡绫诲瀷",
- type: "int",
- width: 90,
- align: "left",
- bind: {
- key: "stockType",
- data: [
- { key: "1", value: "姘�" },
- { key: "2", value: "娌�" }
- ]
- }
},
{
field: "stockStatus",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_hty.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_hty.vue"
index 5b03b33..d2985a9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_hty.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo_hty.vue"
@@ -20,7 +20,7 @@
const table = ref({
key: "id",
footer: "Foots",
- cnName: "鏂紑杩炴帴搴撳瓨淇℃伅",
+ cnName: "鍘嗗彶搴撳瓨淇℃伅",
name: "stockInfo_hty",
url: "/stockInfo_hty/",
sortName: "CreateDate"
@@ -42,8 +42,8 @@
});
const searchFormOptions = ref([
[
- { title: "鎵樼洏缂栧彿", field: "palletCode" },
- { title: "璐т綅缂栧彿", field: "locationCode" }
+ { title: "鐗╂枡鍚嶇О", field: "materielName" },
+ { title: "璐т綅缂栧彿", field: "locationCode" },
]
]);
const columns = ref([
@@ -62,6 +62,13 @@
title: "鎵樼洏缂栧彿",
type: "string",
width: 90,
+ align: "left"
+ },
+ {
+ field: "materielName",
+ title: "鐗╂枡鍚嶇О",
+ type: "string",
+ width: 150,
align: "left"
},
{
@@ -98,20 +105,6 @@
type: "string",
width: 90,
align: "left"
- },
- {
- field: "stockType",
- title: "鐗╂枡绫诲瀷",
- type: "int",
- width: 90,
- align: "left",
- bind: {
- key: "stockType",
- data: [
- { key: "1", value: "姘�" },
- { key: "2", value: "娌�" }
- ]
- }
},
{
field: "stockStatus",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
index 6c0f070..ce20432 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.backup.json"
@@ -3,8 +3,12 @@
"WorkspaceRootPath": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\",
"Documents": [
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\warehouseservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\warehouseservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+ },
+ {
+ "AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\outstockinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|solutionrelative:widesea_stockservice\\outstockinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -13,10 +17,6 @@
{
"AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
"RelativeMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|solutionrelative:widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- },
- {
- "AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\outstockinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|solutionrelative:widesea_stockservice\\outstockinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\locationinfoservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -62,11 +62,11 @@
"DocumentGroups": [
{
"DockedWidth": 200,
- "SelectedChildIndex": 14,
+ "SelectedChildIndex": 3,
"Children": [
{
"$type": "Document",
- "DocumentIndex": 1,
+ "DocumentIndex": 2,
"Title": "TaskService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs",
"RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService.cs",
@@ -88,20 +88,33 @@
},
{
"$type": "Document",
- "DocumentIndex": 3,
+ "DocumentIndex": 0,
+ "Title": "WarehouseService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\WarehouseService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\WarehouseService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\WarehouseService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\WarehouseService.cs",
+ "ViewState": "AgIAABEAAAAAAAAAAAAIwCYAAAAAAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-27T00:26:04.687Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
+ "DocumentIndex": 1,
"Title": "OutstockinfoService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\OutstockinfoService.cs",
"RelativeDocumentMoniker": "WIDESEA_StockService\\OutstockinfoService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\OutstockinfoService.cs",
"RelativeToolTip": "WIDESEA_StockService\\OutstockinfoService.cs",
- "ViewState": "AgIAABYAAAAAAAAAAAAswCMAAAAQAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAkwBkAAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-04-18T02:39:11.81Z",
"EditorCaption": ""
},
{
"$type": "Document",
- "DocumentIndex": 2,
+ "DocumentIndex": 3,
"Title": "StockService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
"RelativeDocumentMoniker": "WIDESEA_StockService\\StockService.cs",
@@ -227,19 +240,6 @@
"ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-04-09T06:01:28.935Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:43.46Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
index cb79cbf..dcf954b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/v17/DocumentLayout.json"
@@ -7,8 +7,8 @@
"RelativeMoniker": "D:0:0:{7D7534D4-51D9-46DC-A6B7-6430042F4E12}|WIDESEA_TaskInfoService\\WIDESEA_TaskInfoService.csproj|solutionrelative:widesea_taskinfoservice\\taskservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
- "AbsoluteMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}",
- "RelativeMoniker": "D:0:0:{D81A65B5-47D1-40C1-8FDE-7D24FF003F51}|WIDESEA_WMSServer\\WIDESEA_WMSServer.csproj|solutionrelative:widesea_wmsserver\\appsettings.json||{90A6B3A7-C1A3-4009-A288-E2FF89E96FA0}"
+ "AbsoluteMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_basicservice\\warehouseservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+ "RelativeMoniker": "D:0:0:{D11C804C-2FF4-4C18-A3EE-2F0574427BB3}|WIDESEA_BasicService\\WIDESEA_BasicService.csproj|solutionrelative:widesea_basicservice\\warehouseservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
},
{
"AbsoluteMoniker": "D:0:0:{7DC26D42-D8EE-46F0-BA66-A13457086885}|WIDESEA_StockService\\WIDESEA_StockService.csproj|d:\\\u9879\u76EE\\hubeichu\\\u9879\u76EE\u4EE3\u7801\\wms\\widesea_wmsserver\\widesea_stockservice\\stockservice.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -72,7 +72,7 @@
"RelativeDocumentMoniker": "WIDESEA_TaskInfoService\\TaskService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_TaskInfoService\\TaskService.cs",
"RelativeToolTip": "WIDESEA_TaskInfoService\\TaskService.cs",
- "ViewState": "AgIAAM4CAAAAAAAAAAAIwF4DAACPAAAAAAAAAA==",
+ "ViewState": "AgIAAIIDAAAAAAAAAAAcwJsDAAAYAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-03-17T06:06:14.899Z",
"IsPinned": true,
@@ -88,13 +88,26 @@
},
{
"$type": "Document",
+ "DocumentIndex": 1,
+ "Title": "WarehouseService.cs",
+ "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\WarehouseService.cs",
+ "RelativeDocumentMoniker": "WIDESEA_BasicService\\WarehouseService.cs",
+ "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_BasicService\\WarehouseService.cs",
+ "RelativeToolTip": "WIDESEA_BasicService\\WarehouseService.cs",
+ "ViewState": "AgIAABoAAAAAAAAAAAAiwC0AAAAXAAAAAAAAAA==",
+ "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+ "WhenOpened": "2026-04-27T00:26:04.687Z",
+ "EditorCaption": ""
+ },
+ {
+ "$type": "Document",
"DocumentIndex": 3,
"Title": "OutstockinfoService.cs",
"DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\OutstockinfoService.cs",
"RelativeDocumentMoniker": "WIDESEA_StockService\\OutstockinfoService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\OutstockinfoService.cs",
"RelativeToolTip": "WIDESEA_StockService\\OutstockinfoService.cs",
- "ViewState": "AgIAABYAAAAAAAAAAAAswCMAAAAQAAAAAAAAAA==",
+ "ViewState": "AgIAAAAAAAAAAAAAAAAkwBkAAAAIAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-04-18T02:39:11.81Z",
"EditorCaption": ""
@@ -107,7 +120,7 @@
"RelativeDocumentMoniker": "WIDESEA_StockService\\StockService.cs",
"ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_StockService\\StockService.cs",
"RelativeToolTip": "WIDESEA_StockService\\StockService.cs",
- "ViewState": "AgIAACsAAAAAAAAAAADwvykAAAAQAAAAAAAAAA==",
+ "ViewState": "AgIAADAAAAAAAAAAAADwvzEAAAAOAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-04-16T09:00:30.985Z",
"EditorCaption": ""
@@ -227,19 +240,6 @@
"ViewState": "AgIAAAAAAAAAAAAAAADwvw8AAAAZAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2026-04-09T06:01:28.935Z",
- "EditorCaption": ""
- },
- {
- "$type": "Document",
- "DocumentIndex": 1,
- "Title": "appsettings.json",
- "DocumentMoniker": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeDocumentMoniker": "WIDESEA_WMSServer\\appsettings.json",
- "ToolTip": "D:\\\u9879\u76EE\\HuBeiChu\\\u9879\u76EE\u4EE3\u7801\\WMS\\WIDESEA_WMSServer\\WIDESEA_WMSServer\\appsettings.json",
- "RelativeToolTip": "WIDESEA_WMSServer\\appsettings.json",
- "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAEAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.001642|",
- "WhenOpened": "2026-03-17T08:24:43.46Z",
"EditorCaption": ""
}
]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
index d83cafe..6f38266 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/WarehouseService.cs"
@@ -3,10 +3,12 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models.Basic;
+using WIDESEA_Model.Models.Stock;
using WIDESEAWCS_Model.Models.TaskInfo;
namespace WIDESEA_BasicService
@@ -16,5 +18,47 @@
public WarehouseService(IRepository<Dt_Warehouse> BaseDal) : base(BaseDal)
{
}
+
+ public IRepository<Dt_Warehouse> Repository => BaseDal;
+
+ public override WebResponseContent AddData(SaveModel saveModel)
+ {
+ //闃叉淇敼鐨勪唬鍙烽噸澶�
+ WebResponseContent content = new WebResponseContent();
+ var mainDataDict = saveModel.MainData as Dictionary<string, object>;
+ string materialCode = "";
+ if (mainDataDict.TryGetValue("materiaCode", out var materialCodeObj))
+ {
+ materialCode = materialCodeObj.ToString();
+ }
+ Dt_Warehouse Warehouse = BaseDal.QueryFirst(x => x.MateriaCode == materialCode);
+ if (Warehouse != null)
+ {
+ content.Message = "杈撳叆浠ｅ彿閲嶅";
+ return content;
+ }
+
+ return base.AddData(saveModel);
+ }
+
+ public override WebResponseContent UpdateData(SaveModel saveModel)
+ {
+ //闃叉淇敼鐨勪唬鍙烽噸澶�
+ WebResponseContent content = new WebResponseContent();
+ var mainDataDict = saveModel.MainData as Dictionary<string, object>;
+ string materialCode = "";
+ if (mainDataDict.TryGetValue("materiaCode", out var materialCodeObj))
+ {
+ materialCode = materialCodeObj.ToString();
+ }
+ Dt_Warehouse Warehouse = BaseDal.QueryFirst(x => x.MateriaCode == materialCode);
+ if (Warehouse != null)
+ {
+ content.Message = "杈撳叆浠ｅ彿閲嶅";
+ return content;
+ }
+
+ return base.UpdateData(saveModel);
+ }
}
}
--
Gitblit v1.9.3