材料出库、调拨查询重写;采购退料；生成条码接口

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

@@ -137,6 +137,10 @@ public class ModuleConsts
     /// </summary>
     public const string MODULE_WmsRawmatTransferoutstock_ID = "MODULE_WmsRawmatTransferoutstock_ID";
     /// <summary>
+    ///   模块标识-采购退货  todo
+    /// </summary>
+    public const string MODULE_WmsPurchaseReturn_ID = "MODULE_WmsPurchaseReturn_ID";
+    /// <summary>
     ///   模块标识-材料出库单  todo
     /// </summary>
     public const string MODULE_WmsRawmatOutstock_ID = "MODULE_WmsRawmatOutstock_ID";

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

@@ -290,6 +290,14 @@
         /// </summary>
         public const string BIZTYPE_WMSINSTOCK_ID = "26191496816421";
         /// <summary>
+        ///   预任务生成业务类型-原材料委外入库
+        /// </summary>
+        public const string BIZTYPE_OUTSOURCE_ID = "36366312756501";
+        /// <summary>
+        ///   预任务生成业务类型-原材料调拨入库
+        /// </summary>
+        public const string BIZTYPE_RAWMATTRANSFERINSTOCK_ID = "36366317804821";
+        /// <summary>
         ///   预任务生成业务类型-一般出库
         /// </summary>
         public const string BIZTYPE_WMSOUTSTOCK_ID = "26191522660645";
@@ -318,7 +326,7 @@
         /// </summary>
         public const string BIZTYPE_WMSSALERELEASE_ID = "25104446664213";
         /// <summary>
-        ///   预任务生成业务类型-原材料转库单 todo
+        ///   预任务生成业务类型-原材料转库单 
         /// </summary>
         public const string BIZTYPE_WMSMATERIALTRANSFER_ID = "34354738929685";
         /// <summary>
@@ -326,6 +334,10 @@
         /// </summary>
         public const string BIZTYPE_WmsRawmatTransferoutstock_ID = "36318854044437";
         /// <summary>
+        ///   预任务生成业务类型-采购退库(原材料)
+        /// </summary>
+        public const string BIZTYPE_WmsPurchaseReturn_ID = "36367919005717";
+        /// <summary>
         ///   预任务生成业务类型-原材料仓材料出库单
         /// </summary>
         public const string BIZTYPE_WmsRawmatOutstock_ID = "36340105558037";

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/PurchaseReturnInput.cs

@@ -0,0 +1,34 @@
+using Tnb.WarehouseMgr.Entities.Consts;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 库房业务更新输入参数
+    /// </summary>
+    public class PurchaseReturnInput
+    {
+        /// <summary>
+        /// 组织ID
+        /// </summary>
+        public string org_id { get; set; } = WmsWareHouseConst.AdministratorOrgId;
+        /// <summary>
+        /// 创建用户
+        /// </summary>
+        public string create_id { get; set; }
+
+        /// <summary>
+        /// 来源单据id
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 载具
+        /// </summary>
+        public List<PurchaseReturnDetailInput> carrys { get; set; }
+    }
+
+    public class PurchaseReturnDetailInput
+    {
+        public string carry_code { get; set; }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseReturnC.cs

@@ -0,0 +1,77 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 采购退货单载具表
+/// </summary>
+[SugarTable("wms_purchase_return_c")]
+public partial class WmsPurchaseReturnC : BaseEntity<string>
+{
+    public WmsPurchaseReturnC()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 采购退货单id
+    /// </summary>
+    public string? bill_id { get; set; }
+
+    /// <summary>
+    /// 载具ID
+    /// </summary>
+    public string? carry_id { get; set; }
+
+    /// <summary>
+    /// 载具编号
+    /// </summary>
+    public string? carry_code { get; set; }
+
+    /// <summary>
+    /// 创建用户
+    /// </summary>
+    public string? create_id { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime? create_time { get; set; }
+
+    /// <summary>
+    /// 终点库位id
+    /// </summary>
+    public string? endlocation_id { get; set; }
+
+    /// <summary>
+    /// 终点库位编码
+    /// </summary>
+    public string? endlocation_code { get; set; }
+
+    /// <summary>
+    /// 起点库位id
+    /// </summary>
+    public string? startlocation_id { get; set; }
+
+    /// <summary>
+    /// 起点库位编码
+    /// </summary>
+    public string? startlocation_code { get; set; }
+
+    /// <summary>
+    /// 采购退货单明细id
+    /// </summary>
+    public string? mat_bill_id { get; set; }
+
+    /// <summary>
+    /// 载具数量
+    /// </summary>
+    public decimal? qty { get; set; }
+
+    /// <summary>
+    /// 签收数量
+    /// </summary>
+    public decimal? sign_qty { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseReturnD.cs

@@ -0,0 +1,96 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 采购退货子表
+/// </summary>
+[SugarTable("wms_purchase_return_d")]
+public partial class WmsPurchaseReturnD : BaseEntity<string>
+{
+    public WmsPurchaseReturnD()
+    {
+        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>
+    /// 批次
+    /// </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? 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; }
+
+    /// <summary>
+    /// 行号
+    /// </summary>
+    public string? lineno { get; set; }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseReturnH.cs

@@ -0,0 +1,127 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 采购退货
+/// </summary>
+[SugarTable("wms_purchase_return_h")]
+public partial class WmsPurchaseReturnH : BaseEntity<string>
+{
+    public WmsPurchaseReturnH()
+    {
+        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>
+    /// 备注
+    /// </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>
+    /// 部门编码
+    /// </summary>
+    public string? dept_code { get; set; }
+
+    /// <summary>
+    /// 业务员编码
+    /// </summary>
+    public string? biller { get; set; }
+
+    /// <summary>
+    /// 下发状态
+    /// </summary>
+    public string? issuance_status { get; set; }
+
+    /// <summary>
+    /// 采购订单
+    /// </summary>
+    public string? purchase_order { get; set; }
+
+    /// <summary>
+    /// 出库类型（BIP）
+    /// </summary>
+    public string? outstock_type { get; set; }
+
+    /// <summary>
+    /// 出库仓库
+    /// </summary>
+    public string? warehouse_code { get; set; }
+
+    /// <summary>
+    /// erp_pk
+    /// </summary>
+    public string? erp_pk { get; set; }
+
+    /// <summary>
+    /// erp_bill_code
+    /// </summary>
+    public string? erp_bill_code { get; set; }
+
+}