1

pengmn

2025-07-04 d8c0f4088dd1619279f6f894766a28bb0ecfe0a4

1

 .vs/HH.WCS.Mobox3/FileContentIndex/c94ce55b-8f58-464e-9ebc-90a5a8b6e2ab.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3/FileContentIndex/f7912fea-44e6-45c2-9b01-bf04789c5b52.vsidx

Binary files differ

 .vs/HH.WCS.Mobox3/v17/DocumentLayout.backup.json

@@ -3,6 +3,10 @@
  "WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
@@ -15,8 +19,12 @@
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\outorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\outorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,8 +62,34 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 2,
          "SelectedChildIndex": 7,
          "Children": [
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "OutOrder.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs \u2B24",
              "ViewState": "AgIAAAcAAAAAAAAAAAAAAFAAAAAfAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:16:01.735Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "InOrder.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs \u2B24",
              "ViewState": "AgIAADcAAAAAAAAAAAAYwFgAAAAFAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:13:31.233Z",
              "EditorCaption": ""
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -66,20 +100,20 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "DocumentIndex": 1,
              "Title": "TaskProcess.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "ViewState": "AgIAALMBAAAAAAAAAADwv78BAABEAAAAAAAAAA==",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs \u2B24",
              "ViewState": "AgIAAHQCAAAAAAAAAADwv30CAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T00:42:44.641Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 3,
              "Title": "AgvController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
@@ -87,36 +121,38 @@
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
              "ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-20T02:48:30.565Z"
              "WhenOpened": "2025-05-20T02:48:30.565Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "DocumentIndex": 2,
              "Title": "WmsController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "ViewState": "AgIAABsAAAAAAAAAAADwvysAAAAqAAAAAAAAAA==",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs \u2B24",
              "ViewState": "AgIAAD4AAAAAAAAAAAAiwFYAAAAsAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T00:41:35.255Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "DocumentIndex": 0,
              "Title": "WMSHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "ViewState": "AgIAAOECAAAAAAAAAAAAAPQCAAA2AAAAAAAAAA==",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs \u2B24",
              "ViewState": "AgIAABwDAAAAAAAAAAAAACkDAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-06-23T06:28:50.054Z"
              "WhenOpened": "2025-06-23T06:28:50.054Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "DocumentIndex": 7,
              "Title": "ContainerHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
@@ -128,7 +164,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "DocumentIndex": 6,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs",
@@ -140,7 +176,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 6,
              "DocumentIndex": 8,
              "Title": "MoboxController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
@@ -152,7 +188,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 7,
              "DocumentIndex": 9,
              "Title": "Container.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\Container.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\Container.cs",
@@ -164,7 +200,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 8,
              "DocumentIndex": 10,
              "Title": "Settings.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
@@ -176,7 +212,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 9,
              "DocumentIndex": 11,
              "Title": "NDC.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
@@ -188,7 +224,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 10,
              "DocumentIndex": 12,
              "Title": "HttpHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",

 .vs/HH.WCS.Mobox3/v17/DocumentLayout.json

@@ -3,6 +3,14 @@
  "WorkspaceRootPath": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
@@ -11,12 +19,12 @@
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\wmscontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\outorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\outorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\wms\\wmshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|d:\\\u6C49\u548C\u667A\u80FD\\git-mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|solutionrelative:hh.wcs.mobox3.hangyang\\models\\inorder.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{0D76040B-45FB-EB89-2535-E32E957D1429}|HH.WCS.Mobox3.HangYang\\HH.WCS.HangYang.csproj|D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\hh.wcs.mobox3.hangyang\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
@@ -54,8 +62,34 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 2,
          "SelectedChildIndex": 5,
          "Children": [
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "OutOrder.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\OutOrder.cs",
              "ViewState": "AgIAAAcAAAAAAAAAAAAAAFAAAAAfAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:16:01.735Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "InOrder.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\models\\InOrder.cs",
              "ViewState": "AgIAADcAAAAAAAAAAAAYwFgAAAAFAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-04T08:13:31.233Z",
              "EditorCaption": ""
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -66,20 +100,20 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "DocumentIndex": 2,
              "Title": "TaskProcess.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\process\\TaskProcess.cs",
              "ViewState": "AgIAAL4BAAAAAAAAAAAAAMUBAAAAAAAAAAAAAA==",
              "ViewState": "AgIAAHQCAAAAAAAAAADwv30CAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T00:42:44.641Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "DocumentIndex": 0,
              "Title": "AgvController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
@@ -87,36 +121,38 @@
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\AgvController.cs",
              "ViewState": "AgIAAA4AAAAAAAAAAAAqwBoAAAAcAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-20T02:48:30.565Z"
              "WhenOpened": "2025-05-20T02:48:30.565Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "DocumentIndex": 3,
              "Title": "WmsController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\api\\WmsController.cs",
              "ViewState": "AgIAACgAAAAAAAAAAAAIwCsAAAAqAAAAAAAAAA==",
              "ViewState": "AgIAAD4AAAAAAAAAAAAiwFYAAAAsAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-05-19T00:41:35.255Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "DocumentIndex": 1,
              "Title": "WMSHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "ToolTip": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "RelativeToolTip": "HH.WCS.Mobox3.HangYang\\wms\\WMSHelper.cs",
              "ViewState": "AgIAAOECAAAAAAAAAAAAAPQCAAA2AAAAAAAAAA==",
              "ViewState": "AgIAACMDAAAAAAAAAAAAACkDAAArAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-06-23T06:28:50.054Z"
              "WhenOpened": "2025-06-23T06:28:50.054Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "DocumentIndex": 7,
              "Title": "ContainerHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\wms\\ContainerHelper.cs",
@@ -128,7 +164,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "DocumentIndex": 6,
              "Title": "Program.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\Program.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\Program.cs",
@@ -140,7 +176,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 6,
              "DocumentIndex": 8,
              "Title": "MoboxController.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\api\\MoboxController.cs",
@@ -152,7 +188,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 7,
              "DocumentIndex": 9,
              "Title": "Container.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\models\\Container.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\models\\Container.cs",
@@ -164,7 +200,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 8,
              "DocumentIndex": 10,
              "Title": "Settings.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\Settings.cs",
@@ -176,7 +212,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 9,
              "DocumentIndex": 11,
              "Title": "NDC.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\dispatch\\NDC.cs",
@@ -188,7 +224,7 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 10,
              "DocumentIndex": 12,
              "Title": "HttpHelper.cs",
              "DocumentMoniker": "D:\\\u6C49\u548C\u667A\u80FD\\Git-Mobox3\\\u676D\u6C27\\HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",
              "RelativeDocumentMoniker": "HH.WCS.Mobox3.HangYang\\util\\HttpHelper.cs",

 HH.WCS.Mobox3.HangYang/api/WmsController.cs

@@ -66,7 +66,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public Result CancelInboundOrder(InOrder model)
        public Result CancelInboundOrder(InOrderCancel model)
        {
            LogHelper.Info("CancelInboundOrder 参数：" + JsonConvert.SerializeObject(model), "WMSAPI");
            var res = TaskProcess.CancelInboundOrder(model);
@@ -81,7 +81,7 @@
        /// <param name="model"></param>
        /// <returns></returns>
        [HttpPost]
        public Result CancelOutboundOrder(OutOrder model)
        public Result CancelOutboundOrder(OutOrderCancel model)
        {
            LogHelper.Info("CancelOutboundOrder 参数：" + JsonConvert.SerializeObject(model), "WMSAPI");
            var res = TaskProcess.CancelOutboundOrder(model);

 HH.WCS.Mobox3.HangYang/models/InOrder.cs

@@ -59,7 +59,33 @@
        [SugarColumn(IsIgnore = true)]
        [Navigate(NavigateType.OneToMany, nameof(S_NO))]
        public List<InOrderDetail> InOrderDetail { get; set; }

        //public List<OrderDetail> OrderDetail { get; set; }
    }


    public class InOrderCancel
    {
        /// <summary>
        /// 来源单号
        /// </summary>
        public string S_BS_NO { get; set; }
        public List<InOrderDetailCancel> OrderDetail { get; set; }
    }
    public class InOrderDetailCancel
    {
        /// <summary>
        /// 来源单号
        /// </summary>
        public string S_BS_NO { get; set; }

        /// <summary>
        /// 来源单行号
        /// </summary>
        public string N_BS_ROW_NO { get; set; }

        /// <summary>
        /// 物料编码
        /// </summary>
        public string S_ITEM_CODE { get; set; }
    }

}

 HH.WCS.Mobox3.HangYang/models/InOrderDetail.cs

@@ -41,12 +41,12 @@
        /// <summary>
        /// 数量
        /// </summary>
        public int F_QTY { get; set; }
        public decimal F_QTY { get; set; }

        /// <summary>
        /// 已绑定数量
        /// </summary>
        public int F_ACC_B_QTY { get; set; }
        public decimal F_ACC_B_QTY { get; set; }

    }
}

 HH.WCS.Mobox3.HangYang/models/OutOrder.cs

@@ -78,10 +78,29 @@
        //public List<OrderDetail> OrderDetail { get; set; }
    }

    public class OutOrderCancel
    {
        /// <summary>
        /// 来源单号
        /// </summary>
        public string S_BS_NO { get; set; }
        public List<OutOrderDetailCancel> OrderDetail { get; set; }
    }
    public class OutOrderDetailCancel
    {
        /// <summary>
        /// 来源单号
        /// </summary>
        public string S_BS_NO { get; set; }

    //public class OrderDetail
    //{
    //    public string N_BS_ROW_NO { get; set; }
    //    public string S_ITEM_CODE { get; set; }
    //}
        /// <summary>
        /// 来源单行号
        /// </summary>
        public string N_BS_ROW_NO { get; set; }

        /// <summary>
        /// 物料编码
        /// </summary>
        public string S_ITEM_CODE { get; set; }
    }
}

 HH.WCS.Mobox3.HangYang/models/OutOrderDetail.cs

@@ -44,7 +44,7 @@
        /// <summary>
        /// 数量
        /// </summary>
        public int F_QTY { get; set; }
        public decimal F_QTY { get; set; }

        /// <summary>
        /// ERP仓库

 HH.WCS.Mobox3.HangYang/models/TN_Material.cs

@@ -11,6 +11,8 @@
        public string S_ITEM_NAME { get; set; }
        public string S_MP_TYPE { get; set; }
        public string S_ITEM_TYPE { get; set; }

        public string S_AREA_CODE { get; set; }
        public string S_ITEM_SPEC { get; set; }
        public Nullable<float> F_WEIGHT { get; set; }
        public string S_MATERIAL { get; set; }

 HH.WCS.Mobox3.HangYang/process/TaskProcess.cs

@@ -396,7 +396,7 @@
                    {
                        S_ITEM_CODE = item.S_ITEM_CODE,
                        S_ITEM_NAME = item.S_ITEM_NAME,
                        S_ITEM_TYPE = item.S_AREA_CODE,
                        S_AREA_CODE = item.S_AREA_CODE,
                        S_ITEM_SPEC = item.S_MATERIAL_SPEC,
                        S_MATERIAL = item.S_MATERIAL,
                        S_UOM = item.S_UOM,
@@ -448,7 +448,7 @@
                        result.errMsg = $"未查询到物料{item.S_ITEM_CODE}的物料属性！";
                        return result;
                    }
                    item.S_EXT_ATTR1 = itemType.S_ITEM_TYPE;
                    item.S_EXT_ATTR1 = itemType.S_AREA_CODE;
                    item.S_ITEM_NAME = itemType.S_ITEM_NAME;
                }

@@ -523,7 +523,7 @@
                        result.errMsg = $"未查询到物料{item.S_ITEM_CODE}的物料属性！";
                        return result;
                    }
                    item.S_EXT_ATTR1 = itemType.S_ITEM_TYPE;
                    item.S_EXT_ATTR1 = itemType.S_AREA_CODE;
                    item.S_ITEM_NAME = itemType.S_ITEM_NAME;
                    item.C_CLEAN = itemType.C_CLEAN;
                }
@@ -586,12 +586,12 @@
        /// </summary>
        /// <param name="model">入库单</param>
        /// <returns></returns>
        public static Result CancelInboundOrder(InOrder model)
        public static Result CancelInboundOrder(InOrderCancel model)
        {
            Result result = new Result() { success = false, };
            try
            {
                if (model == null || !model.InOrderDetail.Any())
                if (model == null || !model.OrderDetail.Any())
                {
                    result.errMsg = "入库单取消不可为空值！";
                    return result;
@@ -625,12 +625,12 @@
        /// </summary>
        /// <param name="model">出库单</param>
        /// <returns></returns>
        public static Result CancelOutboundOrder(OutOrder model)
        public static Result CancelOutboundOrder(OutOrderCancel model)
        {
            Result result = new Result() { success = false };
            try
            {
                if (model == null || !model.OutOrderDetail.Any())
                if (model == null || !model.OrderDetail.Any())
                {
                    result.errMsg = "出库单不可为空值！";
                    return result;

 HH.WCS.Mobox3.HangYang/wms/WMSHelper.cs

@@ -560,7 +560,7 @@
                    var _Material = db.Queryable<TN_Material>().Where(c => c.S_ITEM_CODE == material.S_ITEM_CODE).First();
                    if (_Material != null)
                    {
                        db.Updateable<TN_Material>(material).UpdateColumns(a => new { a.S_ITEM_NAME, a.S_ITEM_TYPE, a.S_ITEM_SPEC, a.S_MATERIAL, a.S_UOM, a.C_CLEAN, a.T_MODIFY }).ExecuteCommand();
                        db.Updateable<TN_Material>(material).UpdateColumns(a => new { a.S_ITEM_NAME, a.S_AREA_CODE, a.S_ITEM_SPEC, a.S_MATERIAL, a.S_UOM, a.C_CLEAN, a.T_MODIFY }).ExecuteCommand();
                    }
                    else
                    {
@@ -601,15 +601,22 @@
                db.BeginTran();
                foreach (var orderItem in order)
                {
                    var _order = db.Queryable<InOrder>().Where(c => c.S_NO == orderItem.S_NO).First();
                    if (_order != null)
                    var _inOrder = db.Queryable<InOrder>().Where(c => c.S_NO == orderItem.S_NO).First();
                    if (_inOrder != null)
                    {
                        if (_order.N_B_STATE == 0)
                        foreach (var item in orderItem.InOrderDetail)
                        {
                            db.Updateable<InOrder>(orderItem).UpdateColumns(a => new { a.S_OP_TYPE, a.S_BS_TYPE, a.S_NOTE, a.T_MODIFY }).ExecuteCommand();
                            foreach (var item in orderItem.InOrderDetail)
                            var _orderDetail = db.Queryable<InOrderDetail>().Where(c => c.S_BS_NO == orderItem.S_BS_NO && c.S_ITEM_CODE == item.S_ITEM_CODE).First();
                            if (_orderDetail != null)
                            {
                                db.Updateable<InOrderDetail>(item).UpdateColumns(a => new { a.S_ITEM_CODE, a.S_ITEM_NAME, a.F_QTY }).ExecuteCommand();
                                var _order = db.Queryable<InOrder>().Where(c => c.S_NO == _orderDetail.S_IO_NO).First();
                                if (_order.N_B_STATE == 0)
                                {
                                    _orderDetail.S_ITEM_NAME = item.S_ITEM_NAME;
                                    _orderDetail.F_QTY = item.F_QTY;
                                    _orderDetail.T_MODIFY = DateTime.Now;
                                    db.Updateable<InOrderDetail>(_orderDetail).UpdateColumns(a => new { a.S_ITEM_NAME, a.F_QTY ,a.T_MODIFY}).ExecuteCommand();
                                }
                            }
                        }
                    }
@@ -618,6 +625,26 @@
                        db.Insertable(orderItem).ExecuteCommand();
                        db.Insertable(orderItem.InOrderDetail).ExecuteCommand();
                    }







                    //if (_order != null)
                    //{
                    //    if (_order.N_B_STATE == 0)
                    //    {
                    //        foreach (var item in orderItem.InOrderDetail)
                    //        {
                    //        }
                    //    }
                    //}
                    //else
                    //{

                    //}

                }
                db.CommitTran();
@@ -655,15 +682,22 @@
                foreach (var orderItem in order)
                {

                    var _order = db.Queryable<OutOrder>().Where(c => c.S_NO == orderItem.S_NO).First();
                    if (_order != null)
                    var _outOrder = db.Queryable<OutOrder>().Where(c => c.S_NO == orderItem.S_NO).First();
                    if (_outOrder != null)
                    {
                        if (_order.N_B_STATE == 0)
                        foreach (var item in orderItem.OutOrderDetail)
                        {
                            db.Updateable<OutOrder>(orderItem).UpdateColumns(a => new { a.S_OP_TYPE, a.S_BS_TYPE, a.S_NOTE, a.T_MODIFY }).ExecuteCommand();
                            foreach (var item in orderItem.OutOrderDetail)
                            var _orderDetail = db.Queryable<OutOrderDetail>().Where(c => c.S_BS_NO == orderItem.S_BS_NO && c.S_ITEM_CODE == item.S_ITEM_CODE).First();
                            if (_orderDetail != null)
                            {
                                db.Updateable<InOrderDetail>(item).UpdateColumns(a => new { a.S_ITEM_CODE, a.S_ITEM_NAME, a.F_QTY }).ExecuteCommand();
                                var _order = db.Queryable<OutOrder>().Where(c => c.S_NO == _orderDetail.S_OO_NO).First();
                                if (_order.N_B_STATE == 0)
                                {
                                    _orderDetail.S_ITEM_NAME = item.S_ITEM_NAME;
                                    _orderDetail.F_QTY = item.F_QTY;
                                    _orderDetail.T_MODIFY = DateTime.Now;
                                    db.Updateable<OutOrderDetail>(_orderDetail).UpdateColumns(a => new { a.S_ITEM_NAME, a.F_QTY,a.T_MODIFY }).ExecuteCommand();
                                }
                            }
                        }
                    }
@@ -672,6 +706,24 @@
                        db.Insertable(orderItem).ExecuteCommand();
                        db.Insertable(orderItem.OutOrderDetail).ExecuteCommand();
                    }

                    //var _order = db.Queryable<OutOrder>().Where(c => c.S_NO == orderItem.S_NO).First();
                    //if (_order != null)
                    //{
                    //    if (_order.N_B_STATE == 0)
                    //    {
                    //        db.Updateable<OutOrder>(orderItem).UpdateColumns(a => new { a.S_OP_TYPE, a.S_BS_TYPE, a.S_NOTE, a.T_MODIFY }).ExecuteCommand();
                    //        foreach (var item in orderItem.OutOrderDetail)
                    //        {
                    //            db.Updateable<InOrderDetail>(item).UpdateColumns(a => new { a.S_ITEM_CODE, a.S_ITEM_NAME, a.F_QTY }).ExecuteCommand();
                    //        }
                    //    }
                    //}
                    //else
                    //{
                    //    db.Insertable(orderItem).ExecuteCommand();
                    //    db.Insertable(orderItem.OutOrderDetail).ExecuteCommand();
                    //}


                }
@@ -692,7 +744,7 @@
        /// </summary>
        /// <param name="order"></param>
        /// <returns></returns>
        internal static bool CancelOrderIn(InOrder order)
        internal static bool CancelOrderIn(InOrderCancel order)
        {
            try
            {
@@ -700,22 +752,29 @@
                var db = new SqlHelper<object>().GetInstance();
                db.BeginTran();

                var _order = db.Queryable<InOrder>().Where(c => c.S_NO == order.S_NO).First();
                if (_order != null)
                foreach (var item in order.OrderDetail)
                {
                    if (_order.N_B_STATE == 0)
                    var _orderDetail = db.Queryable<InOrderDetail>().Where(c => c.S_BS_NO == order.S_BS_NO).ToList();
                    if (_orderDetail.Any())
                    {
                        foreach (var item in order.InOrderDetail)
                        var orderItem = _orderDetail.FirstOrDefault(a => a.S_ITEM_CODE.Trim() == item.S_ITEM_CODE);
                        if (orderItem != null)
                        {
                            db.Deleteable<InOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
                            var _order = db.Queryable<InOrder>().Where(c => c.S_NO == orderItem.S_IO_NO).First();
                            if (_order.N_B_STATE == 0)
                            {
                                db.Deleteable<InOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_IO_NO == orderItem.S_IO_NO).ExecuteCommand();
                                _orderDetail.RemoveAll(s => s.S_ITEM_CODE == item.S_ITEM_CODE);
                                if (!_orderDetail.Any())
                                {
                                    db.Deleteable<InOrder>().Where(it => it.S_NO == orderItem.S_IO_NO).ExecuteCommand();
                                }

                            }
                        }
                    }
                }
                var _orderItem = db.Queryable<InOrderDetail>().Where(c => c.S_BS_NO == order.S_BS_NO).First();
                if (_orderItem == null)
                {
                    db.Deleteable<InOrder>().Where(it => it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
                }

                db.CommitTran();
                res = true;
                return res;
@@ -741,30 +800,35 @@
        /// </summary>
        /// <param name="order"></param>
        /// <returns></returns>
        internal static bool CancelOrderOut(OutOrder order)
        internal static bool CancelOrderOut(OutOrderCancel order)
        {
            try
            {
                bool res = false;
                var db = new SqlHelper<object>().GetInstance();
                db.BeginTran();

                var _order = db.Queryable<OutOrder>().Where(c => c.S_NO == order.S_NO).First();
                if (_order != null)
                foreach (var item in order.OrderDetail)
                {
                    if (_order.N_B_STATE == 0)
                    var _orderDetail = db.Queryable<OutOrderDetail>().Where(c => c.S_BS_NO == order.S_BS_NO).ToList();
                    if (_orderDetail.Any())
                    {
                        foreach (var item in order.OutOrderDetail)
                        var orderItem = _orderDetail.FirstOrDefault(a => a.S_ITEM_CODE.Trim() == item.S_ITEM_CODE);
                        if (orderItem != null)
                        {
                            db.Deleteable<OutOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
                            var _order = db.Queryable<OutOrder>().Where(c => c.S_NO == orderItem.S_OO_NO).First();
                            if (_order.N_B_STATE == 0)
                            {
                                db.Deleteable<OutOrderDetail>().Where(it => it.S_ITEM_CODE.Trim() == item.S_ITEM_CODE && it.S_OO_NO == orderItem.S_OO_NO).ExecuteCommand();
                                _orderDetail.RemoveAll(s => s.S_ITEM_CODE == item.S_ITEM_CODE);
                                if (!_orderDetail.Any())
                                {
                                    db.Deleteable<OutOrder>().Where(it => it.S_NO == orderItem.S_OO_NO).ExecuteCommand();
                                }
                            }
                        }
                    }
                }
                var _orderItem = db.Queryable<OutOrderDetail>().Where(c => c.S_BS_NO == order.S_BS_NO).First();
                if (_orderItem == null)
                {
                    db.Deleteable<OutOrder>().Where(it => it.S_BS_NO == order.S_BS_NO).ExecuteCommand();
                }

                db.CommitTran();
                res = true;
                return res;