Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

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();

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");

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 },

DSWeb/DSWeb.csproj.user

@@ -4,7 +4,7 @@
     <ProjectView>ShowAllFiles</ProjectView>
     <NameOfLastUsedPublishProfile>H:\DS7_dev\DSWeb\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
     <UseIISExpress>true</UseIISExpress>
-    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />