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

11

Browse Source
This commit is contained in:
余宇波 2025-06-06 10:46:24 +08:00
parent 70ab6b9162
commit 3e5e8d77f6
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MyCode.Project.Domain/Config/SystemConfig.cs
View File

@ -193,6 +193,11 @@ namespace MyCode.Project.Domain.Config
/// </summary> /// </summary>
public static string ReceiveorgCode = WebConfigUtils.GetAppSettingsInfo("ReceiveorgCode"); public static string ReceiveorgCode = WebConfigUtils.GetAppSettingsInfo("ReceiveorgCode");
/// <summary>
/// 国家
/// </summary>
//public static string GuoJia = WebConfigUtils.GetAppSettingsInfo("GuoJia");
} }

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

@ -153,7 +153,7 @@ namespace MyCode.Project.Services.Implementation
{ {
FormId = "PUR_PurchaseOrder", FormId = "PUR_PurchaseOrder",
FieldKeys = $@"FID,FBillNo,FDate,FBILLTYPEID,FBILLTYPEID.FName,FSUPPLIERID,FSupplierId.FNAME,FSupplierId,FSupplierId.FShortName,FModifyDate,FPurchaserId,FMaterialId,FPOOrderEntry_FEntryId FieldKeys = $@"FID,FBillNo,FDate,FBILLTYPEID,FBILLTYPEID.FName,FSUPPLIERID,FSupplierId.FNAME,FSupplierId,FSupplierId.FShortName,FModifyDate,FPurchaserId,FMaterialId,FPOOrderEntry_FEntryId
,FSupplierLot,FLot,FBaseDeliveryMaxQty,FBaseJoinQty ,FSupplierLot,FLot,FBaseDeliveryMaxQty,FBaseJoinQty,FJOINQTY
,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,F_TSPR_Text_qtr1,FDEMANDBILLNO,FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber ,FPurchaseOrgId,FPurchaseOrgId.FName,F_TSPR_Text_qtr1,FDEMANDBILLNO,FReceiveOrgId,FReceiveOrgId.FNAME,FReceiveOrgId.FNumber
@ -333,16 +333,7 @@ namespace MyCode.Project.Services.Implementation
{ {
end = begin.AddMonths(1); end = begin.AddMonths(1);
var result = QueryList(begin, end, t.SupplierId, yuyan); 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);
//}
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)
@ -358,6 +349,17 @@ namespace MyCode.Project.Services.Implementation
{ {
object fido = (item["FID"]); object fido = (item["FID"]);
//if ((item["FBillNo"]).ToString() == "PO1012511857")
//{
// LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// LogHelper.Info(JsonHelper.ToJson(item));
//}
//else
//{
// //LogHelper.Info(t.SupplierName + "的采购订单数据" + begin.ToString() + "-----" + end.ToString());
// //LogHelper.Info(result);
//}
if (fid != int.Parse(fido.ToString()) || fid == 0) if (fid != int.Parse(fido.ToString()) || fid == 0)
{ {
@ -445,7 +447,7 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.TaxRate = item["FEntryTaxRate"]; purchaseOrderItem.TaxRate = item["FEntryTaxRate"];
purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"]; purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"];
purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"]; purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"];
purchaseOrderItem.FReceiveQty = item["FBaseJoinQty"]; purchaseOrderItem.FReceiveQty = item["FJOINQTY"];
purchaseOrderItem.FRemainReceiveQty = purchaseOrderItem.Qty - purchaseOrderItem.FReceiveQty; purchaseOrderItem.FRemainReceiveQty = purchaseOrderItem.Qty - purchaseOrderItem.FReceiveQty;
purchaseOrderItem.MSSReceiveQty= item["FReceiveQty"]; purchaseOrderItem.MSSReceiveQty= item["FReceiveQty"];
purchaseOrderItem.FMRPCloseStatus = item["FMRPCloseStatus"]; purchaseOrderItem.FMRPCloseStatus = item["FMRPCloseStatus"];
@ -475,7 +477,7 @@ namespace MyCode.Project.Services.Implementation
oldItem.FDeliveryDate = item["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["FJOINQTY"];
oldItem.MSSReceiveQty = item["FReceiveQty"]; oldItem.MSSReceiveQty = item["FReceiveQty"];
oldItem.FRemainReceiveQty = oldItem.Qty - oldItem.FReceiveQty; oldItem.FRemainReceiveQty = oldItem.Qty - oldItem.FReceiveQty;
oldItem.SpecificationModel = item["FMaterialId.FSpecification"]; oldItem.SpecificationModel = item["FMaterialId.FSpecification"];
@ -598,6 +600,15 @@ namespace MyCode.Project.Services.Implementation
{ {
throw new BaseException("国外的供应商发票号和发票日期是必填."); throw new BaseException("国外的供应商发票号和发票日期是必填.");
} }
if (loginInfo.IfForeign == 1)
{
if (_invoiceOrderRepository.IsExist(t => t.F_VHUB_Text == act.F_VHUB_Text && t.SupplierId == loginInfo.SupplierId))
{
throw new BaseException("发票号重复");
}
}
//string ReceiveorgCode = SystemConfig.ReceiveorgCode; //string ReceiveorgCode = SystemConfig.ReceiveorgCode;
//List<string> ReceiveorgCodeList = ReceiveorgCode.Split(',').ToList(); //List<string> ReceiveorgCodeList = ReceiveorgCode.Split(',').ToList();
//if (listAll.Where(t => !ReceiveorgCodeList.Contains(t.ReceiveorgCode) && t.ReceiveorgCode != null).Count() > 0) //if (listAll.Where(t => !ReceiveorgCodeList.Contains(t.ReceiveorgCode) && t.ReceiveorgCode != null).Count() > 0)

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

@ -71,6 +71,7 @@
<add key="TiaoMaUrl" value="http://8.210.205.196:5000/"/> <add key="TiaoMaUrl" value="http://8.210.205.196:5000/"/>
<add key="GuoJia" value="泰国" />
<!--测试redis--> <!--测试redis-->
<add key="RedisAddress" value=",password=" /> <add key="RedisAddress" value=",password=" />