From 7d50265a999708d23b0b99631ae88258f287913f Mon Sep 17 00:00:00 2001
From: "hao.jin" <hao.jin@ccwin-in.com>
Date: Tue, 26 Apr 2022 16:17:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E6=9E=90=E6=8A=A5=E6=96=87=E6=97=B6?=
 =?UTF-8?q?=20=E5=8D=B8=E8=B4=A7=E7=82=B9=E6=98=AF=E5=90=A6=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E7=9A=84=E6=A0=A1=E9=AA=8C=202.=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=BB=9F=E4=B8=80=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs       | 9 +++++++--
 Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs   | 2 +-
 Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs      | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs
index c872d8c..e59ad59 100644
--- a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs
+++ b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_EDI_JIS5000Sequence.cs
@@ -119,8 +119,8 @@ namespace Stone.WinBiz.JISAdmin
                 }
                 catch (Exception ex)
                 {
-                    MyLogger.Write(file.Name + " 处理失败，原因为：" + ex.Message);
-
+                    // MyLogger.Write(file.Name + " 处理失败，原因为：" + ex.Message);
+                    MyLogger.Write(file.Name + " 处理失败，原因为：报文异常解析失败！");
                     if (sr != null) sr.Close();
                     
                     drJIS_Log["EndTime"] = MyDateTime.GetServerDateTime();
@@ -287,6 +287,11 @@ namespace Stone.WinBiz.JISAdmin
                         if (strState == "0" || string.IsNullOrEmpty(strState))
                             strPartMsg += "卸货点 " + location + " 已失效！" + Environment.NewLine;
                     }
+                    else
+                    {
+                        strPartMsg += "卸货点 " + location + " 未在系统中定义效！" + Environment.NewLine;
+                    }
+
                     //校验卸货点、卸货点代码是否匹配
                     strsql = "select top 1 * from t_Location" +
                              " where Code = '" + location + "'" +
diff --git a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs
index 358b3a2..ddcf5d3 100644
--- a/Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs
+++ b/Stone.WinForm/Stone.WinBiz/JISAdmin/F_JIS5000_Print.cs
@@ -833,7 +833,7 @@ namespace Stone.WinBiz.JISAdmin
                 //ARD+9169691-03+24+L723190709++90000841838'
                 //金杯李尔不换行
                 //string line = "ARD+{0}+{1}+{2}:000000++{3}'\r\n";
-                string line = "ARD+{0}+{1}+{2}:000000++{3}'";
+                string line = "ARD+{0}+{1}+{2}:000000++{3}:00000'";
                 object[] obj = new object[4];
                 obj[0] = drData["PartNumber"].ToString().Trim(); //零件号
                 obj[1] = drData["Qty"].ToString().Trim(); //数量
diff --git a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs
index cd4df84..9cca0b6 100644
--- a/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs
+++ b/Stone.WinForm/Stone.WinModule/Standard/frmJISVDA.cs
@@ -619,10 +619,10 @@ namespace Stone.WinModule.Standard
                         drVDA["OrderNumber"] = orderNumber;
                         drVDA["LocationCode"] = locationCode;
                         drVDA["releaseId"] = "";
-                        // drVDA["IsPrintLabel"] = 1;
+                        drVDA["IsPrintLabel"] = 1;
                         // drVDA["IsPackingVerification"] = 1;
                         // drVDA["IsShipingVerification"] = 1;
-                        // drVDA["IsPrintASN"] = 1;
+                        drVDA["IsPrintASN"] = 1;
                         // drVDA["IsUpload"] = 1;
                         // drVDA["UploadTime"] = DateTime.Now;
                         // drVDA["PrintASNTime"] = DateTime.Now;