1

BookingJieFeng/BookingJieFeng.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />

BookingWeb/BookingWeb.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />

DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js

@@ -1050,7 +1050,7 @@ Ext.extend(Shipping.MsChInvoiceIndex, Ext.Panel, {
         }
 
 
-        Ext.MessageBox.confirm(Zi.LAN.Prompt, Zi.LAN.suredelete, function (btn) {
+        Ext.MessageBox.confirm(Zi.LAN.Prompt, '确实要作废吗？', function (btn) {
             if (btn == 'yes') {
                 Ext.Ajax.request({
                     waitMsg: Zi.LAN.nowdelete,

DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs

@@ -2233,14 +2233,19 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
                     //则用ctnall的前两位填充size
                     //用ctnall的后两位填充ctn
 
-                    foreach (var ctn in bodyList) {
-                        if (!string.IsNullOrWhiteSpace(ctn.CTNALL) && string.IsNullOrWhiteSpace(ctn.SIZE))
-                        {
-                            ctn.SIZE = ctn.CTNALL.Substring(0, 2);
-                        }
-                        if (!string.IsNullOrWhiteSpace(ctn.CTNALL) && string.IsNullOrWhiteSpace(ctn.CTN))
+                    if (bodyList != null)
+                    {
+
+                        foreach (var ctn in bodyList)
                         {
-                            ctn.SIZE = ctn.CTNALL.Substring(ctn.CTNALL.Length - 2, 2);
+                            if (!string.IsNullOrWhiteSpace(ctn.CTNALL) && string.IsNullOrWhiteSpace(ctn.SIZE))
+                            {
+                                ctn.SIZE = ctn.CTNALL.Substring(0, 2);
+                            }
+                            if (!string.IsNullOrWhiteSpace(ctn.CTNALL) && string.IsNullOrWhiteSpace(ctn.CTN))
+                            {
+                                ctn.SIZE = ctn.CTNALL.Substring(ctn.CTNALL.Length - 2, 2);
+                            }
                         }
                     }
 

DispatchWeb/DispatchWeb.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />