dengyu
/
DS7
1
0
Fork 0
Code Issues Pull Requests Projects 1 Releases Wiki Activity

'20220707需求修改完成'

Browse Source
QDHHYT
ddlucky 2 years ago
parent b789605f44
commit 398beb1a26
5 changed files with 160 additions and 53 deletions
Show Stats Download Patch File Download Diff File

17
DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
Unescape Escape View File

@ -195,9 +195,11 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",dbo.F_GetBillDrFeeStatus(A.BSNO) DRFEESTATUS"); strSql.Append(",dbo.F_GetBillDrFeeStatus(A.BSNO) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrFeeStatus(A.BSNO) CRFEESTATUS"); strSql.Append(",dbo.F_GetBillCrFeeStatus(A.BSNO) CRFEESTATUS");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM CH_FEE F WITH (NOLOCK) "); strSql.Append(" FROM CH_FEE F WITH (NOLOCK) ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN V_OP_BS A ON (A.BSNO=B.PARENTID) "); strSql.Append(" LEFT JOIN V_OP_BS A ON (A.BSNO=B.PARENTID) ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=A.BSNO) ");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=A.BSNO) "); strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=A.BSNO) ");
strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) "); strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) ");
strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) ");
@ -213,7 +215,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" ,A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE,A.BSSOURCEDETAIL, A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID"); strSql.Append(" ,A.CUSTSERVICE, A.PORTLOAD, A.PORTDISCHARGE,B.DESTINATION, A.CUSTOMNO, A.ACCDATE,A.CARRIER, A.BSSOURCE,A.BSSOURCEDETAIL, A.LANE, A.FORWARDER,A.NETWEIGHT,A.KGS,A.TEU,A.CNTRTOTAL,A.CORPID");
strSql.Append(" ,A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,A.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] "); strSql.Append(" ,A.CNTR1,A.CNTR2,A.CNTR3,A.CNTR4,A.CNTR5,A.CNTR6,A.CNTR7,A.CNTR8,A.CNTR9,A.CNTR10,A.OTCNTR,A.TRADETYPE,A.GOODSNAME,A.FEESTATUS,A.PKGS,A.CBM,A.ORDERNO,A.SALECORPID,A.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] ");
strSql.Append(",A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,A.AGENTID"); strSql.Append(",A.STLNAME, S.SETTLETIME,B.SALE,B.OPDATE,A.AGENTID,OP_SEAE.ORDEROP");
} }
@ -326,8 +328,11 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS"); strSql.Append(",dbo.F_GetBillDrFeeStatus(B.BSNO) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrFeeStatus(B.BSNO) CRFEESTATUS"); strSql.Append(",dbo.F_GetBillCrFeeStatus(B.BSNO) CRFEESTATUS");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM CH_FEE F WITH (NOLOCK) "); strSql.Append(" FROM CH_FEE F WITH (NOLOCK) ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) "); strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) "); strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) ");
strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) "); strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) ");
@ -344,7 +349,7 @@ namespace DSWeb.MvcShipping.Controllers
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,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] "); 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,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE,F.CUSTOMERNAME,C.[DESCRIPTION] ");
strSql.Append(",B.STLNAME,B.AGENTID"); strSql.Append(",B.STLNAME,B.AGENTID");
strSql.Append(" , S.SETTLETIME"); strSql.Append(" , S.SETTLETIME,OP_SEAE.ORDEROP");
} }
@ -614,9 +619,10 @@ namespace DSWeb.MvcShipping.Controllers
//strSql.Append("ELSE DATEADD(MONTH,1,DATEADD(day,ISNULL(CAST(C.STLMIDDLEDATE AS INT),1),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))) END)"); //strSql.Append("ELSE DATEADD(MONTH,1,DATEADD(day,ISNULL(CAST(C.STLMIDDLEDATE AS INT),1),DATEADD(Day,-Day(B.OPDATE)+1,B.OPDATE))) END)");
//strSql.Append("ELSE GETDATE() END)) end AS NODAY"); //strSql.Append("ELSE GETDATE() END)) end AS NODAY");
//strSql.Append(",(SELECT MAX(SETTLETIME) FROM v_fee_do_settlement S WHERE S.BSNO=B.BSNO AND S.CUSTOMERNAME=F.CUSTOMERNAME) AS SETTLEDATE"); //strSql.Append(",(SELECT MAX(SETTLETIME) FROM v_fee_do_settlement S WHERE S.BSNO=B.BSNO AND S.CUSTOMERNAME=F.CUSTOMERNAME) AS SETTLEDATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM CH_FEE F WITH (NOLOCK) "); strSql.Append(" FROM CH_FEE F WITH (NOLOCK) ");
strSql.Append("INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); strSql.Append("INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
//strSql.Append(" INNER JOIN V_CUSTSTLDATE C ON (C.BSNO=B.BSNO AND C.CUSTNAME=F.CUSTOMERNAME) "); //strSql.Append(" INNER JOIN V_CUSTSTLDATE C ON (C.BSNO=B.BSNO AND C.CUSTNAME=F.CUSTOMERNAME) ");
strSql.Append(" LEFT JOIN info_client C ON (C.SHORTNAME=F.CUSTOMERNAME) "); strSql.Append(" LEFT JOIN info_client C ON (C.SHORTNAME=F.CUSTOMERNAME) ");
@ -1794,8 +1800,11 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",dbo.F_GetBillDrFeeStatus(B.PARENTID) DRFEESTATUS"); strSql.Append(",dbo.F_GetBillDrFeeStatus(B.PARENTID) DRFEESTATUS");
strSql.Append(",dbo.F_GetBillCrFeeStatus(B.PARENTID) CRFEESTATUS"); strSql.Append(",dbo.F_GetBillCrFeeStatus(B.PARENTID) CRFEESTATUS");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM CH_FEE F "); strSql.Append(" FROM CH_FEE F ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) "); strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" left JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.PARENTID) "); strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.PARENTID) ");
if (!string.IsNullOrEmpty(condition)) if (!string.IsNullOrEmpty(condition))
{ {
@ -1810,7 +1819,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" ,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE "); strSql.Append(" ,B.TRADETYPE,B.GOODSNAME,B.FEESTATUS,B.PKGS,B.CBM,B.ORDERNO,B.SALECORPID,B.STLDATE ");
strSql.Append(",B.STLNAME,F.CUSTOMERNAME"); strSql.Append(",B.STLNAME,F.CUSTOMERNAME");
strSql.Append(" , S.SETTLETIME"); strSql.Append(" , S.SETTLETIME,OP_SEAE.ORDEROP");

121
DSWeb/Areas/MvcShipping/Controllers/MsRptOpProfitController.cs
Unescape Escape View File

@ -515,7 +515,10 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",SUM(G.NOACCTAXOTCR) NOACCTAXOTCR,SUM(G.NOACCTAXTTLDR) NOACCTAXTTLDR,SUM(G.NOACCTAXTTLCR) NOACCTAXTTLCR,SUM(G.NOACCTAXUSDDR-G.NOACCTAXUSDCR) AS NOACCTAXUSDPROFIT"); strSql.Append(",SUM(G.NOACCTAXOTCR) NOACCTAXOTCR,SUM(G.NOACCTAXTTLDR) NOACCTAXTTLDR,SUM(G.NOACCTAXTTLCR) NOACCTAXTTLCR,SUM(G.NOACCTAXUSDDR-G.NOACCTAXUSDCR) AS NOACCTAXUSDPROFIT");
strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT "); strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT ");
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -557,7 +560,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",B.CUSTOMDATE"); strSql.Append(",B.CUSTOMDATE");
strSql.Append(",B.FEESTATUS"); strSql.Append(",B.FEESTATUS");
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.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(",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,OP_SEAE.ORDEROP");
} }
else else
@ -599,7 +602,9 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT "); strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT ");
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -639,7 +644,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",B.CUSTOMDATE"); strSql.Append(",B.CUSTOMDATE");
strSql.Append(",B.FEESTATUS"); strSql.Append(",B.FEESTATUS");
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.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(",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,OP_SEAE.ORDEROP");
} }
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true")) if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
@ -770,7 +775,11 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -837,7 +846,10 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -1000,7 +1012,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -1069,7 +1083,7 @@ namespace DSWeb.MvcShipping.Controllers
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -1303,7 +1317,7 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -1469,7 +1483,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.SALE) "); strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.SALE) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
@ -1536,7 +1552,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.SALE) "); strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.SALE) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -1703,7 +1721,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
@ -1770,7 +1790,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -1943,7 +1965,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.OP) "); strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.OP) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
@ -2010,7 +2034,10 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.OP) "); strSql.Append(" LEFT JOIN VW_user U ON (U.SHOWNAME=B.OP) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -2166,7 +2193,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -2231,7 +2260,9 @@ namespace DSWeb.MvcShipping.Controllers
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -2386,7 +2417,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -2450,7 +2483,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -2603,7 +2638,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -2670,7 +2707,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -2825,7 +2864,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -2889,7 +2930,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -3042,7 +3085,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -3106,7 +3151,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -3261,7 +3308,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -3324,7 +3373,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -3355,7 +3406,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" and " + condition); strSql.Append(" and " + condition);
} }
} }
strSql.Append(" Group by B.DOC "); strSql.Append(" Group by B.DOC,OP_SEAE.ORDEROP ");
@ -3539,7 +3590,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B ");
strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -3699,7 +3752,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -3763,7 +3818,9 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT");
strSql.Append(" FROM V_OP_BILL B ");
strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -3914,7 +3971,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -3977,7 +4036,9 @@ namespace DSWeb.MvcShipping.Controllers
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B ");
strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -4190,7 +4251,9 @@ namespace DSWeb.MvcShipping.Controllers
} }
else else
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BS B "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) "); strSql.Append("LEFT JOIN V_OP_BILL A ON (A.PARENTID=B.BSNO) ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
@ -4256,7 +4319,9 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE"); strSql.Append(", (CASE WHEN (SUM(G.TTLCR))= 0 THEN 0 ELSE CONVERT(NUMERIC(18,2),ltrim(str((SUM(G.TTLDR-G.TTLCR)) / (SUM(G.TTLCR)) * 100, 10, 2))) END) AS PROFITRATE");
strSql.Append(" FROM V_OP_BILL B ");
strSql.Append(" FROM V_OP_BS B ");
if (!string.IsNullOrEmpty(feecondition)) if (!string.IsNullOrEmpty(feecondition))
{ {
strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR"); strSql.Append("LEFT JOIN (SELECT BSNO, sum(RMBDR) RMBDR,SUM(RMBCR) RMBCR,SUM(STLRMBDR) STLRMBDR,SUM(STLRMBCR) STLRMBCR,SUM(USDDR) USDDR");
@ -4381,11 +4446,13 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",SUM(G.NOACCTAXRMBDR) NOACCTAXRMBDR,SUM(G.NOACCTAXRMBCR) NOACCTAXRMBCR,SUM(G.NOACCTAXUSDDR) NOACCTAXUSDDR,SUM(G.NOACCTAXUSDCR) NOACCTAXUSDCR,SUM(G.NOACCTAXOTDR) NOACCTAXOTDR"); strSql.Append(",SUM(G.NOACCTAXRMBDR) NOACCTAXRMBDR,SUM(G.NOACCTAXRMBCR) NOACCTAXRMBCR,SUM(G.NOACCTAXUSDDR) NOACCTAXUSDDR,SUM(G.NOACCTAXUSDCR) NOACCTAXUSDCR,SUM(G.NOACCTAXOTDR) NOACCTAXOTDR");
strSql.Append(",SUM(G.NOACCTAXOTCR) NOACCTAXOTCR,SUM(G.NOACCTAXTTLDR) NOACCTAXTTLDR,SUM(G.NOACCTAXTTLCR) NOACCTAXTTLCR,SUM(G.NOACCTAXUSDDR-G.NOACCTAXUSDCR) AS NOACCTAXUSDPROFIT"); strSql.Append(",SUM(G.NOACCTAXOTCR) NOACCTAXOTCR,SUM(G.NOACCTAXTTLDR) NOACCTAXTTLDR,SUM(G.NOACCTAXTTLCR) NOACCTAXTTLCR,SUM(G.NOACCTAXUSDDR-G.NOACCTAXUSDCR) AS NOACCTAXUSDPROFIT");
strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT "); strSql.Append(",SUM(G.NOACCTAXRMBDR-G.NOACCTAXRMBCR) AS NOACCTAXRMBPROFIT,SUM(G.NOACCTAXOTDR-G.NOACCTAXOTCR) AS NOACCTAXOTPROFIT,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS NOACCTAXTTLPROFIT ");
// strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT"); // strSql.Append(",SUM(G.NOACCTAXTTLDR) AS TTLACCTAXDR,SUM(G.NOACCTAXTTLCR) AS TTLACCTAXCR,SUM(G.NOACCTAXTTLDR-G.NOACCTAXTTLCR) AS TTLACCTAXPROFIT");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) "); strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN info_client C ON (C.SHORTNAME=B.CUSTOMERNAME) "); strSql.Append(" LEFT JOIN info_client C ON (C.SHORTNAME=B.CUSTOMERNAME) ");
strSql.Append(" WHERE 1=1 "); strSql.Append(" WHERE 1=1 ");
@ -4401,7 +4468,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",B.CUSTOMDATE"); strSql.Append(",B.CUSTOMDATE");
strSql.Append(",B.FEESTATUS"); strSql.Append(",B.FEESTATUS");
strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, 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.PORTLOAD, B.PORTDISCHARGE, 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.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.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,OP_SEAE.ORDEROP");
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true")) if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
@ -4464,8 +4531,10 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append("SELECT B.BSNO,B.MBLNO,B.OPTYPE, B.CUSTNO,B.ACCDATE,G.TTLDR-G.TTLCR TTLPROFIT"); strSql.Append("SELECT B.BSNO,B.MBLNO,B.OPTYPE, B.CUSTNO,B.ACCDATE,G.TTLDR-G.TTLCR TTLPROFIT");
strSql.Append(" FROM V_OP_BILL B "); strSql.Append(",OP_SEAE.ORDEROP");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) "); strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN OP_SEAE ON (OP_SEAE.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) ");
strSql.Append(" WHERE 1=1 "); strSql.Append(" WHERE 1=1 ");

35
DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js
Unescape Escape View File

@ -94,6 +94,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'SALE', type: 'string' }, { name: 'SALE', type: 'string' },
{ name: 'OP', type: 'string' }, { name: 'OP', type: 'string' },
{ name: 'DOC', type: 'string' }, { name: 'DOC', type: 'string' },
{ name: 'ORDEROP', type: 'string' },
{ name: 'CUSTSERVICE', type: 'string' }, { name: 'CUSTSERVICE', type: 'string' },
{ name: 'PORTLOAD', type: 'string' }, { name: 'PORTLOAD', type: 'string' },
{ name: 'PORTDISCHARGE', type: 'string' }, { name: 'PORTDISCHARGE', type: 'string' },
@ -1009,7 +1010,12 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
if (value != 0) value = value + '%'; if (value != 0) value = value + '%';
return value; return value;
} }
} }, {
sortable: true,
dataIndex: 'ORDEROP',
header: '订舱中心',
width: 60
}
]; ];
this.girdcolumsdr = DsTruck.GetGridPanel(USERID, this.formname + 'dr', this.initgirdcolumsdr, 1); this.girdcolumsdr = DsTruck.GetGridPanel(USERID, this.formname + 'dr', this.initgirdcolumsdr, 1);
@ -1104,6 +1110,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'SALE', type: 'string' }, { name: 'SALE', type: 'string' },
{ name: 'OP', type: 'string' }, { name: 'OP', type: 'string' },
{ name: 'DOC', type: 'string' }, { name: 'DOC', type: 'string' },
{ name: 'ORDEROP', type: 'string' },
{ name: 'CUSTSERVICE', type: 'string' }, { name: 'CUSTSERVICE', type: 'string' },
{ name: 'PORTLOAD', type: 'string' }, { name: 'PORTLOAD', type: 'string' },
{ name: 'PORTDISCHARGE', type: 'string' }, { name: 'PORTDISCHARGE', type: 'string' },
@ -1628,7 +1635,12 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
header: '备注', header: '备注',
width: 60 width: 60
} }
, {
sortable: true,
dataIndex: 'ORDEROP',
header: '订舱中心',
width: 60
}
]; ];
this.girdcolumsfeedr = DsTruck.GetGridPanel(USERID, this.formname + 'feedr', this.initgirdcolumsfeedr, 1); this.girdcolumsfeedr = DsTruck.GetGridPanel(USERID, this.formname + 'feedr', this.initgirdcolumsfeedr, 1);
@ -1720,6 +1732,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'SALE', type: 'string' }, { name: 'SALE', type: 'string' },
{ name: 'OP', type: 'string' }, { name: 'OP', type: 'string' },
{ name: 'DOC', type: 'string' }, { name: 'DOC', type: 'string' },
{ name: 'ORDEROP', type: 'string' },
{ name: 'CUSTSERVICE', type: 'string' }, { name: 'CUSTSERVICE', type: 'string' },
{ name: 'PORTLOAD', type: 'string' }, { name: 'PORTLOAD', type: 'string' },
{ name: 'PORTDISCHARGE', type: 'string' }, { name: 'PORTDISCHARGE', type: 'string' },
@ -2618,7 +2631,12 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
return value; return value;
} }
} }
, {
sortable: true,
dataIndex: 'ORDEROP',
header: '订舱中心',
width: 60
}
]; ];
this.girdcolumscr = DsTruck.GetGridPanel(USERID, this.formname + 'cr', this.initgirdcolumscr, 1); this.girdcolumscr = DsTruck.GetGridPanel(USERID, this.formname + 'cr', this.initgirdcolumscr, 1);
@ -2705,6 +2723,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'SALE', type: 'string' }, { name: 'SALE', type: 'string' },
{ name: 'OP', type: 'string' }, { name: 'OP', type: 'string' },
{ name: 'DOC', type: 'string' }, { name: 'DOC', type: 'string' },
{ name: 'ORDEROP', type: 'string' },
{ name: 'CUSTSERVICE', type: 'string' }, { name: 'CUSTSERVICE', type: 'string' },
{ name: 'PORTLOAD', type: 'string' }, { name: 'PORTLOAD', type: 'string' },
{ name: 'PORTDISCHARGE', type: 'string' }, { name: 'PORTDISCHARGE', type: 'string' },
@ -3201,6 +3220,16 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
dataIndex: 'REMARK', dataIndex: 'REMARK',
header: '备注', header: '备注',
width: 60 width: 60
}, {
sortable: true,
dataIndex: 'DOC',
header: '单证',
width: 60
}, {
sortable: true,
dataIndex: 'ORDEROP',
header: '订舱中心',
width: 60
} }
]; ];

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

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

38
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -7,7 +7,7 @@
<PropertyGroup> <PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile /> <TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl> <_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl>
<History>True|2022-06-29T07:32:11.0848982Z;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History> <History>True|2022-07-07T05:49:52.2408319Z;False|2022-07-07T13:46:40.1316456+08:00;True|2022-07-07T10:58:16.5230456+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<File Include="About.aspx"> <File Include="About.aspx">
@ -407,7 +407,7 @@
<publishTime>06/17/2022 11:41:09</publishTime> <publishTime>06/17/2022 11:41:09</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_Audit/Zi_zh-cn.js"> <File Include="Areas/Account/Viewsjs/Chfee_Audit/Zi_zh-cn.js">
<publishTime>07/06/2022 18:01:53</publishTime> <publishTime>07/07/2022 10:21:32</publishTime>
</File> </File>
<File Include="Areas/Account/Viewsjs/Chfee_cheque/BookEdit.js"> <File Include="Areas/Account/Viewsjs/Chfee_cheque/BookEdit.js">
<publishTime>07/06/2022 11:59:53</publishTime> <publishTime>07/06/2022 11:59:53</publishTime>
@ -7961,7 +7961,7 @@
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js"> <File Include="Areas/MvcShipping/Viewsjs/MsOpSeai/Zi_zh-cn.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 10:21:37</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeaPlugin/OpSeaCover.js"> <File Include="Areas/MvcShipping/Viewsjs/MsOpSeaPlugin/OpSeaCover.js">
<publishTime>07/06/2022 11:59:54</publishTime> <publishTime>07/06/2022 11:59:54</publishTime>
@ -8291,7 +8291,7 @@
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 13:45:49</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptZnjTotalIndex.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptZnjTotalIndex.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
@ -8315,10 +8315,10 @@
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpHdProfit/Zi_en-us.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpHdProfit/Zi_en-us.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 10:21:56</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpHdProfit/Zi_zh-cn.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpHdProfit/Zi_zh-cn.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 10:21:41</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js">
<publishTime>07/07/2022 09:35:28</publishTime> <publishTime>07/07/2022 09:35:28</publishTime>
@ -8348,10 +8348,10 @@
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitMonth/Zi_en-us.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitMonth/Zi_en-us.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 10:22:01</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitMonth/Zi_zh-cn.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitMonth/Zi_zh-cn.js">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/07/2022 10:22:04</publishTime>
</File> </File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js"> <File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/MsRptOpProfitPerCentIndex.js">
<publishTime>07/06/2022 18:00:56</publishTime> <publishTime>07/06/2022 18:00:56</publishTime>
@ -12761,10 +12761,10 @@
<publishTime>07/06/2022 11:59:58</publishTime> <publishTime>07/06/2022 11:59:58</publishTime>
</File> </File>
<File Include="bin/App_global.asax.compiled"> <File Include="bin/App_global.asax.compiled">
<publishTime>07/07/2022 10:09:52</publishTime> <publishTime>07/07/2022 13:49:03</publishTime>
</File> </File>
<File Include="bin/App_global.asax.dll"> <File Include="bin/App_global.asax.dll">
<publishTime>07/07/2022 10:09:52</publishTime> <publishTime>07/07/2022 13:49:03</publishTime>
</File> </File>
<File Include="bin/AspNetPager.dll"> <File Include="bin/AspNetPager.dll">
<publishTime>07/06/2022 11:59:57</publishTime> <publishTime>07/06/2022 11:59:57</publishTime>
@ -12815,28 +12815,28 @@
<publishTime>07/06/2022 11:59:57</publishTime> <publishTime>07/06/2022 11:59:57</publishTime>
</File> </File>
<File Include="bin/DSWeb.Common.dll"> <File Include="bin/DSWeb.Common.dll">
<publishTime>07/07/2022 10:09:10</publishTime> <publishTime>07/07/2022 13:48:30</publishTime>
</File> </File>
<File Include="bin/DSWeb.Common.dll.config"> <File Include="bin/DSWeb.Common.dll.config">
<publishTime>07/06/2022 11:59:57</publishTime> <publishTime>07/06/2022 11:59:57</publishTime>
</File> </File>
<File Include="bin/DSWeb.Common.pdb"> <File Include="bin/DSWeb.Common.pdb">
<publishTime>07/07/2022 10:09:10</publishTime> <publishTime>07/07/2022 13:48:30</publishTime>
</File> </File>
<File Include="bin/DSWeb.dll"> <File Include="bin/DSWeb.dll">
<publishTime>07/07/2022 10:09:25</publishTime> <publishTime>07/07/2022 13:48:42</publishTime>
</File> </File>
<File Include="bin/DSWeb.Interface.dll"> <File Include="bin/DSWeb.Interface.dll">
<publishTime>07/07/2022 10:09:11</publishTime> <publishTime>07/07/2022 13:48:30</publishTime>
</File> </File>
<File Include="bin/DSWeb.Interface.pdb"> <File Include="bin/DSWeb.Interface.pdb">
<publishTime>07/07/2022 10:09:11</publishTime> <publishTime>07/07/2022 13:48:30</publishTime>
</File> </File>
<File Include="bin/DSWeb.pdb"> <File Include="bin/DSWeb.pdb">
<publishTime>07/07/2022 10:09:25</publishTime> <publishTime>07/07/2022 13:48:42</publishTime>
</File> </File>
<File Include="bin/DSWeb.XmlSerializers.dll"> <File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>07/07/2022 10:09:26</publishTime> <publishTime>07/07/2022 13:48:43</publishTime>
</File> </File>
<File Include="bin/DSWebComponent.dll"> <File Include="bin/DSWebComponent.dll">
<publishTime>07/06/2022 18:01:54</publishTime> <publishTime>07/06/2022 18:01:54</publishTime>
@ -17468,7 +17468,7 @@
<publishTime>07/06/2022 11:59:55</publishTime> <publishTime>07/06/2022 11:59:55</publishTime>
</File> </File>
<File Include="PrecompiledApp.config"> <File Include="PrecompiledApp.config">
<publishTime>07/07/2022 10:09:44</publishTime> <publishTime>07/07/2022 13:48:56</publishTime>
</File> </File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx"> <File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>07/06/2022 11:59:55</publishTime> <publishTime>07/06/2022 11:59:55</publishTime>
@ -24017,7 +24017,7 @@
<publishTime>07/06/2022 11:59:57</publishTime> <publishTime>07/06/2022 11:59:57</publishTime>
</File> </File>
<File Include="Web.config"> <File Include="Web.config">
<publishTime>07/07/2022 10:01:01</publishTime> <publishTime>07/07/2022 10:23:24</publishTime>
</File> </File>
<File Include="WebSearchEngine/SearchEngineAdapter.aspx"> <File Include="WebSearchEngine/SearchEngineAdapter.aspx">
<publishTime>07/06/2022 11:59:57</publishTime> <publishTime>07/06/2022 11:59:57</publishTime>

Write Preview
Loading…
Cancel
Save