From 0ecbc73c0bd094deda959c37112ad2e9c5781533 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 15 May 2025 23:43:24 +0800
Subject: [PATCH] 2321
---
MyCode.Project.GenerateCode/App.config | 2 +-
MyCode.Project.ScheduleTask/App.config | 2 +-
.../Implementation/InvoiceOrder/InvoiceOrderService.cs | 2 +-
.../Implementation/PurchaseOrder/PurchaseOrderService.cs | 4 ++--
MyCode.Project.WebApi/Web.config | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/MyCode.Project.GenerateCode/App.config b/MyCode.Project.GenerateCode/App.config
index 1f83544..fd4312c 100644
--- a/MyCode.Project.GenerateCode/App.config
+++ b/MyCode.Project.GenerateCode/App.config
@@ -11,7 +11,7 @@
-
+
diff --git a/MyCode.Project.ScheduleTask/App.config b/MyCode.Project.ScheduleTask/App.config
index 875e6a2..58fd615 100644
--- a/MyCode.Project.ScheduleTask/App.config
+++ b/MyCode.Project.ScheduleTask/App.config
@@ -17,7 +17,7 @@
-
+
diff --git a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
index da323e8..4318d12 100644
--- a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
+++ b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
@@ -345,7 +345,7 @@ namespace MyCode.Project.Services.Implementation
_workProcessService.Add(this.MerchantId, "AddTiaoMa", "生成条码档案", JsonHelper.ToJson(addTiaoMas), 5);
}
-
+ addList = addList.OrderBy(t => t.SortNum).ToList();
TiaoMaResp result = new TiaoMaResp();
result.Id = orderItem.Id;
result.BarCodeList = addList;
diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index a2ec3b0..ec11ae9 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -362,14 +362,14 @@ namespace MyCode.Project.Services.Implementation
list.ForEach(t =>
{
- var allqty = allInvoiceOrderItem.Where(h => h.PurchaseOrderItemId == t.Id ).Sum(h => h.Qty).SafeValue();
+ //var allqty = allInvoiceOrderItem.Where(h => h.PurchaseOrderItemId == t.Id ).Sum(h => h.Qty).SafeValue();
var temp = updateList.Where(h => h.Id == t.Id).FirstOrDefault();
if (temp != null)
{
var purchaseOrder = orderHeadList.FirstOrDefault(h=>h.FiD==t.Fid);
if (purchaseOrder == null)
throw new BaseException("找不到对应的采购订单主表信息");
- if ((temp.Qty ) > (t.Qty - t.FReceiveQty))
+ if ((temp.Qty ) > (t.Qty - t.MSSReceiveQty))
{
string error = $@"{t.MaterialName}";
errorList.Add(error);
diff --git a/MyCode.Project.WebApi/Web.config b/MyCode.Project.WebApi/Web.config
index 4639985..d965473 100644
--- a/MyCode.Project.WebApi/Web.config
+++ b/MyCode.Project.WebApi/Web.config
@@ -24,7 +24,7 @@
-
+