From 65a2e96d657c7a3b6e0da2af6d223bd765476c0b Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 27 八月 2025 14:11:52 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~kyy/LW_MesService

---
 WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json |  168 ++++++++++++++++----------------------------------------
 1 files changed, 48 insertions(+), 120 deletions(-)

diff --git a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
index 5d43483..60bbf75 100644
--- a/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
+++ b/WebApi/.vs/GsMesSolution/v17/DocumentLayout.backup.json
@@ -1,34 +1,18 @@
 {
   "Version": 1,
-  "WorkspaceRootPath": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\",
+  "WorkspaceRootPath": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\",
   "Documents": [
     {
-      "AbsoluteMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.wom\\workservice\\worktechniquecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\worktechniquecontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.wom\\workservice\\mesbackflashcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{63823BC6-6242-4EBC-8B15-B72B89E8CEDA}|Gs.Wom\\Gs.Wom.csproj|solutionrelative:gs.wom\\workservice\\mesbackflashcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesdepotsmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.warehouse\\services\\mesautorkcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesautorkcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\mesinvitemarnmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.entity\\baseinfo\\mesdepotsections.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{FC3259F8-ED36-4118-BF3F-0B59FF6BA2A6}|Gs.Entity\\Gs.Entity.csproj|solutionrelative:gs.entity\\baseinfo\\mesdepotsections.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.warehouse\\services\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{D13D1BCC-6110-4943-BC98-FC6F3E28CE43}|Gs.Warehouse\\Gs.Warehouse.csproj|solutionrelative:gs.warehouse\\services\\varrivalbarcodemanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\messyspageviewmanager.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
-    {
-      "AbsoluteMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|e:\\messourcecode\\pc_cshap\\webapi\\gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{CF9A9DD9-8D22-4628-93BE-2070C81F2697}|Gs.Sys\\Gs.Sys.csproj|solutionrelative:gs.sys\\services\\organizationcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+      "AbsoluteMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|d:\\visual studios job\\lw\\lw_messervice\\webapi\\gs.report\\ckcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{3CA7A99D-C42B-440A-ADA7-B3D76CD02E7C}|Gs.Report\\Gs.Report.csproj|solutionrelative:gs.report\\ckcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
   "DocumentGroupContainers": [
@@ -37,119 +21,63 @@
       "VerticalTabListWidth": 256,
       "DocumentGroups": [
         {
-          "DockedWidth": 681,
-          "SelectedChildIndex": 0,
+          "DockedWidth": 200,
+          "SelectedChildIndex": 5,
           "Children": [
             {
-              "$type": "Document",
-              "DocumentIndex": 0,
-              "Title": "WorkTechniqueController.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
-              "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Wom\\WorkService\\WorkTechniqueController.cs",
-              "RelativeToolTip": "Gs.Wom\\WorkService\\WorkTechniqueController.cs",
-              "ViewState": "AgIAAC4BAAAAAAAAAAAAAC4BAAAyAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-26T08:17:09.487Z",
-              "EditorCaption": ""
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
             },
             {
-              "$type": "Document",
-              "DocumentIndex": 3,
-              "Title": "MesDepotSections.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
-              "RelativeDocumentMoniker": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Entity\\BaseInfo\\MesDepotSections.cs",
-              "RelativeToolTip": "Gs.Entity\\BaseInfo\\MesDepotSections.cs",
-              "ViewState": "AgIAAA4AAAAAAAAAAAAuwB8AAAAiAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T10:44:32.171Z"
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{b1e99781-ab81-11d0-b683-00aa00a3ee26}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:128:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
             },
             {
               "$type": "Document",
               "DocumentIndex": 1,
-              "Title": "MesDepotsManager.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
-              "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesDepotsManager.cs",
-              "RelativeToolTip": "Gs.Warehouse\\Services\\MesDepotsManager.cs",
-              "ViewState": "AgIAALsAAAAAAAAAAAAgwLgAAAA+AAAAAAAAAA==",
+              "Title": "MesAutoRkController.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Warehouse\\Services\\MesAutoRkController.cs",
+              "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesAutoRkController.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Warehouse\\Services\\MesAutoRkController.cs",
+              "RelativeToolTip": "Gs.Warehouse\\Services\\MesAutoRkController.cs",
+              "ViewState": "AgIAAJYAAAAAAAAAAAAkwNUAAAAMAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T07:07:07.204Z",
+              "WhenOpened": "2025-08-27T02:18:57.324Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "MesBackFlashController.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\MesBackFlashController.cs",
+              "RelativeDocumentMoniker": "Gs.Wom\\WorkService\\MesBackFlashController.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Wom\\WorkService\\MesBackFlashController.cs*",
+              "RelativeToolTip": "Gs.Wom\\WorkService\\MesBackFlashController.cs*",
+              "ViewState": "AgIAAJcAAAAAAAAAAAAUwJ8AAAAZAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2025-08-27T02:16:51.555Z",
               "EditorCaption": ""
             },
             {
               "$type": "Document",
               "DocumentIndex": 2,
-              "Title": "MesInvItemArnManager.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
-              "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
-              "RelativeToolTip": "Gs.Warehouse\\Services\\MesInvItemArnManager.cs",
-              "ViewState": "AgIAAO0AAAAAAAAAAAApwPwAAAAUAAAAAAAAAA==",
+              "Title": "CkController.cs",
+              "DocumentMoniker": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Report\\CkController.cs",
+              "RelativeDocumentMoniker": "Gs.Report\\CkController.cs",
+              "ToolTip": "D:\\VISUAL STUDIOS JOB\\LW\\LW_MesService\\WebApi\\Gs.Report\\CkController.cs",
+              "RelativeToolTip": "Gs.Report\\CkController.cs",
+              "ViewState": "AgIAABwAAAAAAAAAAAAIwCgAAAANAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T06:13:28.113Z",
+              "WhenOpened": "2025-08-26T07:57:43.715Z",
               "EditorCaption": ""
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 4,
-              "Title": "VArrivalBarcodeManager.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
-              "RelativeDocumentMoniker": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
-              "RelativeToolTip": "Gs.Warehouse\\Services\\VArrivalBarcodeManager.cs",
-              "ViewState": "AgIAAAAAAAAAAAAAAAAAAEMAAAAiAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T04:42:14.961Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 5,
-              "Title": "MesSysPageviewManager.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
-              "RelativeDocumentMoniker": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\MesSysPageviewManager.cs",
-              "RelativeToolTip": "Gs.Sys\\Services\\MesSysPageviewManager.cs",
-              "ViewState": "AgIAACwAAAAAAAAAAAAewEMAAAAtAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T02:48:45.457Z"
-            },
-            {
-              "$type": "Document",
-              "DocumentIndex": 6,
-              "Title": "OrganizationController.cs",
-              "DocumentMoniker": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs",
-              "RelativeDocumentMoniker": "Gs.Sys\\Services\\OrganizationController.cs",
-              "ToolTip": "E:\\MesSourceCode\\PC_Cshap\\WebApi\\Gs.Sys\\Services\\OrganizationController.cs",
-              "RelativeToolTip": "Gs.Sys\\Services\\OrganizationController.cs",
-              "ViewState": "AgIAACEAAAAAAAAAAAAtwCwAAABGAAAAAAAAAA==",
-              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2025-07-24T02:18:44.035Z"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 189,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
-            },
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c64b9c2-e352-428e-a56d-0ace190b99a6}"
-            }
-          ]
-        },
-        {
-          "DockedWidth": 364,
-          "SelectedChildIndex": -1,
-          "Children": [
-            {
-              "$type": "Bookmark",
-              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
             }
           ]
         }

--
Gitblit v1.9.3