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
///
/// 珠海版本号
///
- public int Version { get; set; }
+ public string Version { get; set; }
///
/// 泰国版本号
///
- public int TaiGuoVersion { get; set; }
+ public string TaiGuoVersion { get; set; }
///
/// 备注
@@ -69,12 +69,12 @@ namespace MyCode.Project.Domain.Dtos.Request.Act
///
/// 珠海版本号版本号
///
- public int Version { get; set; }
+ public string Version { get; set; }
///
/// 泰国版本号
///
- 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;