From 787b81dacd07b2266bf3d2d59cd2d582799c7713 Mon Sep 17 00:00:00 2001
From: hanxuntao <dev001@dongshengsoft.com>
Date: Wed, 8 May 2024 14:56:32 +0800
Subject: [PATCH] 1

---
 BookingJieFeng/BookingJieFeng.csproj.user     |  2 +-
 BookingWeb/BookingWeb.csproj.user             |  2 +-
 .../Viewsjs/Chfee_invoice/ChInvoiceIndex.js   |  2 +-
 .../MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs   | 19 ++++++++++++-------
 DispatchWeb/DispatchWeb.csproj.user           |  2 +-
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user
index 28be9c4c..a48b3371 100644
--- a/BookingJieFeng/BookingJieFeng.csproj.user
+++ b/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 />
diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/BookingWeb/BookingWeb.csproj.user
+++ b/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 />
diff --git a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js b/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js
index fa8e2cad..48cc0ac7 100644
--- a/DSWeb/Areas/Account/Viewsjs/Chfee_invoice/ChInvoiceIndex.js
+++ b/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,
diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
index 35341a83..8c1c6fa0 100644
--- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
+++ b/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);
+                            }
                         }
                     }
 
diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user
index af17a67a..e6a8406a 100644
--- a/DispatchWeb/DispatchWeb.csproj.user
+++ b/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 />