采购订单添加是否赠品，单位id记录

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

@@ -42,12 +42,6 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
         /// 主表pk
         /// </summary>
         public string? erp_pk { get; set; }
-
-        /// <summary>
-        /// erp仓库类型
-        /// </summary>
-        public string erp_wh_type { get; set; }
-
         public List<PurchaseOrderDetail> details { get; set; }
     }
     public class PurchaseOrderDetail
@@ -91,5 +85,10 @@ namespace Tnb.WarehouseMgr.Entities.Dto.ErpInputs
         /// 子表主键
         /// </summary>
         public string erp_line_pk { get; set; }
+
+        /// <summary>
+        /// 是否赠品
+        /// </summary>
+        public int? gift { get; set; }
     }
 }

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

@@ -124,4 +124,14 @@ public partial class WmsPurchaseOrderD : BaseEntity<string>
     /// </summary>
     public string? lineno { get; set; }
 
+    /// <summary>
+    /// 单位id
+    /// </summary>
+    public string? unit_id { get; set; }
+
+    /// <summary>
+    /// 是否赠品
+    /// </summary>
+    public int? gift { get; set; }
+
 }

WarehouseMgr/Tnb.WarehouseMgr/ErpToWmsService.cs

@@ -345,7 +345,6 @@ namespace Tnb.WarehouseMgr
                 wmsPurchaseOrderH.erp_pk = input.erp_pk;
                 wmsPurchaseOrderH.create_id = WmsWareHouseConst.ErpUserId;
                 wmsPurchaseOrderH.create_time = DateTime.Now;
-                wmsPurchaseOrderH.erp_wh_type = input.erp_wh_type;
                 var supplier = await db.Queryable<BasSupplier>().Where(p => p.supplier_code == input.supplier_code).FirstAsync();
                 if (supplier != null)
                 {
@@ -366,6 +365,7 @@ namespace Tnb.WarehouseMgr
                     var erpExtendField = await db.Queryable<ErpExtendField>().InnerJoin<DictionaryDataEntity>((a, b) => a.table_id == b.Id).Where((a, b) => a.cunitid == detail.unit_code).Select((a, b) => b).FirstAsync();
                     if (erpExtendField != null)
                     {
+                        wmsPurchaseOrderD.unit_id = erpExtendField.Id;
                         wmsPurchaseOrderD.unit = erpExtendField.EnCode;
                     }
                     else
@@ -383,7 +383,8 @@ namespace Tnb.WarehouseMgr
                     wmsPurchaseOrderD.create_time = DateTime.Now;
                     wmsPurchaseOrderD.actual_quantity = 0;
                     wmsPurchaseOrderD.lineno = detail.lineno;
-
+                    wmsPurchaseOrderD.gift = detail.gift;
+                    
                     var material = await db.Queryable<BasMaterial>().Where(p => p.code == detail.material_code).FirstAsync();
                     if (material != null)
                     {