yuyubo/MeiSaiSiXieTongApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

333

Browse Source
This commit is contained in:
余宇波 2025-04-26 13:23:45 +08:00
parent 68da02a7ec
commit a95ea2cd0c
5 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
View File

@ -163,7 +163,19 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
/// </summary> /// </summary>
public string FPurchaseOrgName { get; set; } public string FPurchaseOrgName { get; set; }
/// <summary>
/// Desc:手工录入销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string F_TSPR_Text_qtr1 { get; set; }
/// <summary>
/// Desc:销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string FDEMANDBILLNO { get; set; }
} }
@ -312,6 +324,20 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
/// Nullable:True /// Nullable:True
/// </summary> /// </summary>
public decimal? TaxRate { get; set; } public decimal? TaxRate { get; set; }
/// <summary>
/// Desc:手工录入销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string F_TSPR_Text_qtr1 { get; set; }
/// <summary>
/// Desc:销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string FDEMANDBILLNO { get; set; }
} }
} }

14
MyCode.Project.Domain/Model/PurchaseOrderItem.cs
View File

@ -191,5 +191,19 @@ namespace MyCode.Project.Domain.Model
/// </summary> /// </summary>
public string MSSSupplierLot {get;set;} public string MSSSupplierLot {get;set;}
/// <summary>
/// Desc:手工录入销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string F_TSPR_Text_qtr1 {get;set;}
/// <summary>
/// Desc:销售订单号
/// Default:
/// Nullable:True
/// </summary>
public string FDEMANDBILLNO {get;set;}
} }
} }

2
MyCode.Project.ScheduleTask/App.config
View File

@ -17,7 +17,7 @@
<!--新测试环境数据库 --> <!--新测试环境数据库 -->
<!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=AIS20250304232155; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=bfy" providerName="System.Data.SqlClient" />--> <!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=AIS20250304232155; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=bfy" providerName="System.Data.SqlClient" />-->
<add name="MasterConn" connectionString="Data Source=8.134.66.212,30003; Initial Catalog=xietong; User ID=sa;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" /> <add name="MasterConn" connectionString="Data Source=8.134.66.212,30003; Initial Catalog=xietong; User ID=meisaisi;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<!--正式主库的链接地址--> <!--正式主库的链接地址-->

30
MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
View File

@ -148,7 +148,7 @@ namespace MyCode.Project.Services.Implementation
,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
,FPurchaseOrgId,FPurchaseOrgId.FName,FPOORDERENTRY_D.FDeliveryDate ,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO
,FCancelStatus,FRemainReceiveQty", ,FCancelStatus,FRemainReceiveQty",
//FieldKeys ="", //FieldKeys ="",
TopRowCount = 100000, TopRowCount = 100000,
@ -481,16 +481,16 @@ namespace MyCode.Project.Services.Implementation
{ {
end = begin.AddMonths(1); end = begin.AddMonths(1);
var result = QueryList(begin, end, t.SupplierId); var result = QueryList(begin, end, t.SupplierId);
//if (t.SupplierId == "9999.1") if (t.SupplierId == "9999.1")
//{ {
// LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// LogHelper.Info(result); LogHelper.Info(result);
//} }
//else else
//{ {
// LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString()); LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// LogHelper.Info(result); LogHelper.Info(result);
//} }
List<dynamic> data = JsonHelper.ToObject<List<dynamic>>(result); List<dynamic> data = JsonHelper.ToObject<List<dynamic>>(result);
//List<dynamic> data = System.Text.Json.JsonSerializer.Deserialize<List<dynamic>>(result); //List<dynamic> data = System.Text.Json.JsonSerializer.Deserialize<List<dynamic>>(result);
if (data.Count > 0) if (data.Count > 0)
@ -583,7 +583,7 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.Remark = item["FEntryNote"]; purchaseOrderItem.Remark = item["FEntryNote"];
purchaseOrderItem.SupplierId = t.SupplierId; purchaseOrderItem.SupplierId = t.SupplierId;
purchaseOrderItem.UnitName = item["FUnitId.fname"]; purchaseOrderItem.UnitName = item["FUnitId.fname"];
purchaseOrderItem.FDeliveryDate = item["FPOORDERENTRY_D.FDeliveryDate"]; purchaseOrderItem.FDeliveryDate = item["FDeliveryDate"];
purchaseOrderItem.TaxRate = item["FEntryTaxRate"]; purchaseOrderItem.TaxRate = item["FEntryTaxRate"];
purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"]; purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"];
purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"]; purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"];
@ -593,6 +593,8 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.EntityId = item["FPOOrderEntry_FEntryId"]; purchaseOrderItem.EntityId = item["FPOOrderEntry_FEntryId"];
purchaseOrderItem.MSSSupplierLot = item["FLot"]; purchaseOrderItem.MSSSupplierLot = item["FLot"];
purchaseOrderItem.SpecificationModel = item["FMaterialId.FSpecification"]; purchaseOrderItem.SpecificationModel = item["FMaterialId.FSpecification"];
purchaseOrderItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
purchaseOrderItem.FDEMANDBILLNO = item["FDEMANDBILLNO"];
_purchaseOrderItemRepository.Add(purchaseOrderItem); _purchaseOrderItemRepository.Add(purchaseOrderItem);
} }
else else
@ -607,7 +609,7 @@ namespace MyCode.Project.Services.Implementation
oldItem.Remark = item["FEntryNote"]; oldItem.Remark = item["FEntryNote"];
oldItem.SupplierId = t.SupplierId; oldItem.SupplierId = t.SupplierId;
oldItem.UnitName = item["FUnitId.fname"]; oldItem.UnitName = item["FUnitId.fname"];
oldItem.FDeliveryDate = item["FPOORDERENTRY_D.FDeliveryDate"]; oldItem.FDeliveryDate = item["FDeliveryDate"];
oldItem.TaxRate = item["FEntryTaxRate"]; oldItem.TaxRate = item["FEntryTaxRate"];
oldItem.FBillTaxAmount = item["FEntryTaxAmount"]; oldItem.FBillTaxAmount = item["FEntryTaxAmount"];
oldItem.FReceiveQty = item["FBaseJoinQty"]; oldItem.FReceiveQty = item["FBaseJoinQty"];
@ -619,6 +621,8 @@ namespace MyCode.Project.Services.Implementation
oldItem.FMRPCloseStatus = item["FMRPCloseStatus"]; oldItem.FMRPCloseStatus = item["FMRPCloseStatus"];
oldItem.EntityId = item["FPOOrderEntry_FEntryId"]; oldItem.EntityId = item["FPOOrderEntry_FEntryId"];
oldItem.MSSSupplierLot = item["FLot"]; oldItem.MSSSupplierLot = item["FLot"];
oldItem.F_TSPR_Text_qtr1 = item["F_TSPR_Text_qtr1"];
oldItem.FDEMANDBILLNO = item["FDEMANDBILLNO"];
_purchaseOrderItemRepository.Update(oldItem); _purchaseOrderItemRepository.Update(oldItem);
} }

4
MyCode.Project.WebApi/Web.config
View File

@ -24,7 +24,7 @@
</httpProtocol> </httpProtocol>
</system.webServer> </system.webServer>
<connectionStrings> <connectionStrings>
<add name="MasterConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=xietong; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" /> <add name="MasterConn" connectionString="Data Source=58.252.252.77,30003; Initial Catalog=xietong; User ID=meisaisi;Password=ghjktyui126@#$; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />
<!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=tempdata; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />--> <!--<add name="MasterConn" connectionString="Data Source=127.0.0.1; Initial Catalog=tempdata; User ID=sa;Password=1; Connect Timeout=120; MultipleActiveResultSets=True;App=XieTong" providerName="System.Data.SqlClient" />-->
</connectionStrings> </connectionStrings>
<appSettings> <appSettings>
@ -43,7 +43,7 @@
<!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制 --> <!-- 若第三方系统登录授权已勾选“允许全部用户登录”，则无以上限制 -->
<add key="X-KDApi-UserName" value="lxb" /> <add key="X-KDApi-UserName" value="Tiaoma" />
<!-- 第三方系统登录授权的 应用ID --> <!-- 第三方系统登录授权的 应用ID -->