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

20240104修正几处问题

Browse Source
QDHHYT
dengyu 11 months ago
parent 7f13202238
commit d4978a9b2d
5 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
DSWeb/Areas/MvcShipping/Controllers/MsRptOpBsListController.cs
Unescape Escape View File

@ -241,6 +241,8 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",(CASE WHEN (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.CNTR10 ELSE 0 END) CNTR10,(CASE WHEN (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.OTCNTR ELSE 0 END) OTCNTR");
strSql.Append(",(B.NETWEIGHT) NETWEIGHT,(B.KGS) KGS,(CASE WHEN (B.BLTYPE='整箱' OR B.BLTYPE='拼箱主票') THEN B.TEU ELSE 0 END) TEU");
strSql.Append(",B.TRADETYPE,B.GOODSNAME,B.FEESTATUS");
strSql.Append(",(select top 1 tempset from op_seae where bsno=B.bsno) TEMPSET");
strSql.Append(" FROM V_OP_BS B ");
strSql.Append(" LEFT JOIN info_client C ON (C.SHORTNAME=B.CUSTOMERNAME) ");
if (!string.IsNullOrEmpty(condition))
@ -256,7 +258,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE,B.DESTINATION, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, 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(",(select top 1 tempset from op_seae where bsno=B.bsno) TEMPSET");
if ((!string.IsNullOrEmpty(printstr)) && (printstr == "true"))
{
if (!string.IsNullOrEmpty(sortstr))

8
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeDAL.cs
Unescape Escape View File

@ -630,14 +630,18 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeDAL
strSql.Append(",(SELECT TOP 1 BLSTATUS FROM op_blissue WHERE BSNO=B.BSNO) BLISSUESTATUS,ISCANCEL,ISTUI,TRANSREMARK,PRERECORD ");
strSql.Append(",(select showname from [user] where gid=f.Auditoperator) MSHIPPERID,dbo.trimdate(f.AUDITDATE) MCONSIGNEEID,MNOTIFYPARTYID,MSHIPPER,MCONSIGNEE,MNOTIFYPARTY,ATD,DELIVERYDATE,YARDATTN,YARDTEL,A.BillFeeStatus,B.SALECORPID,'' MDESCRIPTION ");
//strSql.Append(",(select showname from [user] where gid=f.Auditoperator) MSHIPPERID,dbo.trimdate(f.AUDITDATE) MCONSIGNEEID");
strSql.Append(",(select showname from [user] where gid=(select top 1 Auditoperator from ch_fee where bsno=A.BSNO and AUDITDATE is not null order by AUDITDATE desc))MSHIPPERID");
strSql.Append(",dbo.trimdate((select top 1 AUDITDATE from ch_fee where bsno=A.BSNO and AUDITDATE is not null order by AUDITDATE desc))MCONSIGNEEID");
strSql.Append(",MNOTIFYPARTYID,MSHIPPER,MCONSIGNEE,MNOTIFYPARTY,ATD,DELIVERYDATE,YARDATTN,YARDTEL,A.BillFeeStatus,B.SALECORPID,'' MDESCRIPTION ");
strSql.Append(",(select [NAME] from [company] where GID=B.SALECORPID) as SALECORP");
strSql.Append(",0 CUSTOMSSTATUS,0 PORTSTATUS,0 EXPSTATUS,0 TRUCKCTNSTATUS,0 CTNRETURNSTATUS,0 HGYDSTATUS ,B.TRUCKSTATUS,0 ATASTATUS,0 STCSSTATUS,0 RCVESTATUS,'' COUNTRY,b.ORDEROP,b.HAVEFEN,b.ZHUFEN,b.OP_OVERSEA");
strSql.Append(" from OP_AMEND A ");
strSql.Append(" LEFT JOIN OP_SEAE B ON (B.BSNO=A.PARENTID)");
strSql.Append(" LEFT JOIN v_op_gain_dr_INV I ON (I.BSNO=A.BSNO) ");
strSql.Append(" LEFT JOIN V_FEE_LASTAUDIT f ON (f.BSNO=A.BSNO AND f.NUM=1) ");
//strSql.Append(" LEFT JOIN V_FEE_LASTAUDIT f ON (f.BSNO=A.BSNO AND f.NUM=1) ");
strSql.Append(" WHERE B.BSNO IS NOT NULL ");

9
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
Unescape Escape View File

@ -191,7 +191,8 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
{ name: 'STLOTCR', type: 'number' },
{ name: 'STLTTLCR', type: 'number' },
{ name: 'PROFITRATE', type: 'number' },
{ name: 'HAVEFEN', type: 'string' }
{ name: 'HAVEFEN', type: 'string' },
{ name: 'TEMPSET', type: 'string' }
],
remoteSort: true,
@ -1013,6 +1014,12 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
width: 90
}]
}
, {
sortable: true,
header: '温度',
labelWidth: 90,
dataIndex: 'TEMPSET'
}
];

2
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/Zi_zh-cn.js
Unescape Escape View File

@ -23,7 +23,7 @@ Zi.LAN.CUSTNO = "委托编号";
Zi.LAN.CUSTOMNO = "报关单号";
Zi.LAN.ENTERP = "经营单位";
Zi.LAN.CUSTOMSER = "报关行";
Zi.LAN.FORWARDER = "货代公司";
Zi.LAN.FORWARDER = "订舱代理(货代公司)";
Zi.LAN.MBLNO = "主提单号";
Zi.LAN.HBLNO = "分提单号";
Zi.LAN.ETD = "开船日期";

20
DSWeb/Properties/PublishProfiles/FolderProfile1.pubxml.user
Unescape Escape View File

@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project>
<PropertyGroup>
<History>True|2023-12-22T05:45:30.1024603Z;False|2023-12-19T14:02:46.6136527+08:00;True|2022-07-01T11:57:59.3192766+08:00;False|2022-07-01T10:21:57.6363181+08:00;False|2022-07-01T10:13:59.6180616+08:00;False|2022-07-01T10:12:32.2645556+08:00;</History>
<History>True|2024-01-03T01:09:05.9486813Z;True|2023-12-22T13:45:30.1024603+08:00;False|2023-12-19T14:02:46.6136527+08:00;True|2022-07-01T11:57:59.3192766+08:00;False|2022-07-01T10:21:57.6363181+08:00;False|2022-07-01T10:13:59.6180616+08:00;False|2022-07-01T10:12:32.2645556+08:00;</History>
<_PublishTargetUrl>E:\DS7Deploy</_PublishTargetUrl>
<LastFailureDetails />
</PropertyGroup>
@ -8200,7 +8200,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/09/2023 15:12:55</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js">
<publishTime>10/27/2023 09:22:53</publishTime>
<publishTime>01/04/2024 11:00:05</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitLHIndex.js">
<publishTime>10/27/2023 09:25:41</publishTime>
@ -8212,7 +8212,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/09/2023 15:12:55</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/Zi_zh-cn.js">
<publishTime>10/09/2023 15:12:55</publishTime>
<publishTime>01/04/2024 10:59:17</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfitCompare/MsRptOpProfitCompareIndex.js">
<publishTime>09/27/2023 16:47:37</publishTime>
@ -12637,28 +12637,28 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<publishTime>10/09/2023 15:12:58</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll">
<publishTime>01/02/2024 14:50:37</publishTime>
<publishTime>01/03/2024 15:02:48</publishTime>
</File>
<File Include="bin/DSWeb.Common.dll.config">
<publishTime>10/09/2023 15:12:55</publishTime>
</File>
<File Include="bin/DSWeb.Common.pdb">
<publishTime>01/02/2024 14:50:37</publishTime>
<publishTime>01/03/2024 15:02:48</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>01/02/2024 16:15:00</publishTime>
<publishTime>01/04/2024 11:00:39</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>01/02/2024 14:50:37</publishTime>
<publishTime>01/03/2024 15:02:49</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>01/02/2024 14:50:37</publishTime>
<publishTime>01/03/2024 15:02:49</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>01/02/2024 16:15:00</publishTime>
<publishTime>01/04/2024 11:00:39</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>01/02/2024 16:15:01</publishTime>
<publishTime>01/04/2024 11:00:40</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>01/02/2024 14:50:37</publishTime>

Write Preview
Loading…
Cancel
Save