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

22

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,17 +182,17 @@ namespace MyCode.Project.Domain.Config
///让哥的抖音API地址
/// </summary>
public static string DouYinApiUrl = WebConfigUtils.GetAppSettingsInfo("DouYinApiUrl");
/// <summary>
/// 让哥的抖音API Token
/// </summary>
public static string DouYinApiToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6IntcImxvZ2luXCI6XCJhZG1pblwiLFwibmFtZVwiOlwi57O757ufXCIsXCJ1c2VySWRcIjpcIlwifSIsImlzcyI6InN5c3RlbSIsImF1ZCI6IkFueSIsImV4cCI6MzI3MjE1MDc1NiwibmJmIjoxNzE2OTUwNzU2fQ.xPLulTwzyh4ZuYfed_xfFDwYO35WatZcy98rcOwparQ";
/// <summary>
/// 后台系统的API地址
/// </summary>
public static string LxmAdminApiUrl = WebConfigUtils.GetAppSettingsInfo("LxmAdminApiUrl");
/// <summary>
/// 需要推送发货单的收料组织编码
/// </summary>
public static string ReceiveorgCode = WebConfigUtils.GetAppSettingsInfo("ReceiveorgCode");
}

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

@ -191,6 +191,24 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
/// </summary>
public string FBILLTYPEID { get; set; }
/// <summary>
/// Desc:收料组织编码
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgCode { get; set; }
/// <summary>
/// Desc:收料组织名称
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgName { get; set; }
/// <summary>
/// 是否可以勾选发货 1=可以 0=不可以
/// </summary>
public int IfFaHuo { get; set; }
}

21
MyCode.Project.Domain/Model/InvoiceOrderItem.cs
View File

@ -205,5 +205,26 @@ namespace MyCode.Project.Domain.Model
/// </summary>
public string ShouLiaoFBillNo {get;set;}
/// <summary>
/// Desc:收料组织编码
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgCode {get;set;}
/// <summary>
/// Desc:收料组织名称
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgName {get;set;}
/// <summary>
/// Desc:收料组织ID
/// Default:
/// Nullable:True
/// </summary>
public string freceiveorgId {get;set;}
}
}

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

@ -212,5 +212,26 @@ namespace MyCode.Project.Domain.Model
/// </summary>
public decimal MSSReceiveQty {get;set;}
/// <summary>
/// Desc:收料组织编码
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgCode {get;set;}
/// <summary>
/// Desc:收料组织名称
/// Default:
/// Nullable:True
/// </summary>
public string ReceiveorgName {get;set;}
/// <summary>
/// Desc:收料组织ID
/// Default:
/// Nullable:True
/// </summary>
public string freceiveorgId {get;set;}
}
}

13
MyCode.Project.Repositories/PurchaseOrderRepository.cs
View File

@ -12,6 +12,7 @@ using MyCode.Project.Infrastructure.Search;
using MyCode.Project.Domain.Message.Response.PurchaseOrder;
using MyCode.Project.Domain.Message.Request.PurchaseOrder;
using MyCode.Project.Infrastructure.Extensions;
using MyCode.Project.Domain.Config;
namespace MyCode.Project.Repositories
{
@ -20,7 +21,7 @@ namespace MyCode.Project.Repositories
public PurchaseOrderRepository(MyCodeSqlSugarClient context) : base(context)
{ }
string ReceiveorgCode = SystemConfig.ReceiveorgCode;
/// <summary>
/// 采购订单分页列表
/// </summary>
@ -48,7 +49,9 @@ namespace MyCode.Project.Repositories
where.AddCondition("a.FPurchaseOrgId", FPurchaseOrgId, SqlOperator.Equal, !string.IsNullOrWhiteSpace(FPurchaseOrgId) && FPurchaseOrgId != "-1");
where.AddCondition("b.MaterialCode", condition.MaterialCode, SqlOperator.Like, !string.IsNullOrWhiteSpace(condition.MaterialCode));
where.AddCondition("b.FMRPCloseStatus", condition.FMRPCloseStatus, SqlOperator.Equal, !string.IsNullOrWhiteSpace(condition.FMRPCloseStatus) && condition.FMRPCloseStatus != "-1");
string sql = $@"select a.[Id] AS FormId
string sql = $@"select a.[Id] AS FormId ,1 IfFaHuo
,[SupplierName]
,[Purchaser]
,[PurchaserId]
@ -87,6 +90,12 @@ namespace MyCode.Project.Repositories
{
t.NewChengNuoJiaoQi = DateTime.Parse(t.NewChengNuoJiaoQi).ToString("yyyy-MM-dd");
}
if (!string.IsNullOrWhiteSpace(ReceiveorgCode))
{
if (t.ReceiveorgCode != ReceiveorgCode)
t.IfFaHuo = 0;
}
});
return list;

34
MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
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;

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

@ -74,7 +74,8 @@
<!--测试redis-->
<add key="RedisAddress" value=",password=" />
<!--需要显示的收料组织订单-->
<add key="ReceiveorgCode" value="101" />
<!--微信API接口地址-->
<add key="WeixinApiUrl" value="" />
@ -151,8 +152,8 @@
<add key="MerchantId" value="00000000-0000-0000-0000-000000000000" />
<add key="SysConfig" value="{&quot;MerchantId&quot;: &quot;00000000-0000-0000-0000-000000000009&quot;,&quot;Issuer&quot;: &quot;lxzyl&quot;,&quot;Secret&quot;: &quot;4ea0180d8f8c1ce11343e9104c682bc4&quot;,&quot;SendVerifyCode&quot;:&quot;http://120.78.93.13:30000/InterfaceAPI/sendVerifyCode&quot;, &quot;SendSms&quot;: &quot;http://120.78.93.13:30000/InterfaceAPI/sendSmsMessage&quot;, &quot;ApiTokenUrl&quot;: &quot;http://localhost:8888/oauth2/token&quot;, &quot;IsDev&quot;: true, &quot;QiNiuCloudApiUrl&quot;: &quot;http://oss-api.loonxierp.com&quot;, &quot;CmpPayCallbackDomain&quot;: &quot;http://bfy-api.wxbinf.com:8095&quot;}" />
<add key="WechatConfig" value="{&quot;ApiAuthDomain&quot;: &quot;http://binfapi-test.wxbinf.com&quot;,&quot;Scope&quot;: &quot;snsapi_base&quot;,&quot;WechatPublic&quot;: &quot;流行美专业测试&quot;,&quot;appHtml&quot;: &quot;https://test-dx.wxbinf.com&quot;} " />
<!-- 七牛参数配置begin -->
<!-- 七牛参数配置begin -->
<add key="QiniuAccessKey" value="" />
<add key="QiniuSecretKey" value="" />
<add key="QiniuBucket" value="" />
@ -160,7 +161,7 @@
<!-- 七牛参数配置end -->
</appSettings>
<!--
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367
可在 <httpRuntime> 标记上设置以下特性。
<system.Web>