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/DAL/Chfee_settlement/Chfee_SettlementDAL.cs

@@ -376,6 +376,10 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
                     if (reader["AUDITTIME"] != DBNull.Value)
                         data.AUDITTIME = Convert.ToDateTime(reader["AUDITTIME"]);
                     data.AUDITUSER = Convert.ToString(reader["AUDITUSER"]);
+                    data.AUDITUSERREF = Convert.ToString(reader["AUDITUSERREF"]);
+                    data.DELETEUSERREF = Convert.ToString(reader["DELETEUSERREF"]);
+                    if (reader["DELETETIME"] != DBNull.Value)
+                        data.DELETETIME= Convert.ToDateTime(reader["DELETETIME"]).ToString("yyyy-MM-dd");
                     if (reader["ISEXPORT"] != DBNull.Value)
                         data.ISEXPORT = Convert.ToBoolean(reader["ISEXPORT"]);
                     data.FINANCIALVOUCHER = Convert.ToString(reader["FINANCIALVOUCHER"]);

DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs

@@ -576,7 +576,7 @@ namespace DSWeb.MvcShipping.Controllers
             //SI CTN数据
             var SICtnList = ModelObjectBill.getDicList(ModelObjectConvert<Booking_SICtnmb>.ToModelObjectList(dataList_2));
 
-            var dataList_3 = BookingConfirmDAL.GetSICtnDetailList(" CTN_ID in(select CTN_ID from OP_CTN where ORDNO='" + SINO + "')", Convert.ToString(Session["USERID"]), "");
+            var dataList_3 = BookingConfirmDAL.GetSICtnDetailList(" CTN_ID in(select CTN_ID from OP_SI_CTN where ORDNO='" + SINO + "')", Convert.ToString(Session["USERID"]), "");
             //SI 多品名数据
             var SICtnDetailList = ModelObjectBill.getDicList(ModelObjectConvert<Booking_SICtnDetailmb>.ToModelObjectList(dataList_3));
 

DSWeb/Areas/MvcShipping/Models/BookingConfirm/BookingConfirmModel.cs

@@ -172,7 +172,7 @@ namespace DSWeb.MvcShipping.Models.BookingConfirm
 
         public static string getSQL()
         {
-            return " SELECT  [CTN_ID],[ORDNO],[CTNALL],[CTNNUM],[TEU],[CNTRNO],[SEALNO],[PKGS],[KINDPKGS],[KGS],[CBM],[TAREWEIGHT],[CTNSTATUS],[WEIGHTYPE],[WEIGHKGS],[WEIGHATTN],[VGMCONNCOM],[WEIGHTEL],[WEIGHDATE],[VGMADDR],[VGMEMAIL],[REMARK] ,(select bsno from OP_SEAE_ORDER where ORDNO in(select ORDNO from op_seae_si where SINO=[OP_CTN].ORDNO)) BSNO_PARENT,(select bsno from OP_SEAE_ORDER where ORDNO =[OP_SI_CTN].ORDNO) BSNO,(select MBLNO from OP_SEAE_SI where SINO =[OP_SI_CTN].ORDNO) SI_MBLNO FROM [OP_SI_CTN] ";
+            return " SELECT  [CTN_ID],[ORDNO],[CTNALL],[CTNNUM],[TEU],[CNTRNO],[SEALNO],[PKGS],[KINDPKGS],[KGS],[CBM],[TAREWEIGHT],[CTNSTATUS],[WEIGHTYPE],[WEIGHKGS],[WEIGHATTN],[VGMCONNCOM],[WEIGHTEL],[WEIGHDATE],[VGMADDR],[VGMEMAIL],[REMARK] ,(select bsno from OP_SEAE_ORDER where ORDNO in(select ORDNO from op_seae_si where SINO=[OP_SI_CTN].ORDNO)) BSNO_PARENT,(select bsno from OP_SEAE_ORDER where ORDNO =[OP_SI_CTN].ORDNO) BSNO,(select MBLNO from OP_SEAE_SI where SINO =[OP_SI_CTN].ORDNO) SI_MBLNO FROM [OP_SI_CTN] ";
         }
 
         public Booking_SICtnmb()

DSWeb/Areas/MvcShipping/Viewsjs/MsUserAuthority/MsUserAuthorityIndex.js

@@ -366,6 +366,7 @@ Ext.extend(Shipping.MsUserAuthorityIndex, Ext.Panel, {
                         callback: function (r, options, success) {
                             if (success) {
                                 VisibleIsload = true;
+                                _this.tabtree_VISIBLE.expandAll();
                             }
                         }
                     });
@@ -415,6 +416,7 @@ Ext.extend(Shipping.MsUserAuthorityIndex, Ext.Panel, {
                         callback: function (r, options, success) {
                             if (success) {
                                 OperateIsload = true;
+                                _this.tabtree_OPERATE.expandAll();
                             }
                         }
                     });

DSWeb/DSWeb.csproj.user

@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />

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 />