From 16fc0304f31895217be51a5280984132834148af Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Wed, 7 May 2025 14:21:24 +0800
Subject: [PATCH] 11

---
 .../PurchaseOrder/PurchaseOrderService.cs              | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index b7dab2c..c346207 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -150,7 +150,7 @@ namespace MyCode.Project.Services.Implementation
             queryParam = new BillQuery()
             {
                 FormId = "PUR_PurchaseOrder",
-                FieldKeys = $@"FID,FBillNo,FDate,FBILLTYPEID,FSUPPLIERID,FSupplierId.FNAME,FSupplierId,FModifyDate,FPurchaserId,FMaterialId,FPOOrderEntry_FEntryId
+                FieldKeys = $@"FID,FBillNo,FDate,FBILLTYPEID,FSUPPLIERID,FSupplierId.FNAME,FSupplierId,FSupplierId.FShortName,FModifyDate,FPurchaserId,FMaterialId,FPOOrderEntry_FEntryId
                 ,FSupplierLot,FLot,FBaseDeliveryMaxQty,FBaseJoinQty
                 ,FEntryNote,FBillAllAmount_LC,FMaterialId.FNAME,FQty,FEntryNote,FUnitId.fname,FDeliveryDate,FMaterialId.FSpecification,FPurchaserId.fname,FSupplierId.FNumber,FMaterialId.FNumber
                 ,FSettleCurrId.fname,FBillTaxAmount,FExchangeTypeId.fname,FExchangeRate,FEntryTaxRate,FPrice,FAllAmount,FEntryAmount,FEntryTaxAmount,FReceiveQty,FMRPCloseStatus
@@ -525,7 +525,9 @@ namespace MyCode.Project.Services.Implementation
                                     purchaseOrder.Id = Guid.NewGuid();
                                     ida = purchaseOrder.Id;
                                     purchaseOrder.SupplierId = t.SupplierId;
-                                    purchaseOrder.SupplierName = item["FSupplierId.FNAME"];
+                                    purchaseOrder.SupplierName = item["FSupplierId.FShortName"];
+                                    if (purchaseOrder.SupplierName.Trim() == "")
+                                        purchaseOrder.SupplierName = item["FSupplierId.FNAME"];
                                     purchaseOrder.FCancelStatus = item["FCancelStatus"];
                                     purchaseOrder.SettlementCcurrency = item["FSettleCurrId.fname"];
                                     purchaseOrder.ExchangeRate = item["FExchangeRate"];
@@ -546,7 +548,9 @@ namespace MyCode.Project.Services.Implementation
                                 else
                                 {
                                     oldOrder.SupplierId = t.SupplierId;
-                                    oldOrder.SupplierName = item["FSupplierId.FNAME"];
+                                    oldOrder.SupplierName = item["FSupplierId.FShortName"];
+                                    if (oldOrder.SupplierName.Trim()=="")
+                                        oldOrder.SupplierName = item["FSupplierId.FNAME"];
                                     oldOrder.FCancelStatus = item["FCancelStatus"];
                                     oldOrder.SettlementCcurrency = item["FSettleCurrId.fname"];
                                     oldOrder.ExchangeRate = item["FExchangeRate"];