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

1

Browse Source
DS7_JingHan
hanxuntao 2 years ago
parent 6a41265c91
commit f6b1f889aa
15 changed files with 559 additions and 2487 deletions
Show Stats Download Patch File Download Diff File

69
DSWeb/Areas/Account/DAL/Chfee_payapplication/Chfee_PayapplicationDAL.cs
Unescape Escape View File

@ -4713,6 +4713,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
{
var head = GetData("cm.BILLNO='" + billno + "'", userid, username, companyid);
//var bodylist = GetBodyAllBsList("c.BILLNO='" + billno + "'");
//SavePayBill(billno,bodylist);
var ISCONTRACT = "无";
T_ALL_DA T_ALL_DA = new T_ALL_DA();
@ -4911,6 +4912,74 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
}
public static DBResult SavePayBill(string billno,List<v_op_billpay> bodyList)
{
var result = new DBResult();
Database db = DatabaseFactory.CreateDatabase();
using (var conn = db.CreateConnection())
{
conn.Open();
var tran = conn.BeginTransaction();
try
{
var cmdInsert =
db.GetSqlStringCommand(
@"insert into ch_fee_payapplication_bill (GID, BILLNO,BSNO,MBLNO,CUSTNO,ETD,CUSTOMERNAME, STLNAME,CNTRTOTAL,RMBCR,USDCR,TTLPROFIT,RMBPROFIT,USDPROFIT,BILLFEESTATUS)
values (@GID, @BILLNO,@BSNO,@MBLNO,@CUSTNO,@ETD,@CUSTOMERNAME, @STLNAME,@CNTRTOTAL,@RMBCR,@USDCR,@TTLPROFIT,@RMBPROFIT,@USDPROFIT,@BILLFEESTATUS) ");
var cmdDelete =
db.GetSqlStringCommand(
@"delete from ch_fee_payapplication_bill where BILLNO=@BILLNO ");
if (bodyList != null)
{
cmdDelete.Parameters.Clear();
db.AddInParameter(cmdDelete, "@BILLNO", DbType.String,billno);
db.ExecuteNonQuery(cmdDelete, tran);
foreach (var enumValue in bodyList)
{
cmdInsert.Parameters.Clear();
db.AddInParameter(cmdInsert, "@GID", DbType.String, Guid.NewGuid().ToString());
db.AddInParameter(cmdInsert, "@BILLNO", DbType.String,billno);
db.AddInParameter(cmdInsert, "@BSNO", DbType.String, enumValue.BSNO);
db.AddInParameter(cmdInsert, "@MBLNO", DbType.String, enumValue.MBLNO);
db.AddInParameter(cmdInsert, "@CUSTNO", DbType.String, enumValue.CUSTNO);
db.AddInParameter(cmdInsert, "@ETD", DbType.String, enumValue.ETD);
db.AddInParameter(cmdInsert, "@CUSTOMERNAME", DbType.String, enumValue.CUSTOMERNAME);
db.AddInParameter(cmdInsert, "@STLNAME", DbType.String, enumValue.STLNAME);
db.AddInParameter(cmdInsert, "@CNTRTOTAL", DbType.String, enumValue.CNTRTOTAL);
db.AddInParameter(cmdInsert, "@RMBCR", DbType.String, enumValue.RMBCR);
db.AddInParameter(cmdInsert, "@USDCR", DbType.String, enumValue.USDCR);
db.AddInParameter(cmdInsert, "@TTLPROFIT", DbType.String, enumValue.TTLPROFIT);
db.AddInParameter(cmdInsert, "@USDPROFIT", DbType.String, enumValue.USDPROFIT);
db.AddInParameter(cmdInsert, "@RMBPROFIT", DbType.String, enumValue.RMBPROFIT);
db.AddInParameter(cmdInsert, "@BILLFEESTATUS", DbType.String, enumValue.BILLFEESTATUS);
db.ExecuteNonQuery(cmdInsert, tran);
}
}
tran.Commit();
}
catch (Exception)
{
tran.Rollback();
result.Success = false;
result.Message = "保存出现错误，请重试或联系系统管理员";
return result;
}
}
result.Success = true;
result.Message = "保存成功";
return result;
}
public static DBResult GetEmailHtml2(string billno, string userid, string username, string companyid,string deptname)
{

12
DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationNewEdit.js
Unescape Escape View File

@ -3970,12 +3970,12 @@ addDetail: function () {
}
if ((CURR == '') || (CURR == null)) {
btnEAddDetail.enable();
Ext.Msg.show({ title: '提示', msg: '币别不能为空!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
//if ((CURR == '') || (CURR == null)) {
// btnEAddDetail.enable();
// Ext.Msg.show({ title: '提示', msg: '币别不能为空!', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
// return;
}
//}
}
}
@ -4234,7 +4234,7 @@ addDetailfn: function () {
var sql = this.sqlcontext;
this.storeBodyAddList.load({ params: { start: 0, limit: _this.PageSize, sort: '', condition: sql} });
this.storeAppDetailList.load({ params: { condition: " LINKGID='" + GID + "'" } });
_this.storeBodyList.load({ params: { condition: " BILLNO='" + billno + "'" },
callback: function (r, options, success) {
if (success) {

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

@ -3736,11 +3736,11 @@ Ext.extend(Shipping.ChSettlementRecvInvEdit, Ext.Panel, {
callback: function (r, options, success) {
if (success) {
if (_this.storeBodyList.getCount() > 0) {
_this.comboxCurr.setReadOnly(true);
_this.comboxBILLTYPE.setReadOnly(true);
_this.comboxCustCode.setReadOnly(true);
}
else {
_this.comboxCurr.setReadOnly(false);
_this.comboxBILLTYPE.setReadOnly(false);
_this.comboxCustCode.setReadOnly(false);
}
}

170
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -4275,176 +4275,6 @@ namespace DSWeb.MvcShipping.Controllers
}
#endregion
#region 马士基MAERSK导出
public ContentResult CreateMAERSKList(string bsnos, string mblno, string filetype, string filerole, int isbill, string carrier)
{
bsnos = bsnos.Replace(",", "','");
var headList = MsOpSeaeDAL.GetDataList("BSNO IN ('" + bsnos + "')", CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]));
var path = Server.MapPath("../../EDIFiles/SeaeEdi");
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
var result = new DBResult();
if (filetype == "V")
{
#region VGM
var error = MsOpSeaeEdiPortDAL.IsCreateVGM(headList, "MAERSKVGM", filetype, filerole, "", "", "", "", "");
if (error == "")
{
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='MAERSKVGM' and CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));// AND CARRIERID='" + carrier + "'
var filename = "";
filename = MsOpSeaeEdiPortDAL.CreateVGM(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, "MAERSKVGM", isbill, 0, carrier, "", "", filetype, "", "", "", "", "");
if (ftpset.SERVERIP != "" && ftpset.SERVERIP != null)
{
result = MsOpSeaeEdiPortDAL.FtpFile(filename, ftpset);
var afilename = Path.GetFileName(filename);
MsOpSeaeEdiPortDAL.InsertEdiLog(bsnos, "MAERSKVGM", filetype, carrier, ftpset.SERVERIP, afilename, "../../EDIFiles/SeaeEdi/" + afilename, Convert.ToString(Session["SHOWNAME"]));
}
else
{
result.Success = false;
result.Message = "FTP参数没有设置,请先设置FTP参数!";
}
}
else
{
result.Success = false;
result.Message = error;
}
#endregion
}
else
{
#region 订舱、确认
var error = MsOpSeaeEdiPortDAL.IsCreateMAERSK(headList, filetype, filerole, isbill, carrier);
if (error == "")
{
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='MAERSK' and CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));
var filename = "";
if (filetype == "E")
filename = MsOpSeaeEdiPortDAL.CreateEdiMAERSKSI(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, carrier, filetype);
else
filename = MsOpSeaeEdiPortDAL.CreateEdiMAERSK(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, carrier, filetype);
if (ftpset.SERVERIP != "" && ftpset.SERVERIP != null)
{
result = MsOpSeaeEdiPortDAL.FtpFile(filename, ftpset);
var afilename = Path.GetFileName(filename);
MsOpSeaeEdiPortDAL.InsertEdiLog(bsnos, "MAERSK", filetype, carrier, ftpset.SERVERIP, afilename, "../../EDIFiles/SeaeEdi/" + afilename, Convert.ToString(Session["SHOWNAME"]));
T_ALL_DA T_ALL_DA = new EntityDA.T_ALL_DA();
foreach (var bill in headList)
{
if (filetype == "B")
{
var blUpSQL = " if (select CID from Op_SeaCover where bsno='" + bill.BSNO + "' AND COVERTITLE='发送SO') is null insert into Op_SeaCover(CID,BSNO,COVERTITLE,COVERCONTEXT,OPERATOR,OPTIME,ISSYS) values(NEWID(),'" + bill.BSNO + "','发送SO','','" + Session["SHOWNAME"] + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1')";
bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
}
else
{
var blUpSQL = " if (select CID from Op_SeaCover where bsno='" + bill.BSNO + "' AND COVERTITLE='发送SI') is null insert into Op_SeaCover(CID,BSNO,COVERTITLE,COVERCONTEXT,OPERATOR,OPTIME,ISSYS) values(NEWID(),'" + bill.BSNO + "','发送SI','','" + Session["SHOWNAME"] + "','" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','1')";
bool bl = T_ALL_DA.GetExecuteSqlCommand(blUpSQL);
}
}
}
else
{
result.Success = false;
result.Message = "FTP参数没有设置,请先设置FTP参数!";
}
}
else
{
result.Success = false;
result.Message = error;
}
#endregion
}
var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
public ContentResult SaveMAERSKList(string bsnos, string mblno, string filetype, string filerole, int isbill, string carrier)
{
bsnos = bsnos.Replace(",", "','");
var headList = MsOpSeaeDAL.GetDataList("BSNO IN ('" + bsnos + "')", CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]));
var path = Server.MapPath("../../EDIFiles/SeaeEdi");
if (!Directory.Exists(path))
{
Directory.CreateDirectory(path);
}
var result = new DBResult();
if (filetype == "V")
{
#region VGM
var error = MsOpSeaeEdiPortDAL.IsCreateVGM(headList, "MAERSKVGM", filetype, filerole, "", "", "", "", "");
if (error == "")
{
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='MAERSKVGM' and CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));// AND CARRIERID='" + carrier + "'
if (ftpset.SENDCODE == "" || ftpset.RECEIVECODE == "")
{
result.Success = false;
result.Message = "EDI参数没有设置,请先设置EDI参数!";
}
else
{
var filename = "";
filename = MsOpSeaeEdiPortDAL.CreateVGM(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, "MAERSKVGM", isbill, 0, carrier, "", "", filetype, "", "", "", "", "");
filename = Path.GetFileName(filename);
result.Data = "../../EDIFiles/SeaeEdi/" + filename;
result.Success = true;
result.Message = filename;
}
}
else
{
result.Success = false;
result.Message = error;
}
#endregion
}
else
{
#region 订舱、确认
var error = MsOpSeaeEdiPortDAL.IsCreateMAERSK(headList, filetype, filerole, isbill, carrier);
if (error == "")
{
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='MAERSK' and CARRIERID='" + carrier + "'", Convert.ToString(Session["COMPANYID"]));
var filename = "";
if (filetype == "E")
filename = MsOpSeaeEdiPortDAL.CreateEdiMAERSKSI(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, carrier, filetype);
else
filename = MsOpSeaeEdiPortDAL.CreateEdiMAERSK(headList, Convert.ToString(Session["USERCODE"]), path, mblno, filerole, ftpset, isbill, carrier, filetype);
filename = Path.GetFileName(filename);
result.Data = "../../EDIFiles/SeaeEdi/" + filename;
result.Success = true;
result.Message = filename;
}
else
{
result.Success = false;
result.Message = error;
}
#endregion
}
var jsonRespose = new JsonResponse { Success = result.Success, Message = result.Message, Data = result.Data };
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
#endregion

2732
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
View File

File diff suppressed because it is too large Load Diff

2
DSWeb/Areas/MvcShipping/Views/MsOpAire/Edit.aspx
Unescape Escape View File

@ -51,7 +51,7 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeMenu.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCompanys/MsCompanysModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAire/MsOpAireModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeAirPort/MsCodeAirPortModel.js"></script>

2
DSWeb/Areas/MvcShipping/Views/MsOpAiri/Edit.aspx
Unescape Escape View File

@ -51,7 +51,7 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeMenu.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCompanys/MsCompanysModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpAiri/MsOpAiriModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeAirPort/MsCodeAirPortModel.js"></script>

2
DSWeb/Areas/MvcShipping/Views/MsOpApply/Edit.aspx
Unescape Escape View File

@ -43,7 +43,7 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeMenu.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCompanys/MsCompanysModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeOpService/MsCodeOpServiceModel.js"></script>

2
DSWeb/Areas/MvcShipping/Views/MsOpOther/Edit.aspx
Unescape Escape View File

@ -39,7 +39,7 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/DateTimeMenu.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
<script type="text/javascript" src="../../../../Areas/CommMng/Viewsjs/Comm/BoxSelect.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeOpService/MsCodeOpServiceModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpOther/MsOpOtherEdit.js"></script>

2
DSWeb/Areas/MvcShipping/Views/MsOpSeai/Edit.aspx
Unescape Escape View File

@ -64,7 +64,7 @@
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCompanys/MsCompanysModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpApply/MsOpApplyModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeGoods/MsCodeGoodsModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsChFee/DsAudit.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/Comm/MonthField.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeaiModel.js"></script>
<script type="text/javascript" src="../../../../Areas/MvcShipping/Viewsjs/MsCodeOpService/MsCodeOpServiceModel.js"></script>

2
DSWeb/Areas/MvcShipping/Viewsjs/Comm/PubFunction.js
Unescape Escape View File

@ -473,7 +473,7 @@ function Billstrnum(str,len) {
for (var i = 0; i < slist.length; i += 1) {
var member = slist[i];
if (member.length > len) {
if (member.trim().length > len) {
if (result=='')
result = result + (i + 1) + '行';
else

33
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js
Unescape Escape View File

@ -3244,8 +3244,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
'select': function (combo, records, eOpts) {
if (records.length > 0) {
this.formEdit.getForm().findField('DESTINATION').setValue(records[0].data.PORT);
this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(records[0].data.EDICODE);
this.formEdit.getForm().findField('PLACEDELIVERY').setValue(records[0].data.PORT);
//this.storeCodeDisport3.load({ params: { PORT: records[0].data.EDICODE} });
//this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(records[0].data.EDICODE);
//this.formEdit.getForm().findField('PLACEDELIVERY').setValue(records[0].data.PORT);
var BLFRT = this.formHead.getForm().findField('BLFRT').getValue();
if (BLFRT == "FREIGHT COLLECT") {
this.formEdit.getForm().findField('PREPARDAT').setValue('');
@ -3269,8 +3270,8 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
_rec = this.storeCodeDisport2.getAt(0);
this.formEdit.getForm().findField('DESTINATION').setValue(_rec.data.PORT);
this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(_rec.data.EDICODE);
this.formEdit.getForm().findField('PLACEDELIVERY').setValue(_rec.data.PORT);
//this.formEdit.getForm().findField('PLACEDELIVERYID').setValue(_rec.data.EDICODE);
//this.formEdit.getForm().findField('PLACEDELIVERY').setValue(_rec.data.PORT);
var BLFRT = this.formHead.getForm().findField('BLFRT').getValue();
if (BLFRT == "FREIGHT COLLECT") {
this.formEdit.getForm().findField('PREPARDAT').setValue('');
@ -5987,9 +5988,6 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
}, {
name: 'ENTERPRISECODETYPE2', hidden: true
},
{
name: 'INLANE', hidden: true, value: false//企业代码类型
},
{
name: 'USERAILWAY', hidden: true, value: false//企业代码类型
},
@ -6381,8 +6379,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [{
fieldLabel: Zi.LAN.ACIHBL, //'ACI HBL',
items: [{
fieldLabel: Zi.LAN.INLANE, //'通知人Edi代码',
flex: 1,
name: 'INLANE'
},{
fieldLabel: Zi.LAN.ACIHBL, //'ACI HBL',
flex: 3,
name: 'ACIHBL'
}]
}, {
@ -9744,6 +9747,11 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
inputValue: 'CNTAO',
checked: true
}, {
boxLabel: 'CNDLC', //'CNSHA',
name: 'PORTLOAD2',
inputValue: 'CNDLC',
checked: false
}, {
boxLabel: Zi.LAN.CNSHA, //'CNSHA',
name: 'PORTLOAD2',
inputValue: 'CNSHA',
@ -16972,7 +16980,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '船公司不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
var PORTLOADID = this.formEdit.getForm().findField('PORTLOADID').getValue();
var carriercode = "";
var selectrecords = DsStoreQueryBy(this.storeListCarrierEdiType, 'CTN', carrier);
if (selectrecords.getCount() > 0) {
@ -17014,6 +17022,9 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
cgFILETYPE.setValue({ FILETYPE2: type });
var cgCARRIER = Ext.getCmp('pilCARRIER');
cgCARRIER.setValue({ CARRIER: carriercode });
var pilPORTLOAD = Ext.getCmp('pilPORTLOAD2');
pilPORTLOAD.setValue({ PORTLOAD2: PORTLOADID.substring(0,5) });
this.winPILShow2.show();
} else if (this.editype == 'MAERSK') {
var cgFILETYPE = Ext.getCmp('mFILETYPE');
@ -21598,7 +21609,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (textArr == null) return;
for (var j = 0; j < textArr.length; j++) {
var subArr = textArr[j].match(/[\w]+[ ]*[\n]*|[\d]+[ ]*[\n]*|[^\w\d]+[ ]*[\n]*/g);
var subArr = textArr[j].trim().match(/[\w]+[ ]*[\n]*|[\d]+[ ]*[\n]*|[^\w\d]+[ ]*[\n]*/g);
var count = 0;
for (var i = 0; i < subArr.length; i++) {
count += subArr[i].replace(/\n/g, "").length;

10
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -5285,6 +5285,11 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
inputValue: 'CNTAO',
checked: true
}, {
boxLabel: 'CNDLC', //'CNSHA',
name: 'PORTLOAD2',
inputValue: 'CNDLC',
checked: false
}, {
boxLabel: Zi.LAN.CNSHA, //'CNSHA',
name: 'PORTLOAD2',
inputValue: 'CNSHA',
@ -8899,7 +8904,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
return;
}
var carrier =selections[0].data.CARRIER;
var carrier = selections[0].data.CARRIER;
var PORTLOADID = selections[0].data.PORTLOADID;
if (carrier == '') {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: '船公司不能为空！', icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
@ -8945,6 +8951,8 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
cgFILETYPE.setValue({ FILETYPE2: type });
var cgCARRIER = Ext.getCmp('pilCARRIER');
cgCARRIER.setValue({ CARRIER: carriercode });
var pilPORTLOAD = Ext.getCmp('pilPORTLOAD2');
pilPORTLOAD.setValue({ PORTLOAD2: PORTLOADID.substring(0,5) });
this.winPILShow2.show();
} else if (this.editype == 'MAERSK') {

3
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_en-us.js
Unescape Escape View File

@ -684,4 +684,5 @@ Zi.LAN.rRECEIVERDEPT = "接受方部门";
Zi.LAN.EDIRUSSIA = "俄罗斯(交通部)";
Zi.LAN.CNTRSOURCE = "箱源";
Zi.LAN.SALECORPID = "所属团队";
Zi.LAN.PiLiangHistryAddFee = "批量历史费用引入";
Zi.LAN.PiLiangHistryAddFee = "批量历史费用引入";
Zi.LAN.INLANE = "CNAS No.";

1
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/Zi_zh-cn.js
Unescape Escape View File

@ -713,6 +713,7 @@ Zi.LAN.EDIRUSSIA = "俄罗斯(交通部)";
Zi.LAN.CNTRSOURCE = "箱源";
Zi.LAN.SALECORPID = "所属团队";
Zi.LAN.PiLiangHistryAddFee = "批量历史费用引入";
Zi.LAN.INLANE = "CNAS No.";
//Zi.LAN. = "";

Write Preview
Loading…
Cancel
Save