From 0684d8e4f544ddb4d0470b5a60d595737602cc2f Mon Sep 17 00:00:00 2001
From: yuyubo <1870149533@qq.com>
Date: Thu, 15 May 2025 09:22:12 +0800
Subject: [PATCH] 22

---
 MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs     | 8 ++++----
 .../Implementation/PurchaseOrder/PurchaseOrderService.cs  | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs b/MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs
index 80bf117..d248352 100644
--- a/MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs
+++ b/MyCode.Project.Domain/Dtos/Request/Act/SysloginAct.cs
@@ -33,12 +33,12 @@ namespace MyCode.Project.Domain.Dtos.Request.Act
         /// <summary>
         /// 珠海版本号
         /// </summary>
-        public int Version { get; set; }
+        public string Version { get; set; }
 
         /// <summary>
         /// 泰国版本号
         /// </summary>
-        public int TaiGuoVersion { get; set; }
+        public string TaiGuoVersion { get; set; }
 
         /// <summary>
         /// 备注
@@ -69,12 +69,12 @@ namespace MyCode.Project.Domain.Dtos.Request.Act
         /// <summary>
         /// 珠海版本号版本号
         /// </summary>
-        public int Version { get; set; }
+        public string Version { get; set; }
 
         /// <summary>
         /// 泰国版本号
         /// </summary>
-        public int TaiGuoVersion { get; set; }
+        public string TaiGuoVersion { get; set; }
 
 
     }
diff --git a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
index a1824b3..d79b4b6 100644
--- a/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
+++ b/MyCode.Project.Services/Implementation/PurchaseOrder/PurchaseOrderService.cs
@@ -402,9 +402,11 @@ namespace MyCode.Project.Services.Implementation
                         tempUpdate.FENTRYID = t.EntityId.SafeValue();
                         tempUpdate.FSupplierLot = temp.FSupplierLot;
                         billPush.CustomParams.ScanEntry.Add(tempUpdate);
-                        billPush.CustomParams.FPH= act.F_VHUB_Text;
+                        billPush.CustomParams.FPH= act.F_VHUB_Text;                   
                         billPush.CustomParams.F_URXD_Date = act.F_URXD_Date;
-                        t.FReceiveQty = t.FReceiveQty.SafeValue() + temp.Qty;
+                        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;