委外订单接口，原材料移库策略调整

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

@@ -537,5 +537,10 @@
         /// 原材料八工位待入库
         /// </summary>
         public const string LOCATION_YCLBGWDRK = "35750287617301";
+
+        /// <summary>
+        /// 原材料仓内转移策略
+        /// </summary>
+        public const string POLICY_YCLINSTOCK = "WISP202407250001";
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/ErpInputs/OutsourceOrderInput.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class OutsourceOrderInput
+    {
+        /// <summary>
+        /// 单号
+        /// </summary>
+        public string? outsource_order { get; set; }
+
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string? contact_person { get; set; }
+
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string? tel { get; set; }
+
+        /// <summary>
+        /// 供应商编号
+        /// </summary>
+        public string? supplier_code { get; set; }
+
+        /// <summary>
+        /// 凭证日期
+        /// </summary>
+        public DateTime? certificate_date { get; set; }
+
+        /// <summary>
+        /// 供货日期
+        /// </summary>
+        public DateTime? ship_date { get; set; }
+
+        /// <summary>
+        /// 主表pk
+        /// </summary>
+        public string? erp_pk { get; set; }
+
+        public List<OutsourceOrderDetail> details { get; set; }
+    }
+    public class OutsourceOrderDetail
+    {
+        /// <summary>
+        /// 行号
+        /// </summary>
+        public string? lineno { get; set; }
+
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string? material_code { get; set; }
+
+        /// <summary>
+        /// 单位代码
+        /// </summary>
+        public string? unit_code { get; set; }
+
+        /// <summary>
+        /// 委外数量
+        /// </summary>
+        public decimal? outsource_quantity { get; set; }
+
+        /// <summary>
+        /// 库存地点编号
+        /// </summary>
+        public string? stock_location { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 交货日期
+        /// </summary>
+        public DateTime? delivery_date { get; set; }
+
+        /// <summary>
+        /// 子表主键
+        /// </summary>
+        public string erp_line_pk { get; set; }
+    }
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/InStockStrategyQuery.cs

@@ -31,5 +31,8 @@
 
         // 巷道
         public string passage { get; set; }
+
+        // 策略编号
+        public string PolicyCode { get; set; }
     }
 }

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsOutsourceOrderD.cs

@@ -0,0 +1,122 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 委外订单表子表
+/// </summary>
+[SugarTable("wms_outsource_order_d")]
+public partial class WmsOutsourceOrderD : BaseEntity<string>
+{
+    public WmsOutsourceOrderD()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 主表id
+    /// </summary>
+    public string? fk_wms_outsource_order_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? outsource_quantity { get; set; }
+
+    /// <summary>
+    /// 实收数量
+    /// </summary>
+    public decimal? actual_quantity { 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/WmsOutsourceOrderH.cs

@@ -0,0 +1,122 @@
+using JNPF.Common.Contracts;
+using JNPF.Common.Security;
+using SqlSugar;
+
+namespace Tnb.WarehouseMgr.Entities.Entity;
+
+/// <summary>
+/// 委外订单
+/// </summary>
+[SugarTable("wms_outsource_order_h")]
+public partial class WmsOutsourceOrderH : BaseEntity<string>
+{
+    public WmsOutsourceOrderH()
+    {
+        id = SnowflakeIdHelper.NextId();
+    }
+    /// <summary>
+    /// 采购订单号
+    /// </summary>
+    public string? outsource_order { get; set; }
+
+    /// <summary>
+    /// 联系人
+    /// </summary>
+    public string? contact_person { get; set; }
+
+    /// <summary>
+    /// 电话
+    /// </summary>
+    public string? tel { get; set; }
+
+    /// <summary>
+    /// 供应商ID
+    /// </summary>
+    public string? supplier_id { get; set; }
+
+    /// <summary>
+    /// 供应商编号
+    /// </summary>
+    public string? supplier_code { get; set; }
+
+    /// <summary>
+    /// 供应商名称
+    /// </summary>
+    public string? supplier_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? certificate_date { 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; }
+
+    /// <summary>
+    /// 供货日期
+    /// </summary>
+    public DateTime? ship_date { get; set; }
+
+}

WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsPurchaseOrderD.cs

@@ -42,12 +42,12 @@ public partial class WmsPurchaseOrderD : BaseEntity<string>
     /// <summary>
     /// 采购数量
     /// </summary>
-    public string? purchase_quantity { get; set; }
+    public decimal? purchase_quantity { get; set; }
 
     /// <summary>
     /// 实收数量
     /// </summary>
-    public string? actual_quantity { get; set; }
+    public decimal? actual_quantity { get; set; }
 
     /// <summary>
     /// 库存地点ID