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

222

Browse Source
This commit is contained in:
余宇波
2025-05-15 12:36:05 +08:00
parent 0684d8e4f5
commit c9c27ac3dc
5 changed files with 45 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
View File

@@ -102,8 +102,8 @@ namespace MyCode.Project.Services.Implementation
var temp = orderItems.FirstOrDefault(h => h.PurchaseOrderItemId == t.Id);
if (temp != null)
{
t.FRemainReceiveQty = t.FRemainReceiveQty + temp.Qty;
t.FReceiveQty = t.FReceiveQty - temp.Qty;
t.FRemainReceiveQty = t.FRemainReceiveQty + temp.Qty.SafeValue();
t.FReceiveQty = t.FReceiveQty - temp.Qty.SafeValue();
}
});
_purchaseOrderItemRepository.Update(purchaseItem);

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

@@ -320,6 +320,12 @@ namespace MyCode.Project.Services.Implementation
{
throw new BaseException("不能跨采购组织创建发货通知单");
}
if (loginInfo.IfForeign == 1 && string.IsNullOrWhiteSpace(act.F_VHUB_Text))
{
throw new BaseException("国外的供应商发票号和发票日期是必填.");
}
InvoiceOrder NewInvoiceOrder = new InvoiceOrder();
NewInvoiceOrder.Id = Guid.NewGuid();
NewInvoiceOrder.FiD = null;
@@ -363,7 +369,7 @@ namespace MyCode.Project.Services.Implementation
var purchaseOrder = orderHeadList.FirstOrDefault(h=>h.FiD==t.Fid);
if (purchaseOrder == null)
throw new BaseException("找不到对应的采购订单主表信息");
if ((temp.Qty + allqty) > (t.Qty - t.FReceiveQty))
if ((temp.Qty ) > (t.Qty - t.FReceiveQty))
{
string error = $@"{t.MaterialName}";
errorList.Add(error);
@@ -406,8 +412,8 @@ namespace MyCode.Project.Services.Implementation
billPush.CustomParams.F_URXD_Date = act.F_URXD_Date;
if (string.IsNullOrWhiteSpace(billPush.CustomParams.F_URXD_Date))
billPush.CustomParams.F_URXD_Date = null;
t.FReceiveQty = t.FReceiveQty.SafeValue() + temp.Qty;
t.FRemainReceiveQty = t.FRemainReceiveQty.SafeValue() - temp.Qty;
t.FReceiveQty = t.FReceiveQty + temp.Qty;
t.FRemainReceiveQty = t.FRemainReceiveQty - temp.Qty;
}
@@ -479,7 +485,9 @@ namespace MyCode.Project.Services.Implementation
userList = userList.Where(t => t.SupplierId == SupplierId).ToList();
userList.ForEach(t =>
{
var maxDate = _purchaseOrderRepository.Queryable().Where(h => h.SupplierId == t.SupplierId).Max(h => h.FModifyDate);
var items = _purchaseOrderItemRepository.Queryable().Where(h => h.SupplierId == t.SupplierId && h.Qty > h.MSSReceiveQty).Select(h=>h.Fid).ToList().Distinct().ToList();
var maxDate = _purchaseOrderRepository.Queryable().Where(h => h.SupplierId == t.SupplierId && items.Contains(h.FiD)).Min(h => h.FModifyDate);
DateTime begin = DateTime.Parse("2024-01-01");
if (maxDate.HasValue)
{
@@ -604,7 +612,8 @@ namespace MyCode.Project.Services.Implementation
purchaseOrderItem.FBillTaxAmount = item["FEntryTaxAmount"];
purchaseOrderItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"];
purchaseOrderItem.FReceiveQty = item["FBaseJoinQty"];
purchaseOrderItem.FRemainReceiveQty = purchaseOrderItem.Qty - purchaseOrderItem.FReceiveQty.SafeValue();
purchaseOrderItem.FRemainReceiveQty = purchaseOrderItem.Qty - purchaseOrderItem.FReceiveQty;
purchaseOrderItem.MSSReceiveQty= item["FReceiveQty"];
purchaseOrderItem.FMRPCloseStatus = item["FMRPCloseStatus"];
purchaseOrderItem.EntityId = item["FPOOrderEntry_FEntryId"];
purchaseOrderItem.MSSSupplierLot = item["FLot"];
@@ -629,11 +638,12 @@ namespace MyCode.Project.Services.Implementation
oldItem.TaxRate = item["FEntryTaxRate"];
oldItem.FBillTaxAmount = item["FEntryTaxAmount"];
oldItem.FReceiveQty = item["FBaseJoinQty"];
oldItem.FRemainReceiveQty = oldItem.Qty - oldItem.FReceiveQty.SafeValue();
oldItem.MSSReceiveQty = item["FReceiveQty"];
oldItem.FRemainReceiveQty = oldItem.Qty - oldItem.FReceiveQty;
oldItem.SpecificationModel = item["FMaterialId.FSpecification"];
//oldItem.FRemainReceiveQty = item["FBaseDeliveryMaxQty"];
//purchaseOrderItem.FReceiveQty = item["FBaseDeliveryMaxQty"];
oldItem.FReceiveQty = oldItem.Qty - oldItem.FRemainReceiveQty.SafeValue();
oldItem.FReceiveQty = oldItem.Qty - oldItem.FRemainReceiveQty;
oldItem.FMRPCloseStatus = item["FMRPCloseStatus"];
oldItem.EntityId = item["FPOOrderEntry_FEntryId"];
oldItem.MSSSupplierLot = item["FLot"];