From fe168e3196f8a52094ad0362d20c1c4b11f295c9 Mon Sep 17 00:00:00 2001
From: ddlucky <ddlucky@sina.com>
Date: Mon, 30 Jan 2023 13:21:41 +0800
Subject: [PATCH] =?UTF-8?q?DS7=E5=90=88=E8=A7=84=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=9A=84=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=A8=8D=E4=BD=9C=E4=BF=AE=E6=94=B9=EF=BC=9B=E8=AF=9A=E9=94=90?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=B5=81=E7=A8=8B=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs    | 16 +++++++-------
 .../MvcShipping/Helper/DingTalkHelper.cs      |  6 +++++-
 .../Viewsjs/MsOpSeae/MsOpSeaeEdit.js          | 21 +++++++++++++++++--
 3 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
index 14244316..3a3fe365 100644
--- a/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
+++ b/DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
@@ -6395,10 +6395,11 @@ namespace DSWeb.Areas.CommMng.DAL
 
             var ruleresult = JsonConvert.Deserialize<RulesEngineResult_Root>(rtn);
 
-            var msg = "";
-            foreach (var detail in ruleresult.extra.detailList) {
-                msg += detail.resultName+"\r\n";
-            }
+            //var msg = "";
+            //foreach (var detail in ruleresult.extra.detailList) {
+            //    msg += detail.resultName+"\r\n";
+            //}
+
             result.Data = ruleresult;
             result.OK("校验完成");
             return result;
@@ -6622,7 +6623,8 @@ namespace DSWeb.Areas.CommMng.DAL
 
                 if (!string.IsNullOrWhiteSpace(head.PORTDISCHARGEID)) {
 
-                    bi.portDischargeCountryNo = head.PORTDISCHARGEID.Substring(0, 2);
+                    if (head.PORTDISCHARGEID.Length >= 2)
+                        bi.portDischargeCountryNo = head.PORTDISCHARGEID.Substring(0, 2);
 
                     var dischargecountry = cdc.code_country.FirstOrDefault(x => x.COUNTRYID == bi.portDischargeCountryNo);
                     if (dischargecountry != null) { 
@@ -6634,8 +6636,8 @@ namespace DSWeb.Areas.CommMng.DAL
 
                 if (!string.IsNullOrWhiteSpace(head.TRANSPORT))
                 {
-
-                    bi.transportCountryNo = head.TRANSPORT.Substring(0, 2);
+                    if(head.TRANSPORT.Length>=2)
+                        bi.transportCountryNo = head.TRANSPORT.Substring(0, 2);
 
                     var transportcountry = cdc.code_country.FirstOrDefault(x => x.COUNTRYID == bi.transportCountryNo);
                     if (transportcountry != null)
diff --git a/DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs b/DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs
index 1152ff50..fe1d9154 100644
--- a/DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs
+++ b/DSWeb/Areas/MvcShipping/Helper/DingTalkHelper.cs
@@ -509,7 +509,11 @@ namespace DSWeb.Areas.MvcShipping.Helper
 
                 foreach (var item in wmsinList)
                 {
-                    var 车队 = 车队list.First(x => x.GID == item.CHEDUIID).SHORTNAME;
+                    var 车队 = "";
+
+                    if(!string.IsNullOrWhiteSpace(item.CHEDUIID))
+                        车队 = 车队list.First(x => x.GID == item.CHEDUIID).SHORTNAME;
+
                     var newrk = new List<DingTalkFormField>
                     {
                         new DingTalkFormField("提单号", item.BLNO),
diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
index f1143c01..52999089 100644
--- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
+++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
@@ -19787,8 +19787,25 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
                             var grid = Ext.create('Ext.grid.Panel', {
                                 store: store,
                                 columns: [
-                                    //{ text: "校验提醒", flex: 1, dataIndex: 'errorType', sortable: true },
-                                    { text: "校验内容", flex: 1, dataIndex: 'resultName', sortable: true }
+                                    {
+                                        text: " ", flex: 1, dataIndex: 'errorType', sortable: true,
+                                        renderer: function (value, cellmeta) {
+                                            if (value == "Error" ) {
+                                                return "<img src='../../../../TruckMng/Content/Images/upload-stop.gif' />";
+                                            }
+                                            if (value == "Warning") {
+                                                return "<img src='../../../../TruckMng/Content/Images/btn-warning.png' />";
+                                            }
+
+                                        }
+                                    },
+                                    {
+                                        text: "校验内容", flex: 11, dataIndex: 'resultName', sortable: true,
+                                        renderer: function (value, meta, record) {
+                                            meta.style = 'overflow:auto;padding: 1px 6px;text-overflow: ellipsis;white-space: nowrap;white-space:normal;line-height:20px;';
+                                            return value;
+                                        }
+                                    }
                                 ],
                                 forceFit: true,
                                 split: true,