From 96b6a8b04e6ff4e4063348744d027e422aa60cda Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Fri, 30 May 2025 10:47:06 +0800
Subject: [PATCH] 11

---
 .../Message/Response/InvoiceOrder/InvoiceOrderPageList.cs  | 7 +++++++
 .../Implementation/InvoiceOrder/InvoiceOrderService.cs     | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
index d1582b6..0d0017e 100644
--- a/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
+++ b/MyCode.Project.Domain/Message/Response/InvoiceOrder/InvoiceOrderPageList.cs
@@ -191,6 +191,13 @@ namespace MyCode.Project.Domain.Message.Response.InvoiceOrder
         /// Nullable:True
         /// </summary>           
         public string FDEMANDBILLNO { get; set; }
+        /// <summary>
+        /// Desc:备注
+        /// Default:
+        /// Nullable:True
+        /// </summary>           
+        public string Remark { get; set; }
+
 
     }
 }
diff --git a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
index ccf1ba5..9b3770c 100644
--- a/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
+++ b/MyCode.Project.Services/Implementation/InvoiceOrder/InvoiceOrderService.cs
@@ -293,7 +293,7 @@ namespace MyCode.Project.Services.Implementation
                 for (int i = 0; i < baoShu; i++)
                 {
 
-                    string FBarCode = $@"{orderItem.MaterialCode}*{act.CuseQty.ToString("F2")}*{orderItem.FBillNo}*{orderItem.FSupplierLot}";
+                    string FBarCode = $@"{orderItem.MaterialCode}*{act.CuseQty.ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}";
                     TiaoMaList tiaoMa = new TiaoMaList();
                     tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem);
                     tiaoMa.Id = Guid.NewGuid();
@@ -309,7 +309,7 @@ namespace MyCode.Project.Services.Implementation
                 }
                 if (yu > 0)
                 {
-                    string FBarCode = $@"{orderItem.MaterialCode}*{decimal.Parse(yu.ToString()).ToString("F2")}*{orderItem.FBillNo}*{orderItem.FSupplierLot}";
+                    string FBarCode = $@"{orderItem.MaterialCode}*{decimal.Parse(yu.ToString()).ToString("F2")}*{order.FBillNo}*{orderItem.FSupplierLot}";
                     TiaoMaList tiaoMa = new TiaoMaList();
                     tiaoMa = AutoMapperHelper.AutoMappToSingle<TiaoMaList, InvoiceOrderItem>(orderItem);
                     tiaoMa.Id = Guid.NewGuid();