From 36ed9f3c45b65ba3e26d4517ce297c0bb5caff2c Mon Sep 17 00:00:00 2001 From: hanxuntao <641739520@qq.com> Date: Fri, 20 Oct 2023 15:06:30 +0800 Subject: [PATCH] 1 --- BookingJieFeng/BookingJieFeng.csproj.user | 2 +- BookingWeb/BookingWeb.csproj.user | 2 +- .../Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs | 4 ++++ .../Areas/MvcShipping/Controllers/BookingConfirmController.cs | 2 +- .../MvcShipping/Models/BookingConfirm/BookingConfirmModel.cs | 2 +- .../Viewsjs/MsUserAuthority/MsUserAuthorityIndex.js | 2 ++ DSWeb/DSWeb.csproj.user | 2 +- DispatchWeb/DispatchWeb.csproj.user | 2 +- 8 files changed, 12 insertions(+), 6 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 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true 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 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs b/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs index e5d5cde8..a644c7ae 100644 --- a/DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs +++ b/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"]); diff --git a/DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs b/DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs index 5f262138..2cc5c878 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/BookingConfirmController.cs @@ -576,7 +576,7 @@ namespace DSWeb.MvcShipping.Controllers //SI CTN数据 var SICtnList = ModelObjectBill.getDicList(ModelObjectConvert.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.ToModelObjectList(dataList_3)); diff --git a/DSWeb/Areas/MvcShipping/Models/BookingConfirm/BookingConfirmModel.cs b/DSWeb/Areas/MvcShipping/Models/BookingConfirm/BookingConfirmModel.cs index c4f7ab00..fa96a312 100644 --- a/DSWeb/Areas/MvcShipping/Models/BookingConfirm/BookingConfirmModel.cs +++ b/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() diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsUserAuthority/MsUserAuthorityIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsUserAuthority/MsUserAuthorityIndex.js index b10904b8..471ab08c 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsUserAuthority/MsUserAuthorityIndex.js +++ b/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(); } } }); diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index 5d714467..a8615099 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles 配置文件1 true - Release|Any CPU + Debug|Any CPU 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 @@  - Release|Any CPU + Debug|Any CPU true