Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs

@@ -156,5 +156,9 @@ public class ModuleConsts
     /// 模块标识-盘点任务       
     /// </summary>
     public const string MODULE_WMSCHECKTASK_ID = "27582377555221";
+    /// <summary>
+    /// 模块标识-库存报表
+    /// </summary>
+    public const string MODULE_WMSSTOCKREPORT_ID = "27895417124373";
 
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsStockReportCode.cs

@@ -0,0 +1,87 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities;
+
+/// <summary>
+/// 库存报表条码表
+/// </summary>
+[SugarTable("wms_stock_report_code")]
+public partial class WmsStockReportCode : BaseEntity<string>
+{
+    public WmsStockReportCode()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 主表ID
+    /// </summary>
+    public string? report_id { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编号
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 物料ID
+    /// </summary>
+    public string? material_id { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    public string? material_code { get; set; }
+
+    /// <summary>
+    /// 条码编号
+    /// </summary>
+    public string? barcode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? code_batch { get; set; }
+
+    /// <summary>
+    /// 条码数量
+    /// </summary>
+    public decimal? codeqty { get; set; }
+
+    /// <summary>
+    /// 单位ID
+    /// </summary>
+    public string? unit_id { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 修改用户
+    /// </summary>
+    public string? modify_id { get; set; }
+
+    /// <summary>
+    /// 修改时间
+    /// </summary>
+    public DateTime? modify_time { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public DateTime? time_stamp { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr/WmsStockReportService.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.VisualDev;
+
+namespace Tnb.WarehouseMgr
+{
+    /// <summary>
+    /// 库存报表服务类
+    /// </summary>
+    [OverideVisualDev(ModuleConsts.MODULE_WMSSTOCKREPORT_ID)]
+    public class WmsStockReportService:BaseWareHouseService
+    {
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs

@@ -135,7 +135,7 @@ namespace Tnb.WarehouseMgr
                                 setSortingH.kittingout_id = ko.id;
                                 setSortingH.seq = ko.seq;
                                 setSortingH.org_id = curUser.FindFirst(ClaimConst.CLAINMORGID)?.Value;
-                                setSortingH.create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)?.Value;
+                                setSortingH.create_id = curUser.FindFirst(ClaimConst.CLAINMUSERID)?.Value!;
                                 setSortingH.create_time = DateTime.Now;
                                 await curDb.Insertable(setSortingH).ExecuteCommandAsync();