This commit is contained in:
余宇波 2025-05-07 14:21:24 +08:00
parent 2baa48f6b6
commit 16fc0304f3

View File

@ -150,7 +150,7 @@ namespace MyCode.Project.Services.Implementation
queryParam = new BillQuery() queryParam = new BillQuery()
{ {
FormId = "PUR_PurchaseOrder", 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 ,FSupplierLot,FLot,FBaseDeliveryMaxQty,FBaseJoinQty
,FEntryNote,FBillAllAmount_LC,FMaterialId.FNAME,FQty,FEntryNote,FUnitId.fname,FDeliveryDate,FMaterialId.FSpecification,FPurchaserId.fname,FSupplierId.FNumber,FMaterialId.FNumber ,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 ,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(); purchaseOrder.Id = Guid.NewGuid();
ida = purchaseOrder.Id; ida = purchaseOrder.Id;
purchaseOrder.SupplierId = t.SupplierId; 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.FCancelStatus = item["FCancelStatus"];
purchaseOrder.SettlementCcurrency = item["FSettleCurrId.fname"]; purchaseOrder.SettlementCcurrency = item["FSettleCurrId.fname"];
purchaseOrder.ExchangeRate = item["FExchangeRate"]; purchaseOrder.ExchangeRate = item["FExchangeRate"];
@ -546,7 +548,9 @@ namespace MyCode.Project.Services.Implementation
else else
{ {
oldOrder.SupplierId = t.SupplierId; 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.FCancelStatus = item["FCancelStatus"];
oldOrder.SettlementCcurrency = item["FSettleCurrId.fname"]; oldOrder.SettlementCcurrency = item["FSettleCurrId.fname"];
oldOrder.ExchangeRate = item["FExchangeRate"]; oldOrder.ExchangeRate = item["FExchangeRate"];