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

'20220714_海运出头退舱列表加订舱中心；海运出口分票同步主单数据时合计数计算的问题；新产生订舱费时税率和单价的问题'

Browse Source
QDHHYT
ddlucky 2 years ago
parent d9135bd27c
commit 721f1e224f
15 changed files with 47 additions and 24 deletions
Show Stats Download Patch File Download Diff File

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
</PropertyGroup>
<ProjectExtensions>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

BIN
DSWeb.Common/bin/Debug/DSWeb.Common.dll
View File

Binary file not shown.

BIN
DSWeb.Common/bin/Debug/DSWeb.Common.pdb
View File

Binary file not shown.

16
DSWeb/Areas/CommMng/DAL/BasicDataRefDAL.cs
Unescape Escape View File

@ -5916,6 +5916,22 @@ namespace DSWeb.Areas.CommMng.DAL
}
#endregion
public static string getDatetimeString(object obj) {
if (string.IsNullOrWhiteSpace(obj.ToString())) return "";
else
{
try
{
var result = Convert.ToDateTime(obj).ToString("yyyy-MM-dd");
return result;
}
catch (Exception e) {
return "";
}
}
}
}
}

6
DSWeb/Areas/Import/Viewsjs/ImportTrade/MsOpBillEdit.js
Unescape Escape View File

@ -1733,9 +1733,9 @@ Ext.extend(Shipping.MsOpBillEdit, Ext.Panel, {
var Bkgs = member.get('KGS');
var Bcbm = member.get('CBM');
str_kind = member.get('KINDPKGS');
pkgs = parseFloat(pkgs) + parseFloat(Bpkgs);
kgs = parseFloat(kgs) + parseFloat(Bkgs);
cbm = parseFloat(cbm) + parseFloat(Bcbm);
pkgs = parseFloat(pkgs).add(parseFloat(Bpkgs));
kgs = parseFloat(kgs).add(parseFloat(Bkgs));
cbm = parseFloat(cbm).add(parseFloat(Bcbm));
}
this.formEdit.getForm().findField('PKGS').setValue(pkgs);
this.formEdit.getForm().findField('KINDPKGS').setValue(str_kind);

2
DSWeb/Areas/MvcShipping/DAL/MsChFee/MsChFeeDAL.cs
Unescape Escape View File

@ -6563,7 +6563,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
CommonDataContext cdc = new CommonDataContext();
var codefeelist = cdc.code_fee.Where(x => 1 == 1).ToList();
//result.setTax(codefeelist);
result.setTax(codefeelist);
return result;
}

4
DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs
Unescape Escape View File

@ -345,10 +345,10 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
data.ARSHIPSERVICENO = Convert.ToString(reader["ARSHIPSERVICENO"]);//
data.FIRSTPORTOFCALLID = Convert.ToString(reader["FIRSTPORTOFCALLID"]);//
if (reader["FIRSTPORTOFCALLDATE"] != DBNull.Value)
data.FIRSTPORTOFCALLDATE = Convert.ToDateTime(reader["FIRSTPORTOFCALLDATE"]).ToString("yyyy-MM-dd");
data.FIRSTPORTOFCALLDATE = BasicDataRefDAL.getDatetimeString(reader["FIRSTPORTOFCALLDATE"]);
data.LASTPORTOFCALLID = Convert.ToString(reader["LASTPORTOFCALLID"]);//
if (reader["LASTPORTOFCALLDATE"] != DBNull.Value)
data.LASTPORTOFCALLDATE = Convert.ToDateTime(reader["LASTPORTOFCALLDATE"]).ToString("yyyy-MM-dd");
data.LASTPORTOFCALLDATE = BasicDataRefDAL.getDatetimeString(reader["LASTPORTOFCALLDATE"]);//Convert.ToDateTime(reader["LASTPORTOFCALLDATE"]).ToString("yyyy-MM-dd");
data.MANIFESTSTATUS = Convert.ToString(reader["MANIFESTSTATUS"]);//
data.ISFIMPORTER_CODE_TYPE = Convert.ToString(reader["ISFIMPORTER_CODE_TYPE"]);//
data.ISFIMPORTER_CODE = Convert.ToString(reader["ISFIMPORTER_CODE"]);//

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillEdit.js
Unescape Escape View File

@ -1743,9 +1743,9 @@ Ext.extend(Shipping.MsOpBillEdit, Ext.Panel, {
var Bkgs = member.get('KGS');
var Bcbm = member.get('CBM');
str_kind = member.get('KINDPKGS');
pkgs = parseFloat(pkgs) + parseFloat(Bpkgs);
kgs = parseFloat(kgs) + parseFloat(Bkgs);
cbm = parseFloat(cbm) + parseFloat(Bcbm);
pkgs = parseFloat(pkgs).add(parseFloat(Bpkgs));
kgs = parseFloat(kgs).add(parseFloat(Bkgs));
cbm = parseFloat(cbm).add(parseFloat(Bcbm));
}
this.formEdit.getForm().findField('PKGS').setValue(pkgs);
this.formEdit.getForm().findField('KINDPKGS').setValue(str_kind);

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEdit.js
Unescape Escape View File

@ -3832,9 +3832,9 @@ this.storeConsignee.on('beforeload', function (store) {
var Bkgs = member.get('KGS');
var Bcbm = member.get('CBM');
str_kind = member.get('KINDPKGS');
pkgs = parseFloat(pkgs) + parseFloat(Bpkgs);
kgs = parseFloat(kgs) + parseFloat(Bkgs);
cbm = parseFloat(cbm) + parseFloat(Bcbm);
pkgs = parseFloat(pkgs).add(parseFloat(Bpkgs));
kgs = parseFloat(kgs).add(parseFloat(Bkgs));
cbm = parseFloat(cbm).add(parseFloat(Bcbm));
}
this.formEdit.getForm().findField('PKGS').setValue(pkgs);
this.formEdit.getForm().findField('KINDPKGS').setValue(str_kind);

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpBillLSEditIndex.js
Unescape Escape View File

@ -1695,9 +1695,9 @@ Ext.extend(Shipping.MsOpBillLSEditIndex, Ext.Panel, {
var Bkgs = member.get('KGS');
var Bcbm = member.get('CBM');
str_kind = member.get('KINDPKGS');
pkgs = parseFloat(pkgs) + parseFloat(Bpkgs);
kgs = parseFloat(kgs) + parseFloat(Bkgs);
cbm = parseFloat(cbm) + parseFloat(Bcbm);
pkgs = parseFloat(pkgs).add(parseFloat(Bpkgs));
kgs = parseFloat(kgs).add(parseFloat(Bkgs));
cbm = parseFloat(cbm).add(parseFloat(Bcbm));
}
this.formEdit.getForm().findField('PKGS').setValue(pkgs);
this.formEdit.getForm().findField('KINDPKGS').setValue(str_kind);

9
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeCancelIndex.js
Unescape Escape View File

@ -688,6 +688,13 @@ Ext.extend(Shipping.MsOpSeaeCancelIndex, Ext.Panel, {
header: Zi.LAN.DOC, //'单证',
width: 100
},
{
sortable: true,
id: '',
dataIndex: 'ORDEROP',
header: Zi.LAN.ORDEROP, //'订舱中心',
width: 100
},
{
sortable: true,
id: '',
@ -1480,7 +1487,7 @@ Ext.extend(Shipping.MsOpSeaeCancelIndex, Ext.Panel, {
scope: this
}, '-', {
text: Zi.LAN.ListExpExcel, //"EXCEL导出",
text: Zi.LAN.ListExpExcel, //"EXCEL导出 列表导出excel",
iconCls: "btnexportexcel",
handler: function (button, event) {
_this.onExportClick();

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

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

8
DSWeb/Web.config
Unescape Escape View File

@ -96,14 +96,14 @@
<add name="DongShengDB" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=123.234.225.158,26600;Database=shippingwebTEST;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 环海运通 http://218.58.73.62:8081/login.aspx qdhhyt admin 666888 -->
<!-- 环海运通 http://218.58.73.62:8081/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_HHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 666888
-->
<!-- 环海运通 测试 http://221.215.122.2:8088/login.aspx qdhhyt admin 666888 -->
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=20220526;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=20220526;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
-->
<!-- 锦海运通 http://221.215.122.2:8081/login.aspx qdhhyt admin 666888
<add name="DongShengDB" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />
<add name="sydevzsh" connectionString="Server=221.215.122.2,12456 ;Database=Shippingweb_QDJHYT;User ID=sa;Password=Ds20040201;Connect Timeout=120000;" providerName="System.Data.SqlClient" />

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>

Write Preview
Loading…
Cancel
Save