1

DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs

@@ -4112,7 +4112,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
             var INVGETNOWEXCHANGE = MsSysParamSetDAL.GetData("PARAMNAME='INVGETNOWEXCHANGE'").PARAMVALUE;
             if (INVGETNOWEXCHANGE == "1")
             {
-                var invratelist = MsChFeeDAL.GetFeeNowInvCurrList(invdate);
+                var invratelist = MsChFeeDAL.GetFeeNowInvCurrList(invdate, companyid);
                 if (invratelist != null)
                 {
                     foreach (var invrate in invratelist)

DSWeb/Areas/Account/Viewsjs/Chfee_recvapplication/ChRecvapplicationBLEdit.js

@@ -1522,7 +1522,7 @@ this.comboxaddDCType = Ext.create('DsExt.ux.RefTableCombox', {
     displayField: 'NAME',
     forceSelection: true,
     name: 'DC',
-    value: '2',
+    value: '1',
     enableKeyEvents: true,
     listeners: {
         keyup: function (field, e) {

DSWeb/Areas/MvcShipping/Controllers/MsOpOtherController.cs

@@ -591,7 +591,7 @@ namespace DSWeb.MvcShipping.Controllers
                     var ALLOWAMOUNT = SaleAccDateList[0].ALLOWAMOUNT;
                     T_ALL_DA T_ALL_DA = new T_ALL_DA();
                     if (!string.IsNullOrEmpty(ALLOWAMOUNT) && Convert.ToDecimal(ALLOWAMOUNT) != 0) {
-                        var NOAMOUNT = T_ALL_DA.GetStrSQL("ACCDATE", "SELECT ISNULL(SUM(TTLDR-STLTTLDR),0) NOAMOUNT FROM v_op_gain_cust_sum WHERE CUSTOMERNAME='"+ custname + "'");
+                        var NOAMOUNT = T_ALL_DA.GetStrSQL("NOAMOUNT", "SELECT ISNULL(SUM(TTLDR-STLTTLDR),0) NOAMOUNT FROM v_op_gain_cust_sum WHERE CUSTOMERNAME='"+ custname + "'");
                         if (Convert.ToDecimal(NOAMOUNT) > Convert.ToDecimal(ALLOWAMOUNT)) {
                             result.Success = false;
                             result.Message = result.Message + chaoe;

DSWeb/Areas/MvcShipping/Controllers/MsRptOpProfitController.cs

@@ -228,14 +228,14 @@ namespace DSWeb.MvcShipping.Controllers
 
             if (amendstr == "true")
             {
-                strSql.Append("SELECT B.PARENTID BSNO, B.OPLB,B.OPLBNAME,'普通货' OPTYPE, B.BSTYPE,B.BLTYPE,B.BLFRT,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.CONTRACTNO,B.ORDERNO,");
+                strSql.Append("SELECT B.PARENTID BSNO, B.OPLB,B.OPLBNAME,'普通货' OPTYPE, B.BSTYPE,B.BLTYPE,B.BLFRT,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, MIN(B.CREATETIME) CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.CONTRACTNO,B.ORDERNO,");
                 strSql.Append("C.[DESCRIPTION] AS CUSTFULLNAME,B.CARGOID,B.TRADETERM,");
                 strSql.Append("B.ETD,B.PKGS,B.CBM,B.CNTRSEALNO,B.TRUCKER,B.CUSTOMSER,B.CLOSINGDATE,B.KINDPKGS,B.BSSOURCEDETAIL");
                 strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.AGENTID,B.ETA,B.SALEDEPT,B.ISSUETYPE,B.ISCANCEL,B.ATD,B.SERVICECONTRACTNO");
                 strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE");
-                strSql.Append(",case B.FEESTATUS when 1 then '锁定' else '未锁定' end as FEESTATUSREF,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
+                strSql.Append(",case MAX(B.FEESTATUS) when 1 then '锁定' else '未锁定' end as FEESTATUSREF,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
-                strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
+                strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,MAX(B.TEU) TEU,B.CNTRTOTAL,B.CORPID");
-                strSql.Append(",B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS");
+                strSql.Append(",MAX(B.CNTR1) CNTR1,MAX(B.CNTR2) CNTR2,MAX(B.CNTR3) CNTR3,MAX(B.CNTR4) CNTR4,MAX(B.CNTR5) CNTR5,MAX(B.CNTR6) CNTR6,MAX(B.CNTR7) CNTR7,MAX(B.CNTR8) CNTR8,MAX(B.CNTR9) CNTR9,MAX(B.CNTR10) CNTR10,MAX(B.OTCNTR) OTCNTR,B.TRADETYPE,B.GOODSNAME,MAX(B.FEESTATUS) FEESTATUS");
                 strSql.Append(",SUM(ISNULL(G.RMBDR,0)) RMBDR,SUM(ISNULL(G.RMBCR,0)) RMBCR,SUM(ISNULL(G.STLRMBDR,0)) STLRMBDR,SUM(ISNULL(G.STLRMBCR,0)) STLRMBCR,SUM(ISNULL(G.USDDR,0)) USDDR,SUM(ISNULL(G.USDCR,0)) USDCR,");
                 strSql.Append("SUM(G.STLUSDDR) STLUSDDR,SUM(G.STLUSDCR) STLUSDCR,SUM(G.OTDR) OTDR,SUM(G.OTCR) OTCR,SUM(G.STLOTDR) STLOTDR,SUM(G.STLOTCR) STLOTCR,SUM(ISNULL(G.TTLDR,0)) TTLDR,");
                 strSql.Append("SUM(ISNULL(G.TTLCR,0)) TTLCR,SUM(G.STLTTLDR) STLTTLDR,SUM(G.STLTTLCR) STLTTLCR");
@@ -298,14 +298,14 @@ namespace DSWeb.MvcShipping.Controllers
                 {
                     strSql.Append(" and " + condition);
                 }
-                strSql.Append(" GROUP BY B.PARENTID, B.OPLB,B.OPLBNAME, B.BSTYPE,B.BLTYPE,B.BLFRT,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.CONTRACTNO,B.ORDERNO,");
+                strSql.Append(" GROUP BY B.PARENTID, B.OPLB,B.OPLBNAME, B.BSTYPE,B.BLTYPE,B.BLFRT,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.BSSTATUS, B.SALE, B.OP, B.DOC,B.YARD,B.CONTRACTNO,B.ORDERNO,");
                 strSql.Append("C.[DESCRIPTION] , B.CARGOID,B.TRADETERM,");
                 strSql.Append("B.ETD,B.PKGS,B.CBM,B.CNTRSEALNO,B.TRUCKER");
                 strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.AGENTID,B.ETA,B.SERVICECONTRACTNO,B.SALEDEPT,B.ISSUETYPE,B.ISCANCEL,B.ATD,B.CUSTOMSER,B.CLOSINGDATE,B.KINDPKGS,B.BSSOURCEDETAIL");
                 strSql.Append(",B.CUSTOMDATE");
-                strSql.Append(",B.FEESTATUS,B.SALECORPID");
+                strSql.Append(",B.SALECORPID");
-                strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");
+                strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.CNTRTOTAL,B.CORPID");
-                strSql.Append(",B.CNTR1,B.CNTR2,B.CNTR3,B.CNTR4,B.CNTR5,B.CNTR6,B.CNTR7,B.CNTR8,B.CNTR9,B.CNTR10,B.OTCNTR,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS");
+                strSql.Append(",B.TRADETYPE,B.GOODSNAME");
 
             }
             else
@@ -4757,10 +4757,10 @@ namespace DSWeb.MvcShipping.Controllers
                 strSql.Append("SUM(G.RMBDR) as RMBDR,SUM(G.RMBCR) AS RMBCR,SUM(G.STLRMBDR) STLRMBDR,SUM(G.STLRMBCR) STLRMBCR,SUM(G.USDDR) AS USDDR,SUM(G.USDCR) AS USDCR,SUM(G.STLUSDDR) STLUSDDR,SUM(G.STLUSDCR) STLUSDCR,SUM(G.OTDR) AS OTDR,SUM(G.OTCR) AS OTCR,SUM(G.STLOTDR) STLOTDR,SUM(G.STLOTCR) STLOTCR,SUM(G.TTLDR) AS TTLDR,SUM(G.TTLCR) AS TTLCR,SUM(G.STLTTLDR) STLTTLDR,SUM(G.STLTTLCR) STLTTLCR");
                 //else
                 //    strSql.Append("COUNT(DISTINCT B.BSNO) AS BLCOUNT,SUM(G.RMBDR) as RMBDR,SUM(G.RMBCR) AS RMBCR,SUM(G.STLRMBDR) STLRMBDR,SUM(G.STLRMBCR) STLRMBCR,SUM(G.USDDR) AS USDDR,SUM(G.USDCR) AS USDCR,SUM(G.STLUSDDR) STLUSDDR,SUM(G.STLUSDCR) STLUSDCR,SUM(G.OTDR) AS OTDR,SUM(G.OTCR) AS OTCR,SUM(G.STLOTDR) STLOTDR,SUM(G.STLOTCR) STLOTCR,SUM(G.TTLDR) AS TTLDR,SUM(G.TTLCR) AS TTLCR,SUM(G.STLTTLDR) STLTTLDR,SUM(G.STLTTLCR) STLTTLCR");
-                strSql.Append(",SUM(CASE WHEN B.OPTYPE='普通货' THEN B.NETWEIGHT ELSE 0 END) AS NETWEIGHT,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.TEU ELSE 0 END) AS TEU,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR1 ELSE 0 END) AS CNTR1,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR2 ELSE 0 END) AS CNTR2,");
+                strSql.Append(",SUM(CASE WHEN B.OPTYPE='普通货' THEN B.NETWEIGHT ELSE 0 END) AS NETWEIGHT,SUM(B.TEU) AS TEU,SUM(B.CNTR1) AS CNTR1,SUM(B.CNTR2) AS CNTR2,");
-                strSql.Append("SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR3 ELSE 0 END) AS CNTR3,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR4 ELSE 0 END) AS CNTR4,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR5 ELSE 0 END) AS CNTR5,");
+                strSql.Append("SUM(B.CNTR3) AS CNTR3,SUM(B.CNTR4) AS CNTR4,SUM(B.CNTR5) AS CNTR5,");
-                strSql.Append("SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR6 ELSE 0 END) AS CNTR6,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR7 ELSE 0 END) AS CNTR7,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR8 ELSE 0 END) AS CNTR8,");
+                strSql.Append("SUM(B.CNTR6) AS CNTR6,SUM(B.CNTR7) AS CNTR7,SUM(B.CNTR8) AS CNTR8,");
-                strSql.Append("SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR9 ELSE 0 END) AS CNTR9,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR10 ELSE 0 END) AS CNTR10,SUM(CASE WHEN B.OPTYPE='普通货' AND (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.OTCNTR ELSE 0 END) AS OTCNTR");
+                strSql.Append("SUM(B.CNTR9) AS CNTR9,SUM(B.CNTR10) AS CNTR10,SUM(B.OTCNTR) AS OTCNTR");
                 strSql.Append(",SUM(ISNULL(G.USDDR-G.USDCR,0)) AS USDPROFIT,SUM(ISNULL(G.RMBDR-G.RMBCR,0)) AS RMBPROFIT,SUM(ISNULL(G.OTDR-G.OTCR,0)) AS OTPROFIT,SUM(ISNULL(G.TTLDR-G.TTLCR,0)) AS TTLPROFIT ");
                 strSql.Append(",SUM(ISNULL(G.RMBDR-G.STLRMBDR,0)) AS RMBNODR,SUM(ISNULL(G.USDDR-G.STLUSDDR,0)) AS USDNODR,SUM(ISNULL(G.OTDR-G.STLOTDR,0)) AS OTNODR,SUM(ISNULL(G.TTLDR-G.STLTTLDR,0)) AS TTLNODR");
                 strSql.Append(",SUM(ISNULL(G.RMBCR-G.STLRMBCR,0)) AS RMBNOCR,SUM(ISNULL(G.USDCR-G.STLUSDCR,0)) AS USDNOCR,SUM(ISNULL(G.OTCR-G.STLOTCR,0)) AS OTNOCR,SUM(ISNULL(G.TTLCR-G.STLTTLCR,0)) AS TTLNOCR");

DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs

@@ -4541,7 +4541,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
 
         }
 
-        public static List<MsFeeCurr> GetFeeNowInvCurrList(string invdate="")
+        public static List<MsFeeCurr> GetFeeNowInvCurrList(string invdate="",string companyid="")
         {
             var currdate = DateTime.Now;
             var evList = new List<MsFeeCurr>();
@@ -4550,14 +4550,17 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
                 var strSql = new StringBuilder();
                 strSql.Append("Select CURRENCYID,VALUE,");
                 strSql.Append("(select CodeName from code_currency where GID=currency_exchange_inv.CURRENCYID) as CODENAME");
-                strSql.Append(" from currency_exchange_inv ");
+                strSql.Append(" from currency_exchange_inv where 1=1 ");
+                if (string.IsNullOrEmpty(companyid))
+                    strSql.Append(" and COMPANYID='"+ companyid + "' ");
+
                 if (string.IsNullOrEmpty(invdate))
                 {
-                    strSql.Append(" where STARTTIME<='" + currdate.ToShortDateString().ToString() + "' and ENDTIME>=");
+                    strSql.Append(" and STARTTIME<='" + currdate.ToShortDateString().ToString() + "' and ENDTIME>=");
                     strSql.Append(" '" + currdate.ToShortDateString().ToString() + "' ");
                 }
                 else {
-                    strSql.Append(" where STARTTIME<='" + invdate + "' and ENDTIME>=");
+                    strSql.Append(" and STARTTIME<='" + invdate + "' and ENDTIME>=");
                     strSql.Append(" '" + invdate + "' ");
 
                 }

DSWeb/Areas/MvcShipping/DAL/MsSeaeOrder/MsSeaeOrderDAL.cs

@@ -822,7 +822,7 @@ namespace DSWeb.MvcShipping.DAL.MsSeaeOrderDAL
             strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,1) DRFEESTATUS");
             strSql.Append(",dbo.F_GetBillCrmFeeStatus(B.BSNO,2) CRFEESTATUS");
             strSql.Append(",'' SenderMobile,'' SenderEmail,CONTRACTNO,'' AMSSHIPPER,'' AMSCONSIGNEE,'' AMSNOTIFYPARTY,CONFIRMOP,CONFIRMDATE,OPERATOR,OPERATORTEL,FBP,DESTFBP,MAXWEIGHT,PLANPROFIT,OPERATOREMAIL,LANE ");
-            strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP  ");
+            strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP,TRANSTYPE  ");
 
             strSql.Append(" from crm_seaeorder B");
             if (!string.IsNullOrEmpty(strCondition))

DSWeb/Areas/MvcShipping/Views/MsSeaeOrder/Audit.aspx

@@ -32,6 +32,21 @@
             DEPTNAME = '<%= Session["DEPTNAME"] %>';
         }
         getSessgion5();
+                var strLANGUAGES;
+        function getSessgion6() {
+            strLANGUAGES = '<%= Session["LANGUAGES"] %>'; //zh-cn-中文，en-us－英文
+            if (strLANGUAGES == "en-us") {
+                document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js\"></sc' + 'ript>'); 
+                document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_en-us.js\"></sc' + 'ript>'); 
+
+            }
+            else {
+                document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js\"></sc' + 'ript>'); 
+                document.write('<script type=\"text/javascript\" src=\"../../../../Areas/MvcShipping/Viewsjs/MsSeaeOrder/Zi_zh-cn.js\"></sc' + 'ript>'); 
+
+            }
+        }
+        getSessgion6();
     </script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/TimePickerField.js"></script>
     <script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimePicker.js"></script>

DSWeb/Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js

@@ -2408,7 +2408,7 @@ Ext.extend(Shipping.MsOpOtherEdit, Ext.Panel, {
                 if (success) {
                     var result = Ext.JSON.decode(response.responseText);
                     if (result.Success != true) {
-                        Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
+                        Ext.Msg.show({ title: '错误', msg: result.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
 
                     } else {
 

DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptProfitViewIndex.js

@@ -1104,10 +1104,10 @@ Ext.extend(Shipping.MsRptProfitViewIndex, Ext.Panel, {
             var openType = "_blank";
             var openUrl = "";
             if (record.data.OPLBNAME == "报关业务") {
-                openUrl = "../MvcShipping/MsOpApply/ApplyFeeView?handle=check&bsno=" + record.data.BSNO;
+                openUrl = "../../MvcShipping/MsOpApply/ApplyFeeView?handle=check&bsno=" + record.data.BSNO;
             } else {
 
-                openUrl = "../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.BSNO;
+                openUrl = "../../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.BSNO;
 
             }
             window.open(openUrl, openType, openSet);

DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/Zi_zh-cn.js

@@ -35,7 +35,7 @@ Zi.LAN.SALE = "揽货人";
 Zi.LAN.OP = "操作";
 Zi.LAN.DOC = "单证";
 Zi.LAN.SALEDEPT = "销售部门";
-Zi.LAN.CUSTSERVICE = "客服员";
+Zi.LAN.CUSTSERVICE = "客服";
 Zi.LAN.FRCUSTSERVICE = "海外客服员";
 Zi.LAN.CONTRACTNO = "运费协议号";
 Zi.LAN.ORDERNO = "订舱编号";