This commit is contained in:
2025-06-03 15:00:18 +08:00
parent 96b6a8b04e
commit 253606b808
7 changed files with 105 additions and 25 deletions

View File

@@ -155,7 +155,7 @@ namespace MyCode.Project.Services.Implementation
,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
,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO
,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO,FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber
,FCancelStatus,FRemainReceiveQty",
//FieldKeys ="",
TopRowCount = 100000,
@@ -513,16 +513,16 @@ namespace MyCode.Project.Services.Implementation
{
end = begin.AddMonths(1);
var result = QueryList(begin, end, t.SupplierId, yuyan);
//if (t.SupplierId == "9999.1")
//{
// LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// LogHelper.Info(result);
//}
//else
//{
// LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// LogHelper.Info(result);
//}
if (t.SupplierId == "9999.1")
{
LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
LogHelper.Info(result);
}
else
{
LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
LogHelper.Info(result);
}
List<dynamic> data = JsonHelper.ToObject<List<dynamic>>(result);
//List<dynamic> data = System.Text.Json.JsonSerializer.Deserialize<List<dynamic>>(result);
if (data.Count > 0)
@@ -634,6 +634,10 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.SpecificationModel = item["FMaterialId.FSpecification"];
purchaseOrderItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
purchaseOrderItem.FDEMANDBILLNO = item["FBILLTYPEID.FName"];
purchaseOrderItem.freceiveorgId = item["FReceiveOrgId"];
purchaseOrderItem.ReceiveorgCode = item["FReceiveOrgId.FNumber"];
purchaseOrderItem.ReceiveorgName = item["FReceiveOrgId.FNAME"];
//FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber
_purchaseOrderItemRepository.Add(purchaseOrderItem);
}
else
@@ -663,6 +667,9 @@ namespace MyCode.Project.Services.Implementation
oldItem.MSSSupplierLot = item["FLot"];
oldItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
oldItem.FDEMANDBILLNO = item["FDEMANDBILLNO"];
oldItem.freceiveorgId = item["FReceiveOrgId"];
oldItem.ReceiveorgCode = item["FReceiveOrgId.FNumber"];
oldItem.ReceiveorgName = item["FReceiveOrgId.FNAME"];
_purchaseOrderItemRepository.Update(oldItem);
}
@@ -854,7 +861,10 @@ namespace MyCode.Project.Services.Implementation
invoiceOrderItemTemp.MSSSupplierLot = t.MSSSupplierLot;
invoiceOrderItemTemp.UnitName = t.UnitName;
invoiceOrderItemTemp.FBillNo = purchaseOrder.FBillNo;
invoiceOrderItemTemp.PurchaseEntityId = t.EntityId;
invoiceOrderItemTemp.PurchaseEntityId = t.EntityId;
invoiceOrderItemTemp.freceiveorgId = t.freceiveorgId;
invoiceOrderItemTemp.ReceiveorgCode = t.ReceiveorgCode;
invoiceOrderItemTemp.ReceiveorgName = t.ReceiveorgName;
invoiceOrderItems.Add(invoiceOrderItemTemp);
ScanEntry tempUpdate = new ScanEntry();
tempUpdate.Qty = (int)temp.Qty;