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(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 { 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 ""; + } + if (value == "Warning") { + return ""; + } + + } + }, + { + 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,