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

1

Browse Source
dev
hanxuntao 5 months ago
parent e13f8da43d
commit 0ee83b7950
21 changed files with 169 additions and 29 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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

12
DSWeb/Areas/Account/DAL/Chfee_Audit/Chfee_AuditDAL.cs
Unescape Escape View File

@ -346,7 +346,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
strSql.Append(",dbo.F_GetBillCrFeeStatus(v_op_bill.BSNO) CRFEESTATUS");
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=v_op_bill.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 COMMISSIONRATE FROM V_Client_ACCDATE WHERE SHORTNAME=v_op_bill.CUSTOMERNAME ORDER BY BGNDATE DESC) as COMMISSIONRATE ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID,LANE ");
strSql.Append(",SALEDEPT,(select [NAME] from [company] where GID=v_op_bill.SALECORPID) as SALECORP,'' BILLFEEOP ");//
strSql.Append(" from v_op_bill ");
@ -388,7 +388,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
strSql.Append(",dbo.F_GetBillCrFeeStatus(v_op_bill.BSNO) CRFEESTATUS");
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=v_op_bill.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 COMMISSIONRATE FROM V_Client_ACCDATE WHERE SHORTNAME=v_op_bill.CUSTOMERNAME ORDER BY BGNDATE DESC) as COMMISSIONRATE ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID,LANE ");
strSql.Append(",SALEDEPT,(select [NAME] from [company] where GID=v_op_bill.SALECORPID) as SALECORP,'' BILLFEEOP ");//
strSql.Append(" from v_op_bill ");
@ -436,7 +436,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
strSql.Append(",dbo.F_GetBillCrFeeStatus(v_op_bill.BSNO) CRFEESTATUS");
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=v_op_bill.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 COMMISSIONRATE FROM V_Client_ACCDATE WHERE SHORTNAME=v_op_bill.CUSTOMERNAME ORDER BY BGNDATE DESC) as COMMISSIONRATE ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID,LANE ");
strSql.Append(",SALEDEPT,(select [NAME] from [company] where GID=v_op_bill.SALECORPID) as SALECORP,'' BILLFEEOP ");//
strSql.Append(" from v_op_bill ");
@ -503,7 +503,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
strSql.Append(",dbo.F_GetBillCrFeeStatus(v_op_bill.BSNO) CRFEESTATUS");
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=v_op_bill.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 COMMISSIONRATE FROM V_Client_ACCDATE WHERE SHORTNAME=v_op_bill.CUSTOMERNAME ORDER BY BGNDATE DESC) as COMMISSIONRATE ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID ");//
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID,LANE ");//
strSql.Append(",SALEDEPT,(select [NAME] from [company] where GID=v_op_bill.SALECORPID) as SALECORP,'' BILLFEEOP ");//
strSql.Append(" from v_op_bill ");//where exists(select 1 from ch_fee where bsno=v_op_bill.bsno)
@ -555,7 +555,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
strSql.Append(",dbo.F_GetBillCrFeeStatus(v_op_bill.BSNO) CRFEESTATUS");
strSql.Append(",(SELECT TOP 1 STATUS+' '+ CONVERT(varchar(100),COMPTIME, 20) FROM OP_STATUS WHERE BSNO=v_op_bill.BSNO AND STTYPE='2' ORDER BY COMPTIME DESC,INPUTTIME DESC) as OPSTATUS ");
strSql.Append(",(SELECT TOP 1 COMMISSIONRATE FROM V_Client_ACCDATE WHERE SHORTNAME=v_op_bill.CUSTOMERNAME ORDER BY BGNDATE DESC) as COMMISSIONRATE ");
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID ");//
strSql.Append(",CARRIER,YARD,FORWARDER,CONTRACTNO,ISSUETYPE,SERVICE,REMARK2,CARGOID,DCLASS,AGENTID,LANE ");//
strSql.Append(",SALEDEPT,(select [NAME] from [company] where GID=v_op_bill.SALECORPID) as SALECORP,(select top 1 SHOWNAME from VW_user where userid in (select top 1 op from workflow_using where TYPENO='602' and bsno=v_op_bill.bsno)) BILLFEEOP ");//
strSql.Append(" from v_op_bill ");
@ -702,6 +702,8 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
data.CARGOID = Convert.ToString(reader["CARGOID"]);
data.DCLASS = Convert.ToString(reader["DCLASS"]);
data.AGENTID = Convert.ToString(reader["AGENTID"]);
data.LANE = Convert.ToString(reader["LANE"]);
#endregion
headList.Add(data);
}

1
DSWeb/Areas/Account/Models/MsOpBill/MsOpBill.cs
Unescape Escape View File

@ -249,6 +249,7 @@ namespace DSWeb.Areas.Account.Models.MsOpBill
public string CLOSEETDDAY { get; set; }
public string SHIPAGENCY { get; set; }
public string AGENTID { get; set; }
public string LANE { get; set; }
public string CUSTOMSER { get; set; }
public string TRUCKER { get; set; }

9
DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Chfee_Audit.js
Unescape Escape View File

@ -2793,6 +2793,11 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
dataIndex: 'DCLASS',
header: Zi.LAN.DCLASS, //报关单号
width: 120
}, {
sortable: true,
dataIndex: 'LANE',
header:Zi.LAN.LANE, //报关单号
width: 120
}
];
@ -3553,7 +3558,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
region: 'east',
hidden: true,
title: Zi.LAN.FYUpdate,
width: 470,
width: 520,
trackResetOnLoad: true,
autoScroll: true,
bodyPadding: 5,
@ -3854,7 +3859,7 @@ Ext.extend(Shipping.MsChfeeAudit, Ext.Panel, {
region: 'east',
hidden: true,
title: Zi.LAN.FYUpdate,
width: 470,
width: 520,
autoScroll: true,
trackResetOnLoad: true,
bodyPadding: 5,

1
DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Zi_en-us.js
Unescape Escape View File

@ -318,6 +318,7 @@ Zi.LAN.CHUANDAI ="SHIPPING AGENT"; // "船代";
Zi.LAN.BAOXIANGONGS = "INSURANCE COMPANY";//"保险公司";
Zi.LAN.QITA = "OTHER";//"其他";
Zi.LAN.CANGKU = "WAREHOUSE";//"仓库";
Zi.LAN.LANE = "Lane";
//#endregion

1
DSWeb/Areas/Account/Viewsjs/Chfee_Audit/Zi_zh-cn.js
Unescape Escape View File

@ -320,3 +320,4 @@ Zi.LAN.CHUANDAI = "船代";
Zi.LAN.BAOXIANGONGS = "保险公司";
Zi.LAN.QITA = "其他";
Zi.LAN.CANGKU = "仓库";
Zi.LAN.LANE = "航线";

1
DSWeb/Areas/Account/Viewsjs/Chfee_do_detail/Chfee_do_detailModel.js
Unescape Escape View File

@ -149,6 +149,7 @@ Ext.define('MsChFeedoBill', {
{ name: 'BLFRT', type: 'string' },
{ name: 'CARRIER', type: 'string' },
{ name: 'AGENTID', type: 'string' },
{ name: 'LANE', type: 'string' },
{ name: 'YARD', type: 'string' },
{ name: 'FORWARDER', type: 'string' },
{ name: 'ISSUETYPE', type: 'string' },

2
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayAppBLsettlementEdit.js
Unescape Escape View File

@ -5913,7 +5913,7 @@ Ext.extend(Shipping.MsChPayAppSettlementEdit, Ext.Panel, {
var sql = '';
var customNo = form.findField('CustomNo').getValue();
sql = sql + getAndConSql(sql, customNo, " BILLNO like '%" + customNo + "%'");
sql = sql + getAndConSql(sql, customNo, " cm.BILLNO like '%" + customNo + "%'");
var BH = form.findField('BH').getValue();
sql = sql + getAndConSql(sql, BH, " EXISTS(select 1 from ch_fee_do where BILLNO=cm.BILLNO and EXISTS(select 1 from v_op_bill where bsno=ch_fee_do.BSNO and (CUSTNO like '%" + BH + "%' or MBLNO like '%" + BH + "%' or HBLNO like '%" + BH + "%') ))");

4
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPayInvsettlementEdit.js
Unescape Escape View File

@ -2740,7 +2740,7 @@ Ext.extend(Shipping.MsChPayInvSettlementEdit, Ext.Panel, {
this.storeAddFeeList.on('load', function (store, records) {
if (store.getCount() > 0) {
this.gridAddFeeList.getSelectionModel().select(0);
// this.gridAddFeeList.getSelectionModel().select(0);
} else {
this.storeAddBodydetail.load({ params: { condition: " BILLNO='XX'"} });
@ -3978,7 +3978,7 @@ Ext.extend(Shipping.MsChPayInvSettlementEdit, Ext.Panel, {
};
if ((billstatus != 0)) {
if ((billstatus != 2)) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.CanotLock4CurrStatus, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;

5
DSWeb/Areas/MvcShipping/DAL/MsCodeFtpSet/MsCodeFtpSetDAL.cs
Unescape Escape View File

@ -19,7 +19,7 @@ namespace DSWeb.MvcShipping.DAL.MsCodeFtpSet
var strSql = new StringBuilder();
strSql.Append("SELECT ");
strSql.Append("GID,EDINAME,SERVERIP,FOLDERNAME,USERNAME,[PASSWORD],CORPID,SENDCODE,RECEIVEEMAIL,RECEIVESIEMAIL,SERVERIP2,FOLDERNAME2,USERNAME2,[PASSWORD2],ISSSL,SFTPPORT,ISDJYKF,");
strSql.Append("GID,EDINAME,SERVERIP,FOLDERNAME,USERNAME,[PASSWORD],CORPID,SENDCODE,RECEIVEEMAIL,RECEIVESIEMAIL,SERVERIP2,FOLDERNAME2,USERNAME2,[PASSWORD2],ISSSL,SFTPPORT,ISDJYKF,SSHHOSTKEYFINGERPRINT,SFTPKEX,SFTPFSPROTOCOL,");
strSql.Append("RECEIVECODE,SENDNAME,SENDATTN,SENDTEL,SENDEMAIL,RECEIVEOP,RECEIVESALE,RECEIVEDEPT,SENDCOMPANYCODE,SENDSUBCOMPANYCODE,CARRIERID,SHIPPERTEL,CONSIGNEETEL,NOTIFYPARTYTEL,ISUSETEL,ALIASSENDCODE,TMPFOLDERNAME,SFTPCERFILENAME ");
strSql.Append(" from code_FtpSet where CORPID='"+companyid+"'");
@ -97,6 +97,9 @@ namespace DSWeb.MvcShipping.DAL.MsCodeFtpSet
data.ALIASSENDCODE = Convert.ToString(reader["ALIASSENDCODE"]);
data.TMPFOLDERNAME = Convert.ToString(reader["TMPFOLDERNAME"]);
data.SFTPCERFILENAME = Convert.ToString(reader["SFTPCERFILENAME"]);
data.SSHHOSTKEYFINGERPRINT = Convert.ToString(reader["SSHHOSTKEYFINGERPRINT"]);
data.SFTPKEX = Convert.ToString(reader["SFTPKEX"]);
data.SFTPFSPROTOCOL = Convert.ToString(reader["SFTPFSPROTOCOL"]);
if (reader["ISSSL"] != DBNull.Value)
data.ISSSL = Convert.ToBoolean(reader["ISSSL"]);//货主箱标志,是否自有箱
if (reader["ISDJYKF"] != DBNull.Value)

79
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -33,6 +33,8 @@ using DSWeb.Areas.Dispatch.DB;
using DSWeb.MvcShipping.DAL.MsSysThirdPartyAccount;
using System.Runtime.Remoting.Messaging;
using DSWeb.Common.DB;
using System.Web;
using WinSCP;
namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
{
@ -571,7 +573,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
var result = new DBResult();
if (ftpset.ISSSL) {
return SFtpFile(filename, ftpset, removefile);
if (!string.IsNullOrEmpty(ftpset.SFTPCERFILENAME))
{
return SFtpFileByFile(filename, ftpset, removefile);
}
else
return SFtpFile(filename, ftpset, removefile);
}
FTPDA FTPDA = new FTPDA();
@ -618,7 +625,12 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
var result = new DBResult();
if (ftpset.ISSSL)
{
return SFtpFile2(filename, ftpset, removefile);
if (!string.IsNullOrEmpty(ftpset.SFTPCERFILENAME))
{
return SFtpFileByFile(filename, ftpset, true);
}
else
return SFtpFile2(filename, ftpset, removefile);
}
FTPDA FTPDA = new FTPDA();
@ -715,6 +727,69 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
public static DBResult SFtpFileByFile(string filename, CodeFtpSet ftpset, bool folder2 = false)
{
var result = new DBResult();
var keypath = HttpContext.Current.Server.MapPath("../../ExpFiles");
string keyfile = keypath + "\\" + ftpset.SFTPCERFILENAME;
var name = Path.GetFileName(filename);
try
{
// 配置会话选项
SessionOptions sessionOptions = new SessionOptions
{
Protocol = Protocol.Sftp,
HostName = ftpset.SERVERIP,
PortNumber = Convert.ToInt32(ftpset.SFTPPORT),
UserName = ftpset.USERNAME,
Password = ftpset.PASSWORD,
SshHostKeyFingerprint = ftpset.SSHHOSTKEYFINGERPRINT,
SshPrivateKeyPath = keyfile,
PrivateKeyPassphrase = ftpset.PASSWORD,
};
sessionOptions.AddRawSettings("KEX", ftpset.SFTPKEX);
sessionOptions.AddRawSettings("FSProtocol", ftpset.SFTPFSPROTOCOL);
var foldername = ftpset.FOLDERNAME + name;
if (folder2) foldername = ftpset.FOLDERNAME2 + name;
using (Session session = new Session())
{
session.Open(sessionOptions);
TransferOptions transferOptions = new TransferOptions();
transferOptions.TransferMode = TransferMode.Binary;
TransferOperationResult transferResult;
transferResult = session.PutFiles(filename, foldername, false, transferOptions);
transferResult.Check();
foreach (TransferEventArgs transfer in transferResult.Transfers)
{
}
if (session != null)
{
session.Dispose();
}
// 你的代码
}
result.Success = true;
result.Message = "上传成功！";
}
catch (Exception E)
{
result.Success = false;
result.Message = E.Message;
}
return result;
}
public static DBResult HttpsPostJson(string json, string posturl)
{
var result = new DBResult();

7
DSWeb/Areas/MvcShipping/Models/MsCodeFtp/FtpSet.cs
Unescape Escape View File

@ -280,7 +280,12 @@ namespace DSWeb.MvcShipping.Models.FtpSet
get { return _SFTPPORT; }
set { _SFTPPORT = value; }
}
[ModelDB]
public string SFTPKEX { get; set; }
[ModelDB]
public string SFTPFSPROTOCOL { get; set; }
[ModelDB]
public string SSHHOSTKEYFINGERPRINT { get; set; }
#endregion

32
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFtpSet/MsCodeFtpSetEdit.js
Unescape Escape View File

@ -213,17 +213,39 @@ Ext.extend(Shipping.MsCodeFtpSetEdit, Ext.Panel, {
}, {
fieldLabel: '临时文件夹',
name: 'TMPFOLDERNAME'
}, {
fieldLabel: 'SFTP认证文件',
name: 'SFTPCERFILENAME'
}, {
}, {
fieldLabel: '是否大简云下货纸扣费', //'是否SOC',
labelWidth: 120,
labelWidth: 140,
inputValue: true,
xtype: 'checkboxfield',
name: 'ISDJYKF'
}
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'SshHostKeyFingerprint',
name: 'SSHHOSTKEYFINGERPRINT'
}
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: 'SFTP私钥文件',
name: 'SFTPCERFILENAME'
}, {
fieldLabel: 'Sftp KEX',
flex: 2,
name: 'SFTPKEX'
}, {
fieldLabel: 'FSProtocol',
name: 'SFTPFSPROTOCOL'
}
]
}
]//end items(fieldset 1)
}//end fieldset 1

4
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFtpSet/MsCodeFtpSetIndex.js
Unescape Escape View File

@ -74,7 +74,7 @@ Ext.extend(Shipping.MsCodeFtpSetIndex, Ext.Panel, {
this.gridList.addListener('itemdblclick', function (dataview, record, item, index, e, b) {
this.SelectedRecord = record;
this.OprationStatus = 'edit';
window.open('/MvcShipping/MsCodeFtpSet/Edit', "CODEFTPSET", 'width=850,height=300,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
window.open('/MvcShipping/MsCodeFtpSet/Edit', "CODEFTPSET", 'width=850,height=450,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
}, this);
//#region formSearch
@ -131,7 +131,7 @@ Ext.extend(Shipping.MsCodeFtpSetIndex, Ext.Panel, {
iconCls: "btnadd",
handler: function (button, event) {
this.OprationStatus = 'add';
window.open('/MvcShipping/MsCodeFtpSet/Edit', "CODEFTPSET", 'width=850,height=300,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
window.open('/MvcShipping/MsCodeFtpSet/Edit', "CODEFTPSET", 'width=850,height=450,top=0,left=0,resizable=yes,status=yes,menubar=no,scrollbars=yes');
},
scope: this

3
DSWeb/Areas/MvcShipping/Viewsjs/MsCodeFtpSet/MsCodeFtpSetModel.js
Unescape Escape View File

@ -36,6 +36,9 @@
{ name: 'ISUSETEL', type: 'string' },
{ name: 'TMPFOLDERNAME', type: 'string' },
{ name: 'SFTPCERFILENAME', type: 'string' },
{ name: 'SSHHOSTKEYFINGERPRINT', type: 'string' },
{ name: 'SFTPKEX', type: 'string' },
{ name: 'SFTPFSPROTOCOL', type: 'string' },
{ name: 'ALIASSENDCODE', type: 'string' }
]
});

9
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAire/AireFee.js
Unescape Escape View File

@ -19,10 +19,17 @@ Ext.extend(Shipping.AireFee, Ext.Panel, {
// var mainform = window.window._this;
var mainform = window.panelEdit;
if (mainform == undefined) {
EditRecord = window._this.editRecord;
} else {
EditRecord = mainform.editRecord;
}
// if (mainform == null || mainform == NaN) {
// var mainform = Ext.getCmp('OpSeaeFenEdit');
// }
EditRecord = mainform.editRecord;
this.bsno = EditRecord.get('BSNO');
this.formHead = Ext.widget('form', {
frame: true,

15
DSWeb/Areas/MvcShipping/Viewsjs/MsOpAiri/AiriFee.js
Unescape Escape View File

@ -20,9 +20,18 @@ Ext.extend(Shipping.AiriFee, Ext.Panel, {
var mainform = window.panelEdit;
// if (mainform == null || mainform == NaN) {
// var mainform = Ext.getCmp('OpSeaeFenEdit');
// }
EditRecord = mainform.editRecord;
// var mainform = Ext.getCmp('OpSeaeFenEdit');
// }
if (mainform == undefined) {
EditRecord = window._this.editRecord;
} else {
EditRecord = mainform.editRecord;
}
this.bsno = EditRecord.get('BSNO');
this.formHead = Ext.widget('form', {
frame: true,

4
DSWeb/Areas/TruckMng/Controllers/PcHeadEdit_WFSDController.cs
Unescape Escape View File

@ -539,7 +539,9 @@ namespace DSWeb.Areas.TruckMng.Controllers
headData.PGid = headData.gId;
headData.SealNo = ctn.SEALNO;
headData.ContainerNo = ctn.CNTRNO;
headData.ContainerType = ctn.CTNALL;
headData.ContainerQty = ctn.CTNNUM.ToString();
headData.BLTYPE = "派车分票";

3
DSWeb/DSWeb.csproj
Unescape Escape View File

@ -408,6 +408,9 @@
<HintPath>..\packages\Tea.1.0.11\lib\net45\Tea.dll</HintPath>
</Reference>
<Reference Include="Web.PageBase, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
<Reference Include="WinSCPnet">
<HintPath>..\packages\WinSCP.6.3.2\lib\net40\WinSCPnet.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Areas\Account\Viewsjs\Account_Monthlock\Month_lock.js" />

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>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

Write Preview
Loading…
Cancel
Save