diff --git a/MyCode.Project.Domain/Config/SystemConfig.cs b/MyCode.Project.Domain/Config/SystemConfig.cs
index b829c3c..bbefef2 100644
--- a/MyCode.Project.Domain/Config/SystemConfig.cs
+++ b/MyCode.Project.Domain/Config/SystemConfig.cs
@@ -182,17 +182,17 @@ namespace MyCode.Project.Domain.Config
///让哥的抖音API地址
///
public static string DouYinApiUrl = WebConfigUtils.GetAppSettingsInfo("DouYinApiUrl");
-
-
- ///
- /// 让哥的抖音API Token
- ///
- public static string DouYinApiToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJsb2dpbiI6IntcImxvZ2luXCI6XCJhZG1pblwiLFwibmFtZVwiOlwi57O757ufXCIsXCJ1c2VySWRcIjpcIlwifSIsImlzcyI6InN5c3RlbSIsImF1ZCI6IkFueSIsImV4cCI6MzI3MjE1MDc1NiwibmJmIjoxNzE2OTUwNzU2fQ.xPLulTwzyh4ZuYfed_xfFDwYO35WatZcy98rcOwparQ";
-
+
///
/// 后台系统的API地址
///
public static string LxmAdminApiUrl = WebConfigUtils.GetAppSettingsInfo("LxmAdminApiUrl");
+
+ ///
+ /// 需要推送发货单的收料组织编码
+ ///
+
+ public static string ReceiveorgCode = WebConfigUtils.GetAppSettingsInfo("ReceiveorgCode");
}
diff --git a/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs b/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
index 9f7201e..c53360c 100644
--- a/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
+++ b/MyCode.Project.Domain/Message/Response/PurchaseOrder/PurchaseOrderPageList.cs
@@ -191,6 +191,24 @@ namespace MyCode.Project.Domain.Message.Response.PurchaseOrder
///
public string FBILLTYPEID { get; set; }
+ ///
+ /// Desc:收料组织编码
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgCode { get; set; }
+
+ ///
+ /// Desc:收料组织名称
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgName { get; set; }
+ ///
+ /// 是否可以勾选发货 1=可以 0=不可以
+ ///
+ public int IfFaHuo { get; set; }
+
}
diff --git a/MyCode.Project.Domain/Model/InvoiceOrderItem.cs b/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
index c43596d..2009657 100644
--- a/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
+++ b/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
@@ -205,5 +205,26 @@ namespace MyCode.Project.Domain.Model
///
public string ShouLiaoFBillNo {get;set;}
+ ///
+ /// Desc:收料组织编码
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgCode {get;set;}
+
+ ///
+ /// Desc:收料组织名称
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgName {get;set;}
+
+ ///
+ /// Desc:收料组织ID
+ /// Default:
+ /// Nullable:True
+ ///
+ public string freceiveorgId {get;set;}
+
}
}
diff --git a/MyCode.Project.Domain/Model/PurchaseOrderItem.cs b/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
index 8981ff5..cccedc1 100644
--- a/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
+++ b/MyCode.Project.Domain/Model/PurchaseOrderItem.cs
@@ -212,5 +212,26 @@ namespace MyCode.Project.Domain.Model
///
public decimal MSSReceiveQty {get;set;}
+ ///
+ /// Desc:收料组织编码
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgCode {get;set;}
+
+ ///
+ /// Desc:收料组织名称
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ReceiveorgName {get;set;}
+
+ ///
+ /// Desc:收料组织ID
+ /// Default:
+ /// Nullable:True
+ ///
+ public string freceiveorgId {get;set;}
+
}
}
diff --git a/MyCode.Project.Repositories/PurchaseOrderRepository.cs b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
index a7b242a..c56e472 100644
--- a/MyCode.Project.Repositories/PurchaseOrderRepository.cs
+++ b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
@@ -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;
///
/// 采购订单分页列表
///
@@ -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;
diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index 2858d77..49ee8e7 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -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 data = JsonHelper.ToObject>(result);
//List data = System.Text.Json.JsonSerializer.Deserialize>(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;
diff --git a/MyCode.Project.WebApi/Web.config b/MyCode.Project.WebApi/Web.config
index 602f199..5f01253 100644
--- a/MyCode.Project.WebApi/Web.config
+++ b/MyCode.Project.WebApi/Web.config
@@ -74,7 +74,8 @@
-
+
+
@@ -151,8 +152,8 @@
-
-
+
+
@@ -160,7 +161,7 @@