From a95ea2cd0cf2256b7e73e00ddadc2be044cc554c Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Sat, 26 Apr 2025 13:23:45 +0800
Subject: [PATCH] 333
---
.../PurchaseOrder/PurchaseOrderPageList.cs | 26 ++++++++++++++++
.../Model/PurchaseOrderItem.cs | 14 +++++++++
MyCode.Project.ScheduleTask/App.config | 2 +-
.../PurchaseOrder/PurchaseOrderService.cs | 30 +++++++++++--------
MyCode.Project.WebApi/Web.config | 4 +--
5 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs b/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
index 04b49cb..30c0669 100644
--- a/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
+++ b/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
@@ -163,7 +163,19 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
///
public string FPurchaseOrgName { get; set; }
+ ///
+ /// Desc:手工录入销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string F_TSPR_Text_qtr1 { get; set; }
+ ///
+ /// Desc:销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string FDEMANDBILLNO { get; set; }
}
@@ -312,6 +324,20 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
/// Nullable:True
///
public decimal? TaxRate { get; set; }
+
+ ///
+ /// Desc:手工录入销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string F_TSPR_Text_qtr1 { get; set; }
+
+ ///
+ /// Desc:销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string FDEMANDBILLNO { get; set; }
}
}
diff --git a/MyCode.Project.Domain/Model/PurchaseOrderItem.cs b/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
index 27f307c..734c787 100644
--- a/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
+++ b/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
@@ -191,5 +191,19 @@ namespace MyCode.Project.Domain.Model
///
public string MSSSupplierLot {get;set;}
+ ///
+ /// Desc:手工录入销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string F_TSPR_Text_qtr1 {get;set;}
+
+ ///
+ /// Desc:销售订单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string FDEMANDBILLNO {get;set;}
+
}
}
diff --git a/MyCode.Project.ScheduleTask/App.config b/MyCode.Project.ScheduleTask/App.config
index a2ed9d3..17407bc 100644
--- a/MyCode.Project.ScheduleTask/App.config
+++ b/MyCode.Project.ScheduleTask/App.config
@@ -17,7 +17,7 @@
-
+
diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index c453a8c..174e88f 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -148,7 +148,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,FPOORDERENTRY_D.FDeliveryDate
+ ,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO
,FCancelStatus,FRemainReceiveQty",
//FieldKeys ="",
TopRowCount = 100000,
@@ -481,16 +481,16 @@ namespace MyCode.Project.Services.Implementation
{
end = begin.AddMonths(1);
var result = QueryList(begin, end, t.SupplierId);
- //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 data = JsonHelper.ToObject>(result);
//List data = System.Text.Json.JsonSerializer.Deserialize>(result);
if (data.Count > 0)
@@ -583,7 +583,7 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.Remark = item["FEntryNote"];
purchaseOrderItem.SupplierId = t.SupplierId;
purchaseOrderItem.UnitName = item["FUnitId.fname"];
- purchaseOrderItem.FDeliveryDate = item["FPOORDERENTRY_D.FDeliveryDate"];
+ purchaseOrderItem.FDeliveryDate = item["FDeliveryDate"];
purchaseOrderItem.TaxRate = item["FEntryTaxRate"];
purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"];
purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"];
@@ -593,6 +593,8 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.EntityId = item["FPOOrderEntry_FEntryId"];
purchaseOrderItem.MSSSupplierLot = item["FLot"];
purchaseOrderItem.SpecificationModel = item["FMaterialId.FSpecification"];
+ purchaseOrderItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
+ purchaseOrderItem.FDEMANDBILLNO = item["FDEMANDBILLNO"];
_purchaseOrderItemRepository.Add(purchaseOrderItem);
}
else
@@ -607,7 +609,7 @@ namespace MyCode.Project.Services.Implementation
oldItem.Remark = item["FEntryNote"];
oldItem.SupplierId = t.SupplierId;
oldItem.UnitName = item["FUnitId.fname"];
- oldItem.FDeliveryDate = item["FPOORDERENTRY_D.FDeliveryDate"];
+ oldItem.FDeliveryDate = item["FDeliveryDate"];
oldItem.TaxRate = item["FEntryTaxRate"];
oldItem.FBillTaxAmount = item["FEntryTaxAmount"];
oldItem.FReceiveQty = item["FBaseJoinQty"];
@@ -619,6 +621,8 @@ namespace MyCode.Project.Services.Implementation
oldItem.FMRPCloseStatus = item["FMRPCloseStatus"];
oldItem.EntityId = item["FPOOrderEntry_FEntryId"];
oldItem.MSSSupplierLot = item["FLot"];
+ oldItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
+ oldItem.FDEMANDBILLNO = item["FDEMANDBILLNO"];
_purchaseOrderItemRepository.Update(oldItem);
}
diff --git a/MyCode.Project.WebApi/Web.config b/MyCode.Project.WebApi/Web.config
index 7b31a6b..4639985 100644
--- a/MyCode.Project.WebApi/Web.config
+++ b/MyCode.Project.WebApi/Web.config
@@ -24,7 +24,7 @@
-
+
@@ -43,7 +43,7 @@
-
+