From b40af0bf7784ea07536d325fa2de57a1568f2c71 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 04 三月 2026 15:12:47 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 DAL/ClsWL_YayBillMain.cs |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/DAL/ClsWL_YayBillMain.cs b/DAL/ClsWL_YayBillMain.cs
index d45d241..280fe75 100644
--- a/DAL/ClsWL_YayBillMain.cs
+++ b/DAL/ClsWL_YayBillMain.cs
@@ -231,6 +231,7 @@
                 // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿锛岀敤浜庣┖鏃ユ湡瀛楁鐨勯粯璁ゅ��
                 // 鑾峰彇褰撳墠鏃ユ湡鏃堕棿
                 string currentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+                string safeDateTime = "2000-01-01";
                 // 杈呭姪鏂规硶锛氬畨鍏ㄨ浆鎹负瀛楃涓诧紝澶勭悊null鍜岀┖瀛楃涓�
 
 
@@ -303,21 +304,21 @@
                            SafeDateTime(omodel.HDateForRequestedPick?.ToString(), "'" + currentDateTime + "'") + "," +
                            SafeDateTime(omodel.HDataForRequestedArrived?.ToString(), "'" + currentDateTime + "'") + "," +
                            SafeInt(omodel.HCarryStatus?.ToString(), 1) + "," + // HCarryStatus
-                           SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + currentDateTime + "'") + "," +
+                           SafeDateTime(omodel.HDate_CarrierSure?.ToString(), "'" + safeDateTime + "'") + "," +
                            SafeDateTime(omodel.HDate_AllocationDriver?.ToString(), "'" + currentDateTime + "'") + "," +
                            SafeInt(omodel.HCarID?.ToString(), 0) + "," + // HCarID
                            SafeInt(omodel.HDriverID?.ToString(), 0) + "," + // HDriverID
                            "'" + SafeString(omodel.HSurer_Arrive) + "'," +
-                           SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + currentDateTime + "'") + "," +
+                           SafeDateTime(omodel.HDate_Arrive?.ToString(), "'" + safeDateTime + "'") + "," +
                            "'" + SafeString(omodel.HSurer_Pick) + "'," +
-                           SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + currentDateTime + "'") + "," +
+                           SafeDateTime(omodel.HDate_Pick?.ToString(), "'" + safeDateTime + "'") + "," +
                            "'" + SafeString(omodel.HSurer_Trans) + "'," +
-                           SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + currentDateTime + "'") + "," +
+                           SafeDateTime(omodel.HDate_Trans?.ToString(), "'" + safeDateTime + "'") + "," +
                            "'" + SafeString(omodel.HSurer_Receive) + "'," +
                            "'" + omodel.HExRate + "'," +
-                           SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + currentDateTime + "'") + "," +
+                           SafeDateTime(omodel.HDate_Receive?.ToString(), "'" + safeDateTime + "'") + "," +
                            "'" + SafeString(omodel.HSurer_Accounting) + "'," +
-                           SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + currentDateTime + "'") + ")"; 
+                           SafeDateTime(omodel.HDate_Accounting?.ToString(), "'" + safeDateTime + "'") + ")"; 
 
                 oCn.RunProc(sql);
                 //涓昏〃              

--
Gitblit v1.9.1