From 5abfc66dd2a4cbedf4fd37186558b6540b0e112a Mon Sep 17 00:00:00 2001
From: zhou keda <1315948824@qq.com>
Date: Mon, 19 Aug 2024 15:55:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=88=B0=E8=B4=A7=20?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=85=A5=E5=BA=93=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs  | 2 ++
 WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs | 1 +
 2 files changed, 3 insertions(+)

diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
index e412048b..febc7e39 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsInStockService.cs
@@ -415,6 +415,8 @@ namespace Tnb.WarehouseMgr
                                 ["vsourcebillcode"] = wmsPurchaseH?.bill_code ?? "",
                                 ["lineno"] = wmsPurchaseOrderDs?.lineno ?? "",
                                 ["vfree1"] = erpExtendFields.Find(x => x.table_id == supplierId)?.supplier_id ?? "",
+                                ["bpresent"] = wmsPurchaseD.gift==1,
+                                ["ntaxprice"] = wmsPurchaseD.price,
 
                             });
                         }
diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
index 262e4909..e8f6b111 100644
--- a/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
+++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsPurchaseService.cs
@@ -231,6 +231,7 @@ namespace Tnb.WarehouseMgr
                             ["vbatchcode"] = item.code_batch,
                             ["Vfree1"] = item.code_batch,
                             ["mes_detail_id"] = item.id,
+                            ["bpresent"] = item.gift==1,
                         });
                     }
                     erpRequestData.Add("dtls",erpRequestDataDetails);