From 91d75f344372efe6e494e8277f523057d5d038ca Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 13 五月 2025 15:42:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-WEBS

---
 CLOUDWEB/WebService1.asmx.cs |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 0f18e6e..311c4d4 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -58327,7 +58327,7 @@
                 string HProduceDate = "";//鐢熶骇鏃ユ湡
                 string HExpiryDate = "";//淇濊川鏈熻嚦
            
-                if (str.Length == 8 && HISKFPERIOD == "1")
+                if (str.Length == 9 && HISKFPERIOD == "1")
                 {
                     if (!string.IsNullOrWhiteSpace(str[7]))
                     {
@@ -58343,14 +58343,20 @@
                     }
 
                     HProduceDate = HDate.ToString();
-                  
-                    //if (!DateTime.TryParse(str[8], out HDate))
-                    //{
-                    //    sErrMsg = "鏉$爜瑙f瀽澶辫触," + str[8] + ",淇濊川鏈熸牸寮忎笉姝g‘!";
-                    //    return false;
-                    //}
-                    //HExpiryDate = HDate.ToString();
-                    //HISKFPERIOD = 1;
+
+                    if (!string.IsNullOrWhiteSpace(str[8]))
+                    {
+                        try
+                        {
+                            HDate = DateTime.ParseExact(str[8], "yyyyMMdd", CultureInfo.InvariantCulture);
+                        }
+                        catch
+                        {
+                            sErrMsg = "鏉$爜瑙f瀽澶辫触," + str[8] + ",鐢熶骇鏃ユ湡鏍煎紡涓嶆纭�!";
+                            return false;
+                        }
+                    }
+                    HExpiryDate = HDate.ToString();
                 }
 
                 string HSupIDs = "0";

--
Gitblit v1.9.1