<add>添加拣货任务返回条码

2025-01-15 09:28:57 +08:00 · 2025-01-15 09:28:57 +08:00 · b625cd37dc
commit b625cd37dc
parent 92bbc387a8
18 changed files with 1669 additions and 22 deletions
--- a/WmsMobileServe/ApiServe/Mobile/Service/PickService.cs
+++ b/WmsMobileServe/ApiServe/Mobile/Service/PickService.cs
@ -15,8 +15,8 @@ public class PickService(TPickingGoodsDao pickingGoodsDao)
    public MobileApiResponse<List<TPickGoods>> GetPickTask(string? vehicleNo)
    {
        if (string.IsNullOrWhiteSpace(vehicleNo)) return MobileApiResponse<List<TPickGoods>>.Fail("请求参数错误");
-        List<TPickGoods>? result = pickingGoodsDao.SelectPickTask(vehicleNo);
-        if(result == default) return MobileApiResponse<List<TPickGoods>>.Fail("数据服务异常");
+        var result = pickingGoodsDao.SelectPickTask(vehicleNo);
+        if(result == null) return MobileApiResponse<List<TPickGoods>>.Fail("数据服务异常");
        if(result.Count < 1) return MobileApiResponse<List<TPickGoods>>.Fail("该托盘没有待检货物");
        return MobileApiResponse<List<TPickGoods>>.Success("成功", result);
    }
@ -27,13 +27,13 @@ public class PickService(TPickingGoodsDao pickingGoodsDao)
    {
        if (request.Count < 1) return MobileApiResponse.Fail("请求参数错误");
        List<(string? vehicleNo, string? goodsId, decimal? pickingNum)> pickData = [];
-        foreach (PickCompleteDto pickCompleteDto in request)
+        foreach (var pickCompleteDto in request)
        {
            var pickNum = pickCompleteDto.PickingNum;
            if(!pickNum.IsNumber()) pickNum = "0";
            pickData.Add((pickCompleteDto.VehicleNo, pickCompleteDto.GoodsId, Convert.ToDecimal(pickNum)));
        }
-        bool updateResult = pickingGoodsDao.PickComplete(pickData);
+        var updateResult = pickingGoodsDao.PickComplete(pickData);
        return updateResult ? MobileApiResponse.Success("完成") : MobileApiResponse.Fail("数据服务异常");
    }

--- a/WmsMobileServe/DataBase/Base/Po/TPickGoods.cs
+++ b/WmsMobileServe/DataBase/Base/Po/TPickGoods.cs
@ -10,63 +10,63 @@ namespace WmsMobileServe.DataBase.Base.Po;
 public class TPickGoods
 {
    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("pickingId")]
    [SugarColumn(ColumnName = "PICKINGID")]
    public string? PickingId { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("goodsId")]
    [SugarColumn(ColumnName = "GOOD_ID")]
    public string? GoodsId { get; set;}

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("goodsName")]
    [SugarColumn(ColumnName = "GOODS_NAME")]
    public string? GoodsName { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("vehicleNo")]
    [SugarColumn(ColumnName = "CTL")]
    public string? VehicleNo { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("location")]
    [SugarColumn(ColumnName = "LOC_ID")]
    public string? Location { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("miStockNum")]
    [SugarColumn(ColumnName = "MISTOCK_NUM")]
    public decimal? MiStockNum { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("pickingNum")]
    [SugarColumn(ColumnName = "PICKING_NUM")]
    public decimal? PickingNum { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("goodsNumSj")]
    [SugarColumn(ColumnName = "GOODS_NUM_SJ")]
    public decimal? GoodsNumSj { get; set; }

    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("status")]
    [SugarColumn(ColumnName = "STATUS")]
@ -74,12 +74,19 @@ public class TPickGoods


    /// <summary>
-    /// 
+    ///
    /// </summary>
    [JsonPropertyName("outStand")]
    [SugarColumn(ColumnName = "OUTSTAND")]
    public string? OutStand {  get; set; }

+    /// <summary>
+    ///
+    /// </summary>
+    [JsonPropertyName("barCode")]
+    [SugarColumn(ColumnName = "BARCODE")]
+    public string? BarCode { get; set; }
+



--- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs
+++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfo.cs
@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+98d129582dc00a1e2d765b1be04ba8400bf85d5f")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+92bbc387a84502ea1324bf99f374d21773d1a098")]
 [assembly: System.Reflection.AssemblyProductAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache
+++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.AssemblyInfoInputs.cache
@ -1 +1 @@
-5f336b83f61433ac5e0450a6e7207fa6646fc7abc556632634eab6785439c859
+2b2dd5cdd49ee0bef0732989838c0d301eefdd5ba36a3e08da61b7af941638ef
--- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.GeneratedMSBuildEditorConfig.editorconfig
+++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.GeneratedMSBuildEditorConfig.editorconfig
@ -1,4 +1,8 @@
 is_global = true
+build_property.EnableAotAnalyzer = 
+build_property.EnableSingleFileAnalyzer = 
+build_property.EnableTrimAnalyzer = 
+build_property.IncludeAllContentForSelfExtract = 
 build_property.TargetFramework = net8.0
 build_property.TargetPlatformMinVersion = 
 build_property.UsingMicrosoftNETSdkWeb = true
--- a/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.assets.cache
+++ b/WmsMobileServe/obj/Debug/net8.0/WmsMobileServe.assets.cache
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.AssemblyInfo.cs
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.AssemblyInfo.cs
@ -13,7 +13,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+98d129582dc00a1e2d765b1be04ba8400bf85d5f")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+92bbc387a84502ea1324bf99f374d21773d1a098")]
 [assembly: System.Reflection.AssemblyProductAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WmsMobileServe")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.AssemblyInfoInputs.cache
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.AssemblyInfoInputs.cache
@ -1 +1 @@
-110ccec4df1b3637143a65f422d9d2454348b0d739f794cda5fc5d4dff0c6639
+a398b7f1a12ed8f127f7ea063578cfb4226c284ac229b9a5035e4a3c165d49e6
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.dll
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.dll
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.pdb
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/WmsMobileServe.pdb
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/ref/WmsMobileServe.dll
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/ref/WmsMobileServe.dll
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/refint/WmsMobileServe.dll
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/refint/WmsMobileServe.dll
--- a/WmsMobileServe/obj/Release/net8.0/win-x64/singlefilehost.exe
+++ b/WmsMobileServe/obj/Release/net8.0/win-x64/singlefilehost.exe
--- a/WmsMobileServe/obj/WmsMobileServe.csproj.nuget.dgspec.json
+++ b/WmsMobileServe/obj/WmsMobileServe.csproj.nuget.dgspec.json
@ -60,6 +60,12 @@
              "target": "Package",
              "version": "[10.0.0, )"
            },
+            "Microsoft.NET.ILLink.Tasks": {
+              "suppressParent": "All",
+              "target": "Package",
+              "version": "[8.0.10, )",
+              "autoReferenced": true
+            },
            "Newtonsoft.Json": {
              "target": "Package",
              "version": "[13.0.3, )"
@ -80,6 +86,20 @@
          ],
          "assetTargetFallback": true,
          "warn": true,
+          "downloadDependencies": [
+            {
+              "name": "Microsoft.AspNetCore.App.Runtime.win-x64",
+              "version": "[8.0.10, 8.0.10]"
+            },
+            {
+              "name": "Microsoft.NETCore.App.Runtime.win-x64",
+              "version": "[8.0.10, 8.0.10]"
+            },
+            {
+              "name": "Microsoft.WindowsDesktop.App.Runtime.win-x64",
+              "version": "[8.0.10, 8.0.10]"
+            }
+          ],
          "frameworkReferences": {
            "Microsoft.AspNetCore.App": {
              "privateAssets": "none"
@ -90,6 +110,11 @@
          },
          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.403/PortableRuntimeIdentifierGraph.json"
        }
+      },
+      "runtimes": {
+        "win-x64": {
+          "#import": []
+        }
      }
    }
  }
--- a/WmsMobileServe/obj/WmsMobileServe.csproj.nuget.g.props
+++ b/WmsMobileServe/obj/WmsMobileServe.csproj.nuget.g.props
@ -7,10 +7,16 @@
    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\icewi\.nuget\packages\;D:\Microsoft\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.2</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion>
  </PropertyGroup>
  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
    <SourceRoot Include="C:\Users\icewi\.nuget\packages\" />
    <SourceRoot Include="D:\Microsoft\Microsoft Visual Studio\Shared\NuGetPackages\" />
  </ItemGroup>
+  <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <Import Project="$(NuGetPackageRoot)microsoft.net.illink.tasks\8.0.10\build\Microsoft.NET.ILLink.Tasks.props" Condition="Exists('$(NuGetPackageRoot)microsoft.net.illink.tasks\8.0.10\build\Microsoft.NET.ILLink.Tasks.props')" />
+  </ImportGroup>
+  <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <PkgMicrosoft_NET_ILLink_Tasks Condition=" '$(PkgMicrosoft_NET_ILLink_Tasks)' == '' ">C:\Users\icewi\.nuget\packages\microsoft.net.illink.tasks\8.0.10</PkgMicrosoft_NET_ILLink_Tasks>
+  </PropertyGroup>
 </Project>
--- a/WmsMobileServe/obj/project.assets.json
+++ b/WmsMobileServe/obj/project.assets.json
--- a/WmsMobileServe/obj/project.nuget.cache
+++ b/WmsMobileServe/obj/project.nuget.cache
@ -1,6 +1,6 @@
 {
  "version": 2,
-  "dgSpecHash": "r6nxaqgQZtw=",
+  "dgSpecHash": "tFBsU0px7EM=",
  "success": true,
  "projectFilePath": "F:\\AndriodProject\\2024_11_JinWang\\2024_11_JinWang_ChengPing\\WmsMobileServe\\WmsMobileServe\\WmsMobileServe.csproj",
  "expectedPackageFiles": [
@ -23,6 +23,7 @@
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.identitymodel.protocols\\6.35.0\\microsoft.identitymodel.protocols.6.35.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.identitymodel.protocols.openidconnect\\6.35.0\\microsoft.identitymodel.protocols.openidconnect.6.35.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.identitymodel.tokens\\6.35.0\\microsoft.identitymodel.tokens.6.35.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.net.illink.tasks\\8.0.10\\microsoft.net.illink.tasks.8.0.10.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.netcore.platforms\\5.0.0\\microsoft.netcore.platforms.5.0.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.netcore.targets\\1.1.3\\microsoft.netcore.targets.1.1.3.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.sqlserver.server\\1.0.0\\microsoft.sqlserver.server.1.0.0.nupkg.sha512",
@ -32,6 +33,16 @@
    "C:\\Users\\icewi\\.nuget\\packages\\npgsql\\5.0.18\\npgsql.5.0.18.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\oracle.manageddataaccess.core\\3.21.100\\oracle.manageddataaccess.core.3.21.100.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\oscar.data.sqlclient\\4.0.4\\oscar.data.sqlclient.4.0.4.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.collections\\4.3.0\\runtime.any.system.collections.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.globalization\\4.3.0\\runtime.any.system.globalization.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.io\\4.3.0\\runtime.any.system.io.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.reflection\\4.3.0\\runtime.any.system.reflection.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.reflection.primitives\\4.3.0\\runtime.any.system.reflection.primitives.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.resources.resourcemanager\\4.3.0\\runtime.any.system.resources.resourcemanager.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.runtime\\4.3.0\\runtime.any.system.runtime.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.text.encoding\\4.3.0\\runtime.any.system.text.encoding.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.any.system.threading.tasks\\4.3.0\\runtime.any.system.threading.tasks.4.3.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\runtime.win.system.runtime.extensions\\4.3.0\\runtime.win.system.runtime.extensions.4.3.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\sqlitepclraw.bundle_e_sqlite3\\2.1.6\\sqlitepclraw.bundle_e_sqlite3.2.1.6.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\sqlitepclraw.core\\2.1.6\\sqlitepclraw.core.2.1.6.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\sqlitepclraw.lib.e_sqlite3\\2.1.6\\sqlitepclraw.lib.e_sqlite3.2.1.6.nupkg.sha512",
@ -55,6 +66,7 @@
    "C:\\Users\\icewi\\.nuget\\packages\\system.memory\\4.5.4\\system.memory.4.5.4.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.memory.data\\1.0.2\\system.memory.data.1.0.2.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.numerics.vectors\\4.5.0\\system.numerics.vectors.4.5.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\system.private.uri\\4.3.0\\system.private.uri.4.3.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.reflection\\4.3.0\\system.reflection.4.3.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.reflection.emit.ilgeneration\\4.3.0\\system.reflection.emit.ilgeneration.4.3.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.reflection.emit.lightweight\\4.3.0\\system.reflection.emit.lightweight.4.3.0.nupkg.sha512",
@ -75,7 +87,10 @@
    "C:\\Users\\icewi\\.nuget\\packages\\system.text.regularexpressions\\4.3.1\\system.text.regularexpressions.4.3.1.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.threading.tasks\\4.3.0\\system.threading.tasks.4.3.0.nupkg.sha512",
    "C:\\Users\\icewi\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
-    "C:\\Users\\icewi\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512"
+    "C:\\Users\\icewi\\.nuget\\packages\\system.windows.extensions\\6.0.0\\system.windows.extensions.6.0.0.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.netcore.app.runtime.win-x64\\8.0.10\\microsoft.netcore.app.runtime.win-x64.8.0.10.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.windowsdesktop.app.runtime.win-x64\\8.0.10\\microsoft.windowsdesktop.app.runtime.win-x64.8.0.10.nupkg.sha512",
+    "C:\\Users\\icewi\\.nuget\\packages\\microsoft.aspnetcore.app.runtime.win-x64\\8.0.10\\microsoft.aspnetcore.app.runtime.win-x64.8.0.10.nupkg.sha512"
  ],
  "logs": []
 }
--- a/WmsMobileServe/obj/rider.project.model.nuget.info
+++ b/WmsMobileServe/obj/rider.project.model.nuget.info
@ -1 +1 @@
-17368298849277209
+17368993158563419