648f4270f4f56c5ca284dbcfa650de05e46a7052..06747ef981873358950982e7a53c6d221ef93ac3
昨天 cjs
11
06747e 对比 | 目录
昨天 cjs
1111
cf94ef 对比 | 目录
9个文件已修改
336 ■■■■ 已修改文件
.gitignore 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.backup.json 102 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json 149 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/config/config.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
.gitignore
@@ -189,3 +189,4 @@
/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/731226a4-d6f9-4f1d-aafd-f1fd46c0d468.vsidx
/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/84e1ac29-6f81-4f45-9cdf-cbea30cc0011.vsidx
/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/8df12e28-334c-46b4-b937-b31a72338452.vsidx
/HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/FileContentIndex/6f7f26e9-d737-4669-b580-91ef057f8361.vsidx
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.backup.json
@@ -1,7 +1,32 @@
{
  "Version": 1,
  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\",
  "Documents": [],
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\git\\\u519C\u592B\u6797\u829D\\hh.wcs.mobox3.nongfulinzhi\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
  "DocumentGroupContainers": [
    {
      "Orientation": 0,
@@ -9,7 +34,7 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": -1,
          "SelectedChildIndex": 6,
          "Children": [
            {
              "$type": "Bookmark",
@@ -36,8 +61,77 @@
              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "Monitor.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeDocumentMoniker": "core\\Monitor.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeToolTip": "core\\Monitor.cs",
              "ViewState": "AgIAAA8BAAAAAAAAAAAcwDcBAAAZAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:23:47.452Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "TaskProcess.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeDocumentMoniker": "process\\TaskProcess.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeToolTip": "process\\TaskProcess.cs",
              "ViewState": "AgIAAAMFAAAAAAAAAAD4vxkFAABqAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:36.938Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "WCSCore.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeDocumentMoniker": "core\\WCSCore.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeToolTip": "core\\WCSCore.cs",
              "ViewState": "AgIAADcAAAAAAAAAAAAnwFoAAAAuAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:14.237Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "WCSHelper.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeDocumentMoniker": "wms\\WCSHelper.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeToolTip": "wms\\WCSHelper.cs",
              "ViewState": "AgIAAJAAAAAAAAAAAAD4v5QAAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:47.622Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "Program.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeDocumentMoniker": "Program.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeToolTip": "Program.cs",
              "ViewState": "AgIAAE0AAAAAAAAAAAAiwGcAAAAyAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:19.238Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "AgvController.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "RelativeDocumentMoniker": "api\\AgvController.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "RelativeToolTip": "api\\AgvController.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvxMAAAAZAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T00:55:29.909Z"
            }
          ]
        },
HH.WCS.Mobox3.NongFuLinZhi/.vs/HH.WCS.Mobox3.NFLZ/v17/DocumentLayout.json
@@ -1,29 +1,29 @@
{
  "Version": 1,
  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\",
  "WorkspaceRootPath": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\",
  "Documents": [
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\git\\\u519C\u592B\u6797\u829D\\hh.wcs.mobox3.nongfulinzhi\\core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\monitor.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:program.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:process\\taskprocess.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:api\\agvcontroller.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:core\\wcscore.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    },
    {
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|c:\\software\\a-\u5DE5\u4F5C\\\u6E90\u7801\\wcs\\hh.wcs.mobox3\\hh.wcs.mobox3.nongfulinzhi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "AbsoluteMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
      "RelativeMoniker": "D:0:0:{2C0C3BD1-8DCF-4417-8C6B-E67EC9314F4E}|HH.WCS.Mobox3.NFLZ.csproj|solutionrelative:wms\\wcshelper.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
    }
  ],
@@ -34,73 +34,8 @@
      "DocumentGroups": [
        {
          "DockedWidth": 200,
          "SelectedChildIndex": 0,
          "SelectedChildIndex": 6,
          "Children": [
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "Monitor.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeDocumentMoniker": "core\\Monitor.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeToolTip": "core\\Monitor.cs",
              "ViewState": "AgIAABsBAAAAAAAAAAAMwDcBAAAZAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:23:47.452Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "TaskProcess.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeDocumentMoniker": "process\\TaskProcess.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeToolTip": "process\\TaskProcess.cs",
              "ViewState": "AgIAAAMFAAAAAAAAAAD4vxkFAABqAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:36.938Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "WCSCore.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeDocumentMoniker": "core\\WCSCore.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeToolTip": "core\\WCSCore.cs",
              "ViewState": "AgIAADcAAAAAAAAAAAAnwFoAAAAuAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:14.237Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "WCSHelper.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeDocumentMoniker": "wms\\WCSHelper.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeToolTip": "wms\\WCSHelper.cs",
              "ViewState": "AgIAAJAAAAAAAAAAAAD4v5QAAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:47.622Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "Program.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeDocumentMoniker": "Program.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeToolTip": "Program.cs",
              "ViewState": "AgIAAE0AAAAAAAAAAAAiwGcAAAAyAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:19.238Z",
              "EditorCaption": ""
            },
            {
              "$type": "Bookmark",
              "Name": "ST:0:0:{eefa5220-e298-11d0-8f78-00a0c9110057}"
@@ -127,16 +62,76 @@
            },
            {
              "$type": "Document",
              "DocumentIndex": 0,
              "Title": "Monitor.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeDocumentMoniker": "core\\Monitor.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\Monitor.cs",
              "RelativeToolTip": "core\\Monitor.cs",
              "ViewState": "AgIAAA8BAAAAAAAAAAAcwDcBAAAZAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:23:47.452Z",
              "EditorCaption": ""
            },
            {
              "$type": "Document",
              "DocumentIndex": 2,
              "Title": "TaskProcess.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeDocumentMoniker": "process\\TaskProcess.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\process\\TaskProcess.cs",
              "RelativeToolTip": "process\\TaskProcess.cs",
              "ViewState": "AgIAAAMFAAAAAAAAAAD4vxkFAABqAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:36.938Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 4,
              "Title": "WCSCore.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeDocumentMoniker": "core\\WCSCore.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\core\\WCSCore.cs",
              "RelativeToolTip": "core\\WCSCore.cs",
              "ViewState": "AgIAADcAAAAAAAAAAAAnwFoAAAAuAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:13:14.237Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 5,
              "Title": "WCSHelper.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeDocumentMoniker": "wms\\WCSHelper.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\wms\\WCSHelper.cs",
              "RelativeToolTip": "wms\\WCSHelper.cs",
              "ViewState": "AgIAAJAAAAAAAAAAAAD4v5QAAAARAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:47.622Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 1,
              "Title": "Program.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeDocumentMoniker": "Program.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\Program.cs",
              "RelativeToolTip": "Program.cs",
              "ViewState": "AgIAAE0AAAAAAAAAAAAiwGcAAAAyAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T01:12:19.238Z"
            },
            {
              "$type": "Document",
              "DocumentIndex": 3,
              "Title": "AgvController.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "DocumentMoniker": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "RelativeDocumentMoniker": "api\\AgvController.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\WCS\\HH.WCS.Mobox3\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "ToolTip": "C:\\software\\A-\u5DE5\u4F5C\\\u6E90\u7801\\GIT\\\u519C\u592B\u6797\u829D\\HH.WCS.Mobox3.NongFuLinZhi\\api\\AgvController.cs",
              "RelativeToolTip": "api\\AgvController.cs",
              "ViewState": "AgIAAAAAAAAAAAAAAADwvxMAAAAZAAAAAAAAAA==",
              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
              "WhenOpened": "2025-07-16T00:55:29.909Z",
              "EditorCaption": ""
              "WhenOpened": "2025-07-16T00:55:29.909Z"
            }
          ]
        },
HH.WCS.Mobox3.NongFuLinZhi/config/config.json
@@ -15,6 +15,7 @@
    "SqlServer1": "Data Source=192.168.1.198\\sql2008;Initial Catalog=OIMobox;User ID=sa;Password=sa@2015",
    "ApiPort": 8800,
    "TcpPort": 2024,
    "LQHours": 24,
    "FacCode": "0000",
    "WHCode": "W001",
    "DeviceInfo": [
HH.WCS.Mobox3.NongFuLinZhi/core/Monitor.cs
@@ -127,7 +127,7 @@
                        if(locInfo != null)
                        {
                            //生成任务
                            Location location = TaskProcess.BCPInOrOut(db, false, "瓶坯库区", a.S_ItemCode);
                            Location location = TaskProcess.BCPInOrOutTwo(db, "瓶坯库区", a.S_ItemCode);
                            if(location != null)
                            {
                                string cntrCode = getCntrCode(db,location);
HH.WCS.Mobox3.NongFuLinZhi/process/DeviceProcess.cs
@@ -886,17 +886,18 @@
                        else
                        {
                            string cntrCode = Guid.NewGuid().ToString("N");
                            string batch = workInfo.S_UsingNow == "Y" ? "即产" : "非即产";
                            var cntrInfo = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == deviceBit).First();
                            if(cntrInfo == null)
                            {
                                LogHelper.Info($"{type}注塑机上未绑定托盘,自动绑定托盘");
                                TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, "","","",workInfo.S_ItemName);
                                TaskProcess.BindLocCntr(deviceBit, cntrCode, workInfo.S_ItemCode, batch, "","",workInfo.S_ItemName);
                            }
                            else
                            {
                                cntrCode = cntrInfo.S_CNTR_CODE;
                                TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, "", "",workInfo.S_ItemName);
                                TaskProcess.BindCntrItem(cntrCode, workInfo.S_ItemCode, batch, "",workInfo.S_ItemName);
                            }
                            //创建作业
                            WMSHelper.CreateOpTask(deviceBit, "", "入库", taskType, cntrCode,"","",workInfo.S_WorkNo);
HH.WCS.Mobox3.NongFuLinZhi/process/TaskProcess.cs
@@ -1571,11 +1571,11 @@
        /// <param name="taskName"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        internal static Location BCPFullOut(SqlSugarClient db, string taskName, string itemCode)
        internal static Location BCPFullOut(SqlSugarClient db, string taskName, string itemCode,string batch)
        {
            Location result = null;
            LogHelper.Info($"瓶坯注塑满托下线:类型:{taskName},物料编码:{itemCode}");
            LogHelper.Info($"瓶坯注塑满托下线:类型:{taskName},物料编码:{itemCode},批次号:{batch}");
            if (taskName.Contains("即产"))
            {
                //注塑机即产即用下线,首先下线到即产即用满框线边,满眶线边满了,下到即产即用满框缓存区,满框缓存区满了,下到入库接驳堆叠位
@@ -2558,5 +2558,70 @@
            NDCApi.CancelOrder(TN_Task.S_CODE.Trim());
            OperateStatus(TN_Task, 7);
        }
        internal static Location BCPInOrOutTwo(SqlSugarClient db, string areaName, string itemCode)
        {
            Location result = null;
            var areaInfo = Settings.areaInfos.Where(a => a.areaName.Contains(areaName) && a.enable == 1).OrderByDescending(a => a.pri).ToList();
            if (areaInfo.Count > 0)
            {
                foreach (var it in areaInfo)
                {
                    LogHelper.Info($"瓶坯非即产满框转运:area:{it.areaName},itemCode:{itemCode}");
                    var locList = db.Queryable<Location>().Where(a => a.S_AREA_CODE == it.areaCode && a.N_CURRENT_NUM > 0).OrderBy(a => a.N_ROW).OrderByDescending(a => a.N_COL).Take(1).PartitionBy(a => a.N_ROW).Includes(a => a.LocCntrRel).ToList();
                    if (locList.Count > 0)
                    {
                        LogHelper.Info($"瓶坯非即产满框转运:查询到可出货位数量:{locList.Count}");
                        foreach (var a in locList)
                        {
                            LogHelper.Info($"瓶坯非即产满框转运:查询货位:{a.S_CODE},锁状态:{a.S_LOCK_STATE}");
                            if (a.S_LOCK_STATE == "无")
                            {
                                var cntrInfo = db.Queryable<LocCntrRel>().Where(b => b.S_LOC_CODE == a.S_CODE).First();
                                if (cntrInfo != null)
                                {
                                    LogHelper.Info($"瓶坯非即产满框转运:当前货位绑定的托盘码为:{cntrInfo.S_CNTR_CODE}");
                                    string endItemCode = "";
                                    var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
                                    if (itemInfo != null)
                                    {
                                        endItemCode = itemInfo.S_ITEM_CODE;
                                    }
                                    if (endItemCode == itemCode)
                                    {
                                        LogHelper.Info($"瓶坯非即产满框转运:当前货位绑定的物料编码为:{endItemCode},物料类型为:{itemInfo.S_BATCH_NO},绑定时间为:{itemInfo.T_CREATE}");
                                        if ((itemInfo.S_BATCH_NO == "非即产" && itemInfo.T_CREATE.AddHours(Settings.lQHours) <= DateTime.Now) || itemInfo.S_BATCH_NO == "即产")
                                        {
                                            //非即产瓶坯需要判断冷却时间是否大于一定时间
                                            //判断当前排有无锁
                                            var lockInfo = db.Queryable<Location>().Where(b => b.S_AREA_CODE == it.areaCode && b.N_ROW == a.N_ROW && (b.S_LOCK_STATE == "入库锁" || b.S_LOCK_STATE == "出库锁")).First();
                                            if (lockInfo == null)
                                            {
                                                result = a;
                                                break;
                                            }
                                            else
                                            {
                                                LogHelper.Info($"瓶坯非即产满框转运:当前排有锁,货位号:{lockInfo.S_CODE}");
                                            }
                                        }
                                    }
                                }
                            }
                        }
                    }
                    if (result != null)
                    {
                        break;
                    }
                }
            }
            else
            {
                LogHelper.Info($"瓶坯非即产满框转运:{areaName}未配置");
            }
            return result;
        }
    }
}
HH.WCS.Mobox3.NongFuLinZhi/util/Settings.cs
@@ -30,6 +30,7 @@
        public static string WHCode { get; set; }
        public static string FacCode { get; set; }
        public static int tcpPort { get; set; }
        public static int lQHours { get; set; }
        public static void Init()
        {
@@ -89,6 +90,10 @@
                            {
                                tcpPort = int.Parse(keyValue.Value.ToString());
                            }
                            if (keyValue.Name == "LQHours")
                            {
                                lQHours = int.Parse(keyValue.Value.ToString());
                            }
                            if (keyValue.Name == "ApiPort")
                            {
                                port = int.Parse(keyValue.Value.ToString());
HH.WCS.Mobox3.NongFuLinZhi/wms/WMSHelper.cs
@@ -733,7 +733,7 @@
                            var itemInfo = db.Queryable<CntrItemRel>().Where(b => b.S_CNTR_CODE == cntrInfo.S_CNTR_CODE).First();
                            if (itemInfo != null)
                            {
                                result = TaskProcess.BCPFullOut(db, a.S_OP_DEF_NAME, itemInfo.S_ITEM_CODE);
                                result = TaskProcess.BCPFullOut(db, a.S_OP_DEF_NAME, itemInfo.S_ITEM_CODE,itemInfo.S_BATCH_NO);
                            }
                        }
                    }