From 5699e869439150a81dd979b4bda7167db9166d74 Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 22 May 2025 22:55:14 +0800
Subject: [PATCH] 22
---
.../Request/PurchaseOrder/PurchaseOrderPageSearch.cs | 2 ++
MyCode.Project.Domain/Model/InvoiceOrderItem.cs | 7 +++++++
MyCode.Project.ScheduleTask/App.config | 11 +++++++++--
.../InvoiceOrder/InvoiceOrderService.cs | 2 +-
MyCode.Project.WebApi/Web.config | 12 +++++++++---
5 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs b/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
index 015e2ac..6045cdd 100644
--- a/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
+++ b/MyCode.Project.Domain/Message/Request/PurchaseOrder/PurchaseOrderPageSearch.cs
@@ -56,6 +56,8 @@ namespace MyCode.Project.Domain.Message.Request.PurchaseOrder
/// Nullable:True
///
public string MaterialCode { get; set; }
+
+
}
public class PurchaseOrderItemSearch
diff --git a/MyCode.Project.Domain/Model/InvoiceOrderItem.cs b/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
index 41d1b14..c43596d 100644
--- a/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
+++ b/MyCode.Project.Domain/Model/InvoiceOrderItem.cs
@@ -198,5 +198,12 @@ namespace MyCode.Project.Domain.Model
///
public decimal? CuseQty {get;set;}
+ ///
+ /// Desc:金蝶的收料通知单号
+ /// Default:
+ /// Nullable:True
+ ///
+ public string ShouLiaoFBillNo {get;set;}
+
}
}
diff --git a/MyCode.Project.ScheduleTask/App.config b/MyCode.Project.ScheduleTask/App.config
index 58fd615..ef3a9d0 100644
--- a/MyCode.Project.ScheduleTask/App.config
+++ b/MyCode.Project.ScheduleTask/App.config
@@ -191,13 +191,20 @@
-
+
-
+
+
+
+
+
+
+
+
diff --git a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
index 4318d12..a47ff46 100644
--- a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
+++ b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
@@ -200,7 +200,7 @@ namespace MyCode.Project.Services.Implementation
var oldItem = oldItems.FirstOrDefault();
if (oldItems.Count > 1)
{
- oldItem= oldItems.FirstOrDefault(h=>h.FSupplierLot== FSupplierLot);
+ oldItem= oldItems.Where(t=>t.MSSSupplierLot=="0" || t.MSSSupplierLot == null).FirstOrDefault(h=>h.FSupplierLot== FSupplierLot);
}
if (oldItem == null)
{
diff --git a/MyCode.Project.WebApi/Web.config b/MyCode.Project.WebApi/Web.config
index d965473..71010ef 100644
--- a/MyCode.Project.WebApi/Web.config
+++ b/MyCode.Project.WebApi/Web.config
@@ -182,11 +182,17 @@
-
-
-
+
+
+
+
+
+
+
+
+