From dd76fb4716374e4d954e797e568e0255482d0e78 Mon Sep 17 00:00:00 2001 From: hanxuntao <641739520@qq.com> Date: Fri, 7 Apr 2023 16:06:18 +0800 Subject: [PATCH 1/2] 1 --- DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs | 2 +- DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs | 2 +- DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs index 35059bd8..867f5a2e 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs @@ -2912,7 +2912,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL bodyList.Add(feejztondata); decimal JFton = Math.Round(KGS * Convert.ToDecimal(0.0025), 3, MidpointRounding.AwayFromZero); - if (ton > CBM) + if (JFton > CBM) { var feetondata = new MsFeeUnit(); diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs index 169fb724..46e2bdd7 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs @@ -1459,7 +1459,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL strSql.Append("WAREHOUSE,CLOSEDOCDATE,INTOPORTDATE,CORPID,SALEDEPT,MBLFRT,CREATETIME,STLNAME,dbo.trimdate(STLDATE) STLDATE,OPERATORCODE,OPERATOR,OPERATOREMAIL,OPERATORTEL,OPERATORFAX,"); strSql.Append("FINANCIALSTAFFCODE,FINANCIALSTAFF,FINANCIALSTAFFEMAIL,FINANCIALSTAFFTEL,FINANCIALSTAFFFAX,PLACERECEIPTID,SOURCECODE,ISCONTAINERSOC,VESSELID,ISSUEPLACEID,HSCODE"); strSql.Append(",TRANSTATUS,EDIREMARK,SERVICECONTRACTNO,(CASE BSSTATUS WHEN 1 THEN '锁定' else '未锁定' end) as BSSTATUSREF "); - strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT "); + strSql.Append(",(CASE FEESTATUS WHEN 1 THEN '锁定' else '未锁定' end) as FEESTATUSREF,TRANSPORT,IRCODE "); strSql.Append(",(SELECT TOP 1 STATUS FROM V_OP_STATUS WITH (NOLOCK) WHERE BSNO=OP_SEAE.BSNO ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS"); strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97018 and EnumValueID=OP_SEAE.MANIFESTSTATUS) as MANIFESTSTATUSREF"); strSql.Append(",CUSTOMNO,ENTERPID,ENTERP,INSPECTIONNO,INSPECTIONDATE,CUSTOMDATE,CLEARCUSTOMDATE,ISMOREGOOD,TERMSDELIVERY,INSPECTSERVICE,TRADETERM,0 FENPIAO,ISGAIQIAN,WARNCOUNT"); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js index 612d8f5c..62acc5e6 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js @@ -482,7 +482,7 @@ Ext.extend(Shipping.OpSeaeToSeaiIndex, Ext.Panel, { }, //end initUIComponents onAutoRefresh: function () { - var sql = " ISIMP=0 and SEAIOP='"+USERID+"'"; + var sql = " ISIMP=0 and (SEAIOP='" + USERID + "' OR SEAIOP='" + SHOWNAME +"')"; this.sqlcontext = sql; this.storeList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: sql }, From 39eabb093f5ac63a9d3f7b1462dffe53d8a11d3a Mon Sep 17 00:00:00 2001 From: hanxuntao <641739520@qq.com> Date: Fri, 7 Apr 2023 16:07:43 +0800 Subject: [PATCH 2/2] 1 --- DSWeb/DSWeb.csproj.user | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DSWeb/DSWeb.csproj.user b/DSWeb/DSWeb.csproj.user index a8615099..5d714467 100644 --- a/DSWeb/DSWeb.csproj.user +++ b/DSWeb/DSWeb.csproj.user @@ -4,7 +4,7 @@ ShowAllFiles 配置文件1 true - Debug|Any CPU + Release|Any CPU