From be3619103ac45188ff433e46b409ec007147ce1c Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Wed, 9 Jul 2025 10:03:13 +0800
Subject: [PATCH] 11

---
 MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs   | 2 +-
 MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs | 2 +-
 MyCode.Project.Repositories/PurchaseOrderRepository.cs        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs b/MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs
index 64555c7..e62d47a 100644
--- a/MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs
+++ b/MyCode.Project.Domain/Message/Act/PurchaseOrder/BillPush.cs
@@ -81,7 +81,7 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
         /// </summary>
         public int FENTRYID { get; set; }
 
-        public int Qty { get; set; }
+        public decimal Qty { get; set; }
 
         public string FSupplierLot { get; set; }
     }
diff --git a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
index d093c58..4909d6b 100644
--- a/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
+++ b/MyCode.Project.Domain/Message/Act/PurchaseOrder/UpdateTime.cs
@@ -55,7 +55,7 @@ namespace MyCode.Project.Domain.Message.Act.PurchaseOrder
         /// <summary>
         /// 要发货的数量
         /// </summary>
-        public int Qty { get; set; }
+        public decimal Qty { get; set; }
 
         /// <summary>
         /// 供应商批号
diff --git a/MyCode.Project.Repositories/PurchaseOrderRepository.cs b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
index ebae73a..e64b535 100644
--- a/MyCode.Project.Repositories/PurchaseOrderRepository.cs
+++ b/MyCode.Project.Repositories/PurchaseOrderRepository.cs
@@ -49,8 +49,8 @@ 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");
-            where.AddSqlCondition(" FCancelStatus ='A' and FMRPCloseStatus='A' ",true);
-
+            //where.AddSqlCondition(" FCancelStatus ='A' and FMRPCloseStatus='A' ",true);
+            where.AddSqlCondition("[FBILLTYPEID] in ('样品采购订单','标准采购订单','Standard Purchase Order','标准委外订单','Sample Purchase Order','Standard Subcontract Order') ", true);
 
             string sql = $@"select a.[Id] AS FormId  ,1 IfFaHuo
       ,[SupplierName]