merge from 2023-03-14

extend/Tnb.Extend.Entitys/Dto/Customer/CustomerListOutput.cs

@@ -0,0 +1,41 @@
+using JNPF.DependencyInjection;
+using SqlSugar;
+
+namespace JNPF.Extend.Entitys.Dto.Customer;
+
+/// <summary>
+/// 客户信息.
+/// </summary>
+[SuppressSniffer]
+public class CustomerListOutput
+{
+    /// <summary>
+    /// 主键.
+    /// </summary>
+    public string id { get; set; }
+
+    /// <summary>
+    /// 客户编号.
+    /// </summary>
+    public string code { get; set; }
+
+    /// <summary>
+    /// 客户名称.
+    /// </summary>
+    public string customerName { get; set; }
+
+    /// <summary>
+    /// 地址.
+    /// </summary>
+    public string address { get; set; }
+
+    /// <summary>
+    /// 名称.
+    /// </summary>
+    public string name { get; set; }
+
+    /// <summary>
+    /// 联系方式.
+    /// </summary>
+    public string contactTel { get; set; }
+}

extend/Tnb.Extend.Entitys/Dto/Product/ProductCrInput.cs

@@ -1,4 +1,5 @@
 using JNPF.DependencyInjection;
+using JNPF.Extend.Entitys.Dto.ProductEntry;
 
 namespace JNPF.Extend.Entitys.Dto.Product;
 
@@ -106,5 +107,5 @@ public class ProductCrInput
     /// <summary>
     /// 子表数据.
     /// </summary>
-    public List<ProductEntryEntity> productEntryList { get; set; }
+    public List<ProductEntryCrInput> productEntryList { get; set; }
 }

extend/Tnb.Extend.Entitys/Dto/ProductEntry/ProductEntryCrInput.cs

@@ -0,0 +1,60 @@
+using JNPF.DependencyInjection;
+
+namespace JNPF.Extend.Entitys.Dto.ProductEntry;
+
+/// <summary>
+/// 新建产品明细.
+/// </summary>
+[SuppressSniffer]
+public class ProductEntryCrInput
+{
+    /// <summary>
+    /// 主键.
+    /// </summary>
+    public string? id { get; set; }
+
+    /// <summary>
+    /// 产品编号.
+    /// </summary>
+    public string productCode { get; set; }
+
+    /// <summary>
+    /// 产品名称.
+    /// </summary>
+    public string productName { get; set; }
+
+    /// <summary>
+    /// 产品规格.
+    /// </summary>
+    public string productSpecification { get; set; }
+
+    /// <summary>
+    /// 数量.
+    /// </summary>
+    public int qty { get; set; }
+
+    /// <summary>
+    /// 订货类型.
+    /// </summary>
+    public string type { get; set; }
+
+    /// <summary>
+    /// 单价.
+    /// </summary>
+    public decimal money { get; set; }
+
+    /// <summary>
+    /// 折后单价.
+    /// </summary>
+    public decimal price { get; set; }
+
+    /// <summary>
+    /// 金额.
+    /// </summary>
+    public decimal amount { get; set; }
+
+    /// <summary>
+    /// 备注.
+    /// </summary>
+    public string description { get; set; }
+}

extend/Tnb.Extend.Entitys/Dto/ProductEntry/ProductEntryInfoOutput.cs

@@ -8,6 +8,11 @@ namespace JNPF.Extend.Entitys.Dto.ProductEntry;
 [SuppressSniffer]
 public class ProductEntryInfoOutput
 {
+    /// <summary>
+    /// 主键.
+    /// </summary>
+    public string id { get; set; }
+
     /// <summary>
     /// 产品编号.
     /// </summary>

extend/Tnb.Extend.Entitys/Dto/ProductGoods/ProductGoodsListOutput.cs

@@ -0,0 +1,50 @@
+using JNPF.DependencyInjection;
+
+namespace JNPF.Extend.Entitys.Dto.ProductGoods;
+
+/// <summary>
+/// 产品列表.
+/// </summary>
+[SuppressSniffer]
+public class ProductGoodsListOutput
+{
+    /// <summary>
+    /// 主键.
+    /// </summary>
+    public string id { get; set; }
+
+    /// <summary>
+    /// 分类主键.
+    /// </summary>
+    public string classifyId { get; set; }
+
+    /// <summary>
+    /// 订单编号.
+    /// </summary>
+    public string code { get; set; }
+
+    /// <summary>
+    /// 订单名称.
+    /// </summary>
+    public string fullName { get; set; }
+
+    /// <summary>
+    /// 订单名称.
+    /// </summary>
+    public int qty { get; set; }
+
+    /// <summary>
+    /// 订货类型.
+    /// </summary>
+    public string type { get; set; }
+
+    /// <summary>
+    /// 金额.
+    /// </summary>
+    public string amount { get; set; }
+
+    /// <summary>
+    /// 单价.
+    /// </summary>
+    public string money { get; set; }
+}

extend/Tnb.Extend.Entitys/Dto/ProductGoods/ProductGoodsListQueryInput.cs

@@ -0,0 +1,26 @@
+using JNPF.Common.Filter;
+using JNPF.DependencyInjection;
+
+namespace JNPF.Extend.Entitys.Dto.ProductGoods;
+
+/// <summary>
+/// 产品列表.
+/// </summary>
+[SuppressSniffer]
+public class ProductGoodsListQueryInput : PageInputBase
+{
+    /// <summary>
+    /// 订单编号.
+    /// </summary>
+    public string code { get; set; }
+
+    /// <summary>
+    /// 产品名称.
+    /// </summary>
+    public string fullName { get; set; }
+
+    /// <summary>
+    /// 分类ID.
+    /// </summary>
+    public string classifyId { get; set; }
+}