原材料仓逻辑、看板调整

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

@@ -251,5 +251,15 @@ public class ModuleConsts
     /// 模块标识-生产入库单
     /// </summary>
     public const string MODULE_WMSPRDINSTOCK_ID = "34467501190677";
+    /// <summary>
+    ///   模块标识-委外收货 todo
+    /// </summary>
+    public const string MODULE_WMSOUTSOURCEORDER_ID = "MODULE_WMSOUTSOURCEORDER_ID";//
+    /// <summary>
+    ///   模块标识-原材料调拨入库 todo
+    /// </summary>
+    public const string MODULE_WMSRAWMATTRANSFERINSTOCK_ID = "MODULE_WMSRAWMATTRANSFERINSTOCK_ID";//
+
+    
 
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs

@@ -113,6 +113,14 @@
         /// 采购收料物料流水号
         /// </summary>
         public const string WMS_PURCHASE_MAT_ENCODE = "PurchaseMat";
+        /// <summary>
+        /// 委外收料物料流水号
+        /// </summary>
+        public const string WMS_OUTSOURCE_MAT_ENCODE = "OutsourceMat";
+        /// <summary>
+        /// 原材料调拨入库物料流水号
+        /// </summary>
+        public const string WMS_TRANSFER_RAWMAT_ENCODE = "RawMatTransfer";
         /// 齐套出库生成Encode
         /// </summary>
         public const string WMS_KITTINGOUTSTK_ENCODE = "WmsKittingOutStk";
@@ -395,7 +403,22 @@
         /// 单据类型-生产入库单
         /// </summary>
         public const string BILLTYPE_PRDINSTOCK_ID = "27410834411541";
-        
+
+
+        /// <summary>
+        /// 单据类型-采购收货
+        /// </summary>
+        public const string BILLTYPE_PURCHASE_ID = "35882440181525";
+
+        /// <summary>
+        /// 单据类型-委外收货
+        /// </summary>
+        public const string BILLTYPE_OUTSOURCE_ID = "35882444276245";
+
+        /// <summary>
+        /// 单据类型-原材料调拨入库
+        /// </summary>
+        public const string BILLTYPE_RAWMATTRANSFERINSTOCK_ID = "35882449537813";
         /// <summary>
         /// 管理员Id（天益4厂管理员）
         /// </summary>

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Outputs/LocationOutput.cs

@@ -13,8 +13,15 @@ namespace Tnb.WarehouseMgr.Entities.Dto
         public int layers { get; set; }
         public string carry_code { get; set; }
         public string material_code { get; set; }
+        public string material_name { get; set; }
         public string code_batch { get; set; }
         public decimal num { get; set; }
+        /// <summary>
+        /// 0 空库（包括已锁定）1 空载具码垛 2 合格品 3 待检 4 让步接受 5 不合格
+        /// </summary>
+        public int status { get; set; }
+        /// </summary>
+        public string barcode { get; set; }
     }
     public class ZsjOutput
     {

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceD.cs

@@ -8,9 +8,9 @@ namespace Tnb.WarehouseMgr.Entities.Entity;
 /// 委外订单表子表
 /// </summary>
 [SugarTable("wms_outsource_order_d")]
-public partial class WmsOutsourceOrderD : BaseEntity<string>
+public partial class WmsOutsourceD : BaseEntity<string>
 {
-    public WmsOutsourceOrderD()
+    public WmsOutsourceD()
     {
         id = SnowflakeIdHelper.NextId();
     }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceH.cs

@@ -8,14 +8,14 @@ namespace Tnb.WarehouseMgr.Entities.Entity;
 /// 委外订单
 /// </summary>
 [SugarTable("wms_outsource_order_h")]
-public partial class WmsOutsourceOrderH : BaseEntity<string>
+public partial class WmsOutsourceH : BaseEntity<string>
 {
-    public WmsOutsourceOrderH()
+    public WmsOutsourceH()
     {
         id = SnowflakeIdHelper.NextId();
     }
     /// <summary>
-    /// 采购订单号
+    /// 委外订单号
     /// </summary>
     public string? outsource_order { get; set; }
 

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseD.cs

@@ -108,4 +108,9 @@ public partial class WmsPurchaseD : BaseEntity<string>
     /// </summary>
     [SugarColumn(IsIgnore = true)]
     public string? container_no { get; set; }
+
+    /// <summary>
+    /// 质检结果
+    /// </summary>
+    public string? qc_res { get; set; }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockD.cs

@@ -0,0 +1,122 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 原材料调拨入库表子表
+/// </summary>
+[SugarTable("wms_rawmat_transferinstock_d")]
+public partial class WmsRawmatTransferinstockD : BaseEntity<string>
+{
+    public WmsRawmatTransferinstockD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 主表id
+    /// </summary>
+    public string? bill_id { get; set; }
+
+    /// <summary>
+    /// 物料id
+    /// </summary>
+    public string? matcode_id { get; set; }
+
+    /// <summary>
+    /// 物料编号
+    /// </summary>
+    public string? matcode { get; set; }
+
+    /// <summary>
+    /// 物料描述
+    /// </summary>
+    public string? matspecification { get; set; }
+
+    /// <summary>
+    /// 单位
+    /// </summary>
+    public string? unit { get; set; }
+
+    /// <summary>
+    /// 入库数量
+    /// </summary>
+    public decimal? qty { get; set; }
+
+    /// <summary>
+    /// 实入数量
+    /// </summary>
+    public decimal? actual_qty { get; set; }
+
+    /// <summary>
+    /// 库存地点ID
+    /// </summary>
+    public string? stock_location_id { get; set; }
+
+    /// <summary>
+    /// 库存地点
+    /// </summary>
+    public string? stock_location { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    public string? code_batch { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 交货日期
+    /// </summary>
+    public string? delivery_date { get; set; }
+
+    /// <summary>
+    /// 净价
+    /// </summary>
+    public string? net_price { get; set; }
+
+    /// <summary>
+    /// 货币
+    /// </summary>
+    public string? currency { get; set; }
+
+    /// <summary>
+    /// 工厂
+    /// </summary>
+    public string? factory { 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>
+    /// erp_line_pk
+    /// </summary>
+    public string? erp_line_pk { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsRawmatTransferinstockH.cs

@@ -0,0 +1,112 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 原材料调拨入库
+/// </summary>
+[SugarTable("wms_rawmat_transferinstock_h")]
+public partial class WmsRawmatTransferinstockH : BaseEntity<string>
+{
+    public WmsRawmatTransferinstockH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 原材料调拨入库单号
+    /// </summary>
+    public string? bill_code { get; set; }
+
+    /// <summary>
+    /// 联系人
+    /// </summary>
+    public string? contact_person { get; set; }
+
+    /// <summary>
+    /// 电话
+    /// </summary>
+    public string? tel { get; set; }
+
+    /// <summary>
+    /// 出库组织id
+    /// </summary>
+    public string? outstockorg_id { get; set; }
+
+    /// <summary>
+    /// 出库组织编号
+    /// </summary>
+    public string? outstockorg_code { get; set; }
+
+    /// <summary>
+    /// 出库组织名称
+    /// </summary>
+    public string? outstockorg_name { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? remark { get; set; }
+
+    /// <summary>
+    /// 扩展字段
+    /// </summary>
+    public string? extras { get; set; }
+
+    /// <summary>
+    /// 时间戳
+    /// </summary>
+    public string? time_stamp { get; set; }
+
+    /// <summary>
+    /// 单据类型
+    /// </summary>
+    public string? document_type { 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 string? org_id { get; set; }
+
+    /// <summary>
+    /// 流程任务Id
+    /// </summary>
+    public string? f_flowtaskid { get; set; }
+
+    /// <summary>
+    /// 流程引擎Id
+    /// </summary>
+    public string? f_flowid { get; set; }
+
+    /// <summary>
+    /// erp_pk
+    /// </summary>
+    public string? erp_pk { get; set; }
+
+    /// <summary>
+    /// erp_bill_code
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTempCode.cs

@@ -111,5 +111,9 @@ public partial class WmsTempCode : BaseEntity<string>
     /// 规格型号
     /// </summary>
     public string? container_no { get; set; }
+    /// <summary>
+    /// 需求单据类型
+    /// </summary>
+    public string? required_type { get; set; }
 
 }