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

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

@@ -9,5 +9,15 @@
         /// 分拣任务id
         /// </summary>
         public string? source_id { get; set; }
+
+        /// <summary>
+        /// 转移托盘
+        /// </summary>
+        public int? change_carry { get; set; }
+
+        /// <summary>
+        /// 新托盘
+        /// </summary>
+        public string? new_carrycode { get; set; }
     }
 }

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

@@ -0,0 +1,145 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tnb.WarehouseMgr.Entities.Entity;
+
+namespace Tnb.WarehouseMgr.Entities.Dto
+{
+    /// <summary>
+    /// 委外收货编辑输入参数
+    /// </summary>
+    public class OutsourceEditInput
+    {
+        
+        public string bill_code { get; set; }
+        
+        /// <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; }
+
+        /// <summary>
+        /// 交易类型
+        /// </summary>
+        public string? transaction_type { get; set; }
+
+        /// <summary>
+        /// erp到货单主表pk
+        /// </summary>
+        public string? erp_arriveorder_pk { get; set; }
+
+        /// <summary>
+        /// 制单方式(自制 同步)
+        /// </summary>
+        public string? make_method { get; set; }
+
+        /// <summary>
+        /// erp流水号
+        /// </summary>
+        public string? service_num { get; set; }
+
+        public List<WmsOutsourceD> details { get; set; } = new();
+    }
+}