解决冲突

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

@@ -0,0 +1,130 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
+{
+    public class SaleReturnInput
+    {
+        /// <summary>
+        /// 入库仓库ID
+        /// </summary>
+        public string? warehouse { get; set; }
+
+        /// <summary>
+        /// 供应商代码
+        /// </summary>
+        public string? supplier_code { get; set; }
+ 
+        /// <summary>
+        /// 打印状态
+        /// </summary>
+        public string print_status { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 库位
+        /// </summary>
+        public string? location { get; set; }
+
+        /// <summary>
+        /// 来源单据ID
+        /// </summary>
+        public string? source_id { get; set; }
+
+        /// <summary>
+        /// 来源单据代码
+        /// </summary>
+        public string? source_code { get; set; }
+
+        /// <summary>
+        /// 源单单据类型
+        /// </summary>
+        public int? source_type { get; set; }
+
+        /// <summary>
+        /// 来源单据行号
+        /// </summary>
+        public int? source_line { get; set; }
+
+        /// <summary>
+        /// 来源单据明细ID
+        /// </summary>
+        public string? source_detail_id { get; set; }
+
+        /// <summary>
+        /// 采购单号
+        /// </summary>
+        public string purchase_code { get; set; }
+
+        public List<SaleReturnDetail> details { get; set; }
+    }
+    public class SaleReturnDetail
+    {
+        /// <summary>
+        /// 物品代码
+        /// </summary>
+        public string material_code { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 入库需求数量
+        /// </summary>
+        public decimal? pr_qty { get; set; }
+
+        /// <summary>
+        /// 实际入库数量
+        /// </summary>
+        public decimal qty { get; set; }
+
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string? reason { get; set; }
+
+        /// <summary>
+        /// 入库仓库ID
+        /// </summary>
+        public string? warehouse { get; set; }
+
+        /// <summary>
+        /// 不含税单价
+        /// </summary>
+        public decimal? price { get; set; }
+
+        /// <summary>
+        /// 含税单价
+        /// </summary>
+        public decimal? tax_price { get; set; }
+
+        /// <summary>
+        /// 不含税金额
+        /// </summary>
+        public decimal? amount { get; set; }
+
+        /// <summary>
+        /// 含税金额
+        /// </summary>
+        public decimal? all_amount { get; set; }
+
+        /// <summary>
+        /// 已打印数量
+        /// </summary>
+        public decimal print_qty { get; set; }
+
+        /// <summary>
+        /// 扫描数量
+        /// </summary>
+        public decimal scan_qty { get; set; }
+
+        /// <summary>
+        /// 批次
+        /// </summary>
+        public string? code_batch { get; set; }
+
+        /// <summary>
+        /// 箱号
+        /// </summary>
+        public string? container_no { get; set; }
+    }
+}

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

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
+{
+    public class CheckPutInput
+    {
+        public string point_code { get; set; }
+    }
+}