数据表调整

BBWYB.Server.Model/Db/Order/OrderPurchaseInfo.cs

@@ -56,35 +56,35 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         public long? ShopId { get; set; }
 
-        /// <summary>
-        /// 우뒵데뵀
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string WaybillNo { get; set; }
-
-        /// <summary>
-        /// 覩迦우뒵무鱇츰냔
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string SourceExpressName { get; set; }
-
-        /// <summary>
-        /// 覩迦우뒵무鱇Id
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string SourceExpressId { get; set; }
-
-        /// <summary>
-        /// 커깃우뒵무鱇츰냔
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string TargetExpressName { get; set; }
-
-        /// <summary>
-        /// 커깃우뒵무鱇Id
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string TargetExpressId { get; set; }
+        ///// <summary>
+        ///// 우뒵데뵀
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string WaybillNo { get; set; }
+
+        ///// <summary>
+        ///// 覩迦우뒵무鱇츰냔
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string SourceExpressName { get; set; }
+
+        ///// <summary>
+        ///// 覩迦우뒵무鱇Id
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string SourceExpressId { get; set; }
+
+        ///// <summary>
+        ///// 커깃우뒵무鱇츰냔
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string TargetExpressName { get; set; }
+
+        ///// <summary>
+        ///// 커깃우뒵무鱇Id
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string TargetExpressId { get; set; }
 
         /// <summary>
         /// 백橄땐데Sku

BBWYB.Server.Model/Db/Order/OrderPurchaseSkuInfo.cs

@@ -16,17 +16,17 @@ namespace BBWYB.Server.Model.Db
         [Column(DbType = "datetime")]
         public DateTime? CreateTime { get; set; }
 
-        /// <summary>
-        /// 物流变更时间
-        /// </summary>
-        [Column(DbType = "datetime")]
-        public DateTime? ExpressChangeTime { get; set; }
+        ///// <summary>
+        ///// 物流变更时间
+        ///// </summary>
+        //[Column(DbType = "datetime")]
+        //public DateTime? ExpressChangeTime { get; set; }
 
-        /// <summary>
-        /// 物流状态
-        /// </summary>
-        [Column(StringLength = 100)]
-        public string ExpressState { get; set; }
+        ///// <summary>
+        ///// 物流状态
+        ///// </summary>
+        //[Column(StringLength = 100)]
+        //public string ExpressState { get; set; }
 
         /// <summary>
         /// 店铺订单Id
@@ -57,6 +57,11 @@ namespace BBWYB.Server.Model.Db
         /// </summary>
         public long? ShopId { get; set; }
 
+        /// <summary>
+        /// 快递单
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string WaybillNo { get; set; }
     }
 
 }

BBWYB.Server.Model/Db/Order/PurchaseExpressOrder.cs

@@ -0,0 +1,78 @@
+using FreeSql.DataAnnotations;
+
+namespace BBWYB.Server.Model.Db
+{
+
+    /// <summary>
+    /// 采购快递单表
+    /// </summary>
+    [Table(Name = "purchaseexpressorder", DisableSyncStructure = true)]
+    public partial class PurchaseExpressOrder
+    {
+
+        /// <summary>
+        /// 快递单号
+        /// </summary>
+        [Column(StringLength = 100, IsPrimary = true, IsNullable = false)]
+        public string WaybillNo { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 变更时间
+        /// </summary>
+        [Column(DbType = "datetime")]
+        public DateTime? ExpressChangedTime { get; set; }
+
+        /// <summary>
+        /// 物流内容
+        /// </summary>
+        [Column(StringLength = 2000)]
+        public string ExpressContent { get; set; }
+
+        /// <summary>
+        /// 物流状态
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string ExpressState { get; set; }
+
+        [Column(StringLength = 100)]
+        public string OrderId { get; set; }
+
+        [Column(StringLength = 100)]
+        public string PurchaseOrderId { get; set; }
+
+        [Column(StringLength = 100)]
+        public long ShopId { get; set; }
+
+        /// <summary>
+        /// 原快递公司Id
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string SourceExpressId { get; set; }
+
+        /// <summary>
+        /// 原快递公司名称
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string SourceExpressName { get; set; }
+
+        /// <summary>
+        /// 目标快递公司Id(kuaidi100)
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string TargetExpressId { get; set; }
+
+        /// <summary>
+        /// 目标快递公司名称(kuaidi100)
+        /// </summary>
+        [Column(StringLength = 100)]
+        public string TargetExpressName { get; set; }
+
+    }
+
+}

BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseInfoResponse.cs

@@ -4,10 +4,20 @@ namespace BBWYB.Server.Model.Dto
 {
     public class OrderPurchaseInfoResponse : OrderPurchaseInfo
     {
+        ///// <summary>
+        ///// 物流状态
+        ///// <para>1688物流状态: 发货(CONSIGN)、揽收(ACCEPT)、运输(TRANSPORT)、派送(DELIVERING)、签收(SIGN)</para>
+        ///// </summary>
+        //public string ExpressState { get; set; }
+
+        /// <summary>
+        /// 采购sku列表
+        /// </summary>
+        public IList<OrderPurchaseSkuInfoResponse> OrderPurchaseSkuInfoList { get; set; }
+
         /// <summary>
-        /// 物流状态
-        /// <para>1688物流状态: 发货(CONSIGN)、揽收(ACCEPT)、运输(TRANSPORT)、派送(DELIVERING)、签收(SIGN)</para>
+        /// 快递单列表
         /// </summary>
-        public string ExpressState { get; set; }
+        public IList<PurchaseExpressOrderResponse> PurchaseExpressOrderList { get; set; }
     }
 }

BBWYB.Server.Model/Dto/Response/Order/OrderPurchaseSkuInfoResponse.cs

@@ -0,0 +1,8 @@
+using BBWYB.Server.Model.Db;
+
+namespace BBWYB.Server.Model.Dto
+{
+    public class OrderPurchaseSkuInfoResponse: OrderPurchaseSkuInfo
+    {
+    }
+}

BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs

@@ -132,7 +132,7 @@
         public OrderCostResponse OrderCost { get; set; }
 
         /// <summary>
-        /// 订单采购信息
+        /// 采购单列表
         /// </summary>
         public IList<OrderPurchaseInfoResponse> OrderPurchaseInfoList { get; set; }
 

BBWYB.Server.Model/Dto/Response/Order/PurchaseExpressOrderResponse.cs

@@ -0,0 +1,8 @@
+using BBWYB.Server.Model.Db;
+
+namespace BBWYB.Server.Model.Dto
+{
+    public class PurchaseExpressOrderResponse: PurchaseExpressOrder
+    {
+    }
+}

BBWYB.Server.Model/Enums.cs

@@ -108,15 +108,16 @@
         }
 
         /// <summary>
-        /// 采购单状态 待发货 = 0, 待收货 = 10, 已签收 = 20, 已取消 = 100
+        /// 采购单状态 待发货 = 0, 部分发货=1, 待收货 = 10, 部分收货=11, 已签收 = 20, 已取消 = 100
         /// </summary>
         public enum PurchaseOrderState
         {
             待发货 = 0,
-            待收货 = 10,
-            已签收 = 20,
+            部分发货 = 1, 
+            待收货 = 10, 
+            部分收货 = 11, 
+            已签收 = 20, 
             已取消 = 100
-            //部分签收 = 21,
         }
 
         /// <summary>

doc/.back_bbwyB端库/bbwyB端库-backup-202366012803.pdma.json → doc/.back_bbwyB端库/bbwyB端库-backup-202367000716.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-5-12 20:56:05",
-  "updatedTime": "2023-6-6 01:21:07",
+  "updatedTime": "2023-6-6 01:29:46",
   "dbConns": [],
   "profile": {
     "default": {
@@ -2961,6 +2961,23 @@
           "id": "8C3AE7B5-1456-40D2-B7F8-A0040DE2B6D3",
           "extProps": {}
         },
+        {
+          "defKey": "PurchaserId",
+          "defName": "",
+          "comment": "",
+          "type": "VARCHAR",
+          "len": 100,
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "6BA0DD86-8AC3-4B2F-80EF-3FA9D8082D53"
+        },
         {
           "defKey": "PurchaserName",
           "defName": "",
@@ -3145,7 +3162,7 @@
         },
         {
           "defKey": "OrderState",
-          "defName": "采购单状态(待发货 = 0, 待收货 = 10, 已签收 = 20, 部分签收 = 21, 已取消 = 100)",
+          "defName": "采购单状态(待发货 = 0, 部分发货=1, 待收货 = 10, 部分收货=11, 已签收 = 20, 已取消 = 100)",
           "comment": "",
           "type": "",
           "len": "",
@@ -3159,6 +3176,40 @@
           "extProps": {},
           "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
           "id": "A2094D2A-A910-4E4C-9AD6-E70856604538"
+        },
+        {
+          "defKey": "Remark",
+          "defName": "采购备注",
+          "comment": "",
+          "type": "",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+          "id": "27FA741F-D759-4FC1-A3CD-685565EA77D9"
+        },
+        {
+          "defKey": "IsEnabled",
+          "defName": "是否有效",
+          "comment": "",
+          "type": "bit",
+          "len": "",
+          "scale": "",
+          "primaryKey": false,
+          "notNull": false,
+          "autoIncrement": false,
+          "defaultValue": "",
+          "hideInGraph": false,
+          "refDict": "",
+          "extProps": {},
+          "domain": "",
+          "id": "9872FE5C-94C0-479F-BDAC-20756B572B19"
         }
       ],
       "indexes": [],
@@ -6418,34 +6469,34 @@
             "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C"
           },
           {
-            "id": "e8ee81ef-5bfc-464d-9154-1464a42dff87",
+            "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",
             "shape": "table",
             "position": {
-              "x": 1262,
-              "y": 490
+              "x": 1250,
+              "y": 245
             },
             "count": 0,
-            "originKey": "73446503-276D-4398-8476-E340878E9998"
+            "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4"
           },
           {
-            "id": "2c258cf1-71de-432b-835a-7fe52c849443",
+            "id": "e8ee81ef-5bfc-464d-9154-1464a42dff87",
             "shape": "table",
             "position": {
-              "x": 1250,
-              "y": -100
+              "x": 1262,
+              "y": 490
             },
             "count": 0,
-            "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
+            "originKey": "73446503-276D-4398-8476-E340878E9998"
           },
           {
-            "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",
+            "id": "2c258cf1-71de-432b-835a-7fe52c849443",
             "shape": "table",
             "position": {
               "x": 1250,
-              "y": 235
+              "y": -110
             },
             "count": 0,
-            "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4"
+            "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
           }
         ]
       },

doc/bbwyB端库.pdma.json

@@ -4,7 +4,7 @@
   "avatar": "",
   "version": "4.5.1",
   "createdTime": "2023-5-12 20:56:05",
-  "updatedTime": "2023-6-6 01:29:46",
+  "updatedTime": "2023-6-7 00:07:16",
   "dbConns": [],
   "profile": {
     "default": {
@@ -6281,6 +6281,56 @@
             "count": 0,
             "originKey": "93074B87-BE55-41BF-8358-B0E84C4E249A"
           },
+          {
+            "id": "414ef58f-57e8-4362-971a-85af3ea9a44f",
+            "shape": "table",
+            "position": {
+              "x": 390,
+              "y": -90
+            },
+            "count": 0,
+            "originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F"
+          },
+          {
+            "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a",
+            "shape": "table",
+            "position": {
+              "x": 2770,
+              "y": 103
+            },
+            "count": 0,
+            "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B"
+          },
+          {
+            "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8",
+            "shape": "table",
+            "position": {
+              "x": 2770,
+              "y": -53.5
+            },
+            "count": 0,
+            "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85"
+          },
+          {
+            "id": "33443e42-a883-42ec-acc0-46cc1446218d",
+            "shape": "table",
+            "position": {
+              "x": 2770,
+              "y": 634
+            },
+            "count": 0,
+            "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C"
+          },
+          {
+            "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0",
+            "shape": "table",
+            "position": {
+              "x": 2770,
+              "y": 408
+            },
+            "count": 0,
+            "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE"
+          },
           {
             "id": "c9cd6035-3abe-4d8f-8830-bc876fe240af",
             "shape": "erdRelation",
@@ -6408,95 +6458,45 @@
             "count": 0,
             "originKey": "B0921F8C-064A-48FC-A028-C849BD1EAC09"
           },
-          {
-            "id": "414ef58f-57e8-4362-971a-85af3ea9a44f",
-            "shape": "table",
-            "position": {
-              "x": 390,
-              "y": -90
-            },
-            "count": 0,
-            "originKey": "3A48F81A-49D5-423B-8A92-228615DCEA6F"
-          },
-          {
-            "id": "6593da18-d55c-47e3-bb4c-cf75fc56702a",
-            "shape": "table",
-            "position": {
-              "x": 2770,
-              "y": 103
-            },
-            "count": 0,
-            "originKey": "03EA3614-C1F5-4909-96A0-0687EDEABD4B"
-          },
-          {
-            "id": "34567615-fdb5-4d1d-b6ee-a8b61faa04b8",
-            "shape": "table",
-            "position": {
-              "x": 2770,
-              "y": -53.5
-            },
-            "count": 0,
-            "originKey": "474E5807-5650-43BD-8C5C-E16F36D58F85"
-          },
-          {
-            "id": "33443e42-a883-42ec-acc0-46cc1446218d",
-            "shape": "table",
-            "position": {
-              "x": 2770,
-              "y": 634
-            },
-            "count": 0,
-            "originKey": "1E65E858-7177-4B30-9B39-32A6D1CB104C"
-          },
-          {
-            "id": "129cac0b-4f1e-4d05-972f-73b2c710b6e0",
-            "shape": "table",
-            "position": {
-              "x": 2770,
-              "y": 408
-            },
-            "count": 0,
-            "originKey": "4CDAE2F8-5F79-4A75-8F5A-27226FDD1ACE"
-          },
           {
             "id": "471ac35d-30de-48a3-8743-eec20f919eba",
             "shape": "table",
             "position": {
               "x": 1818,
-              "y": 490
+              "y": 495
             },
             "count": 0,
             "originKey": "1ED24FEC-604E-4B36-9E51-17D572021F0C"
           },
           {
-            "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",
+            "id": "2c258cf1-71de-432b-835a-7fe52c849443",
             "shape": "table",
             "position": {
               "x": 1250,
-              "y": 245
+              "y": -150
             },
             "count": 0,
-            "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4"
+            "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
           },
           {
             "id": "e8ee81ef-5bfc-464d-9154-1464a42dff87",
             "shape": "table",
             "position": {
-              "x": 1262,
-              "y": 490
+              "x": 1250,
+              "y": 495
             },
             "count": 0,
             "originKey": "73446503-276D-4398-8476-E340878E9998"
           },
           {
-            "id": "2c258cf1-71de-432b-835a-7fe52c849443",
+            "id": "b968f678-c31b-4396-b761-dd3269ba6fb8",
             "shape": "table",
             "position": {
               "x": 1250,
-              "y": -110
+              "y": 245
             },
             "count": 0,
-            "originKey": "7DC43BAC-F8BC-4423-96C5-4C770CCD6214"
+            "originKey": "EE319D46-61D9-47DB-80AD-AD97D460ACB4"
           }
         ]
       },