DS7_JinGang
hanxuntao 1 year ago
parent 95159f9b4e
commit 32564a977d

@ -123,6 +123,7 @@ namespace DSWeb.Areas.Account.Controllers
sortStr = sortStr.Replace("SETTLETYPEREF", "SETTLETYPE");
sortStr = sortStr.Replace("ACCOUNTREF", "ACCOUNTRMB");
sortStr = sortStr.Replace("SETTLEUSERREF", "SETTLEUSER");
sortStr = sortStr.Replace("BANKCODE", "ACCOUNTRMB");
}
string LAN = Convert.ToString(Session["LANGUAGES"]);

@ -5177,7 +5177,7 @@ namespace DSWeb.MvcShipping.DAL.Chfee_AuditDAL
var cmdUpdate =
db.GetSqlStringCommand(
@"UPDATE CH_FEE SET CUSTOMERNAME=@CUSTOMERNAME WHERE GID=@GID ");
@"UPDATE CH_FEE SET CUSTOMERNAME=@CUSTOMERNAME WHERE Settlement=0 AND Invoice=0 AND OrderAmount=0 AND OrderInvoice=0 AND GID=@GID ");
if (FeeList != null)

@ -111,6 +111,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
strSql.Append(",(select STLNAME from [code_stlmode] where STLCODE=cm.SETTLETYPE) as SETTLETYPEREF");
strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNTRMB) as ACCOUNTRMBREF");
strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNTUSD) as ACCOUNTUSDREF");
strSql.Append(",(select ACCOUNT from [sys_bank] where GID=cm.ACCOUNTRMB) as BANKCODERMBREF");
strSql.Append(",(select ACCOUNT from [sys_bank] where GID=cm.ACCOUNTUSD) as BANKCODEUSDREF");
if (lan == "en-us")
{
strSql.Append(",(select EnumValueName_2 from tSysEnumValue where LangId=0 and EnumTypeID=97007 and EnumValueID=cm.SETTLEMODE) as SETTLEMODEREF");
@ -203,6 +206,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
strSql.Append(",(select STLNAME from [code_stlmode] where STLCODE=cm.SETTLETYPE) as SETTLETYPEREF");
strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNTRMB) as ACCOUNTRMBREF");
strSql.Append(",(select BANKNAME from [sys_bank] where GID=cm.ACCOUNTUSD) as ACCOUNTUSDREF");
strSql.Append(",(select ACCOUNT from [sys_bank] where GID=cm.ACCOUNTRMB) as BANKCODERMBREF");
strSql.Append(",(select ACCOUNT from [sys_bank] where GID=cm.ACCOUNTUSD) as BANKCODEUSDREF");
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97007 and EnumValueID=cm.SETTLEMODE) as SETTLEMODEREF");
strSql.Append(",dbo.GetFeeNoInvByStlNo(cm.BILLNO) as NOINVOICE");
strSql.Append(" ,cm.BS_CUSTOMERNAME,FEEAMOUNT,PAYBILLNO,INVOICENO,INVOICEDATE,INVOICEAMOUNT ");
@ -253,6 +258,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
strSql.Append(",'' as SETTLETYPEREF");
strSql.Append(",'' as ACCOUNTRMBREF");
strSql.Append(",'' as ACCOUNTUSDREF");
strSql.Append(",'' as BANKCODERMBREF");
strSql.Append(",'' as BANKCODEUSDREF");
strSql.Append(",'' as SETTLEMODEREF");
strSql.Append(",'' SHENNO ");
strSql.Append(",'' INVSHENNO");
@ -326,6 +334,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
data.AMOUNT = data.AMOUNTRMB;
data.ACCOUNT = data.ACCOUNTRMB;
data.ACCOUNTREF = Convert.ToString(reader["ACCOUNTRMBREF"]);
data.BANKCODE = Convert.ToString(reader["BANKCODERMBREF"]);
}
else {
@ -333,7 +342,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
data.AMOUNT = Convert.ToDecimal(reader["AMOUNTUSD"]);
data.ACCOUNT = data.ACCOUNTUSD;
data.ACCOUNTREF = Convert.ToString(reader["ACCOUNTUSDREF"]);
data.BANKCODE = Convert.ToString(reader["BANKCODEUSDREF"]);
}
if (reader["AMOUNTUSD"] != DBNull.Value && data.CURR != "RMB" && data.CURR != "USD" && data.CURR != "")
{

@ -221,6 +221,7 @@ namespace DSWeb.Areas.Account.Models.Chfee_Settlement
get { return _accountref; }
set { _accountref = value; }
}
public string BANKCODE { get; set; }
[ModelDB]
public decimal RATE

@ -146,7 +146,12 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
dataIndex: 'ACCOUNTREF',
header: Zi.LAN.JieSuanAccount ,
width: 150
}, {
}, {
sortable: true,
dataIndex: 'BANKCODE',
header: Zi.LAN.BANKCODE,
width: 150
}, {
sortable: true,
dataIndex: 'NOINVOICE',
header: Zi.LAN.WeiKaiPiao,

@ -154,7 +154,12 @@ Ext.extend(Shipping.MsChRecvsettlementIndex, Ext.Panel, {
dataIndex: 'ACCOUNTREF',
header: Zi.LAN.JieSuanAccount ,
width: 150
}, {
}, {
sortable: true,
dataIndex: 'BANKCODE',
header: Zi.LAN.BANKCODE,
width: 150
}, {
sortable: true,
dataIndex: 'ISEXPORT',
header: Zi.LAN.IsExportCerft,

@ -16,6 +16,7 @@
{ name: 'STLAMOUNT', type: 'number' },
{ name: 'ACCOUNT', type: 'string' },
{ name: 'ACCOUNTREF', type: 'string' },
{ name: 'BANKCODE', type: 'string' },
{ name: 'AMOUNTRMB', type: 'number' },
{ name: 'AMOUNTUSD', type: 'number' },
{ name: 'AMOUNTOT', type: 'number' },

@ -331,4 +331,5 @@ Zi.LAN.STLCURR = '原币结算';
Zi.LAN.DANHAO = '单号';
Zi.LAN.DELETECHENGGONG = '删除成功!';
Zi.LAN.AUDITTIME = '审核时间';
Zi.LAN.AUDITUSERREF = '审核人';
Zi.LAN.AUDITUSERREF = '审核人';
Zi.LAN.BANKCODE = '银行账号';

@ -335,4 +335,5 @@ Zi.LAN.STLCURR = '原币结算';
Zi.LAN.DANHAO = '单号';
Zi.LAN.DELETECHENGGONG = '删除成功!';
Zi.LAN.AUDITTIME = '审核时间';
Zi.LAN.AUDITUSERREF = '审核人';
Zi.LAN.AUDITUSERREF = '审核人';
Zi.LAN.BANKCODE = '银行账号';

@ -946,13 +946,14 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(",C.[DESCRIPTION] AS CUSTFULLNAME ");
if (noDrCr == "10" || noDrCr == "11")
strSql.Append(",0 AS RMBDR,0 AS STLRMBDR,0 AS BALRMBDR,0 AS ORDERRMBDR,");
strSql.Append(",0 AS RMBDR,0 AS STLRMBDR,0 AS BALRMBDR,0 AS ORDERRMBDR,0 AS INVOICERMBDR,");
else
{
strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS STLRMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS ORDERRMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(INVOICE,0) ELSE 0 END) ELSE 0 END),0) AS INVOICERMBDR,");
}
if (noDrCr == "01" || noDrCr == "11")
@ -967,13 +968,14 @@ namespace DSWeb.MvcShipping.Controllers
if (noDrCr == "10" || noDrCr == "11")
strSql.Append("0 AS USDDR,0 AS STLUSDDR,0 AS BALUSDDR,0 AS ORDERUSDDR,");
strSql.Append("0 AS USDDR,0 AS STLUSDDR,0 AS BALUSDDR,0 AS ORDERUSDDR,0 AS INVOICEUSDDR,");
else
{
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS STLUSDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT-SETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(ORDERAMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS ORDERUSDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(INVOICE,0) ELSE 0 END) ELSE 0 END),0) AS INVOICEUSDDR,");
}
if (noDrCr == "01" || noDrCr == "11")
strSql.Append("0 AS USDCR,0 AS STLUSDCR,0 AS BALUSDCR,0 AS ORDERUSDCR,");

@ -229,7 +229,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append("SELECT B.BSNO, B.OPLB,B.OPLBNAME, B.BSTYPE,B.BLTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,");
strSql.Append("C.[DESCRIPTION] AS CUSTFULLNAME,B.YARD,");
strSql.Append("B.ETD,B.PKGS,B.CBM,B.NETWEIGHT");
strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.TRADETEAM");
strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.TRADETERM");
strSql.Append(",case B.CUSTOMDATE when '1900-01-01 00:00:00.000' then '' else CONVERT(varchar(100), B.CUSTOMDATE,23) end as CUSTOMDATE");
strSql.Append(",case B.FEESTATUS when 1 then '锁定' else '未锁定' end as FEESTATUSREF");
strSql.Append(",B.CUSTSERVICE,B.FRCUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.DESTINATION,B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE,B.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.CNTRTOTAL,B.CORPID");
@ -248,7 +248,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" GROUP BY B.BSNO, B.OPLB,B.OPLBNAME, B.BSTYPE,B.BLTYPE,B.CUSTOMERNAME, B.CUSTNO, B.MBLNO, B.HBLNO,B.VESSEL, B.VOYNO, B.INPUTBY, B.CREATETIME, B.BSSTATUS, B.SALE, B.OP, B.DOC,");
strSql.Append("C.[DESCRIPTION] , B.YARD,");
strSql.Append("B.ETD,B.PKGS,B.CBM,B.NETWEIGHT");
strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.TRADETEAM");
strSql.Append(",B.OPDATE,B.ENTERP,B.REMARK,B.TRADETERM");
strSql.Append(",B.CUSTOMDATE");
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.BSSOURCEDETAIL, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID");

@ -101,6 +101,20 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
public ContentResult SaveAuthorityCompanyVsAll_Tree(string USERID, string AUTHORITYID, string rtype)
{
var modb = new ModelObjectRepository();
DBResult result = MsUerAuthorityDAL.SaveAuthorityCompanyDetailAll(AUTHORITYID, USERID, Convert.ToString(Session["USERID"]), rtype);
var jsonRespose = new JsonResponse
{
Success = result.Success,
Message = result.Message
};
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) };
}
/// <summary>
/// 人员权限设置 右侧 选择人员列表
/// </summary>
@ -254,9 +268,7 @@ namespace DSWeb.MvcShipping.Controllers
public ContentResult SaveAuthorityOpVsAll_Tree(string USERID, string AUTHORITYID, string rtype)
{
var bodyList = MsUerAuthorityDAL.GetUserAuthority_All(USERID, AUTHORITYID);
var modb = new ModelObjectRepository();
DBResult result = MsUerAuthorityDAL.SaveAuthorityOpDetailAll(AUTHORITYID, USERID, Convert.ToString(Session["USERID"]), rtype);
var jsonRespose = new JsonResponse

@ -3256,14 +3256,14 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
if (carrier != "YML")
{
if (billams.ATTN == null || billams.ATTN == "")
{ error = error + "<br />EDI信息联系人不能为空"; }
//if (billams.ATTN == null || billams.ATTN == "")
//{ error = error + "<br />EDI信息联系人不能为空"; }
if (billams.ATTNTEL == null || billams.ATTNTEL == "")
{ error = error + "<br />EDI信息联系人电话不能为空"; }
//if (billams.ATTNTEL == null || billams.ATTNTEL == "")
//{ error = error + "<br />EDI信息联系人电话不能为空"; }
if (billams.ATTNEMAIL == null || billams.ATTNEMAIL == "")
{ error = error + "<br />EDI信息联系人邮箱不能为空"; }
//if (billams.ATTNEMAIL == null || billams.ATTNEMAIL == "")
//{ error = error + "<br />EDI信息联系人邮箱不能为空"; }
}
}
@ -4592,11 +4592,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
}
r.WriteLine(Shipping + "'");
r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
icount = icount + 4;
icount = icount + 1;
//r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
//r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
//icount = icount + 3;
if (isbill != 1)
{
@ -4622,11 +4622,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
}
r.WriteLine(Shipping + "'");
r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
icount = icount + 4;
icount = icount +1;
//r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
//r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
//icount = icount + 3;
}
if (bill.SERVICE == "DOOR-CY")
{
@ -4642,11 +4642,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
}
r.WriteLine(Shipping + "'");
r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
icount = icount + 4;
icount = icount + 1;
//r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
//r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
//icount = icount + 3;
}
if (bill.SERVICE == "CY-DOOR")
@ -4663,11 +4663,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
}
}
r.WriteLine(Shipping + "'");
r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
icount = icount + 4;
icount = icount + 1;
//r.WriteLine("CTA+IC+:" + billams.ATTN + "'");
//r.WriteLine("COM+" + billams.ATTNTEL + ":TE'");
//r.WriteLine("COM+" + billams.ATTNEMAIL + ":EM'");
//icount = icount + 3;
}

@ -770,6 +770,141 @@ namespace DSWeb.MvcShipping.DAL.MsUerAuthority
tran.Commit();
}
catch (Exception)
{
tran.Rollback();
result.Success = false;
result.Message = "保存出现错误,请重试或联系系统管理员";
return result;
}
}
result.Success = true;
result.Message = "保存成功" + result.Message;
return result;
}
public static DBResult SaveAuthorityCompanyDetailAll(string AUTHORITYID, string op, string userid, string rtype)
{
var result = new DBResult();
//var UserAuthorityList=GetUserAuthorityList(userid);
//if (rtype == "OP")
//{
// UserAuthorityList.FindAll(x=>x.OPERATERANGEREF=="选择人员");
//}
//else {
// UserAuthorityList.FindAll(x => x.VISIBLERANGEREF == "选择人员");
//}
Database db = DatabaseFactory.CreateDatabase();
using (var conn = db.CreateConnection())
{
conn.Open();
var tran = conn.BeginTransaction();
try
{
if (rtype == "OP")
{
var cmdInsertOP =
db.GetSqlStringCommand(
@"update user_authority_range_company set OPERATERANGE=0 from user_authority_range_company p where USERID='" + op + "' and AUTHORITYID<>'" + AUTHORITYID + "' "
+ " update user_authority_range_company set OPERATERANGE=1,MODIFIEDUSER='" + userid + "',MODIFIEDTIME=getdate() from user_authority_range_company p where USERID='" + op + "' and AUTHORITYID<>'" + AUTHORITYID + "' "
+ " and COMPANYID in (select COMPANYID from user_authority_range_company where AUTHORITYID='" + AUTHORITYID + "' and OPERATERANGE=1 and USERID='" + op + "') "
+ " insert into user_authority_range_company (GID,USERID,AUTHORITYID,COMPANYID,VISIBLERANGE,OPERATERANGE,CREATEUSER,CREATETIME) "
+ " select newid() GID,'" + op + "' USERID,A.AUTHORITYID,U.COMPANYID,0 VISIBLERANGE,U.OPERATERANGE,'" + userid + "' CREATEUSER,GETDATE() CREATETIME from VW_User_Authority A, user_authority_range_company U where A.OPERATERANGE=5 AND A.USERID='" + op + "' AND U.AUTHORITYID='" + AUTHORITYID + "' and U.OPERATERANGE=1"
+ " and a.AUTHORITYID<>'" + AUTHORITYID + "' and u.userid='" + op + "' and not EXISTS (select 1 from user_authority_range_company y where y.AUTHORITYID=a.AUTHORITYID and y.USERID='" + op + "' and y.COMPANYID=u.COMPANYID)");
db.ExecuteNonQuery(cmdInsertOP, tran);
}
else
{
var cmdInsertVs =
db.GetSqlStringCommand(
@"update user_authority_range_company set VISIBLERANGE=0 from user_authority_range_company p where USERID='" + op + "' and AUTHORITYID<>'" + AUTHORITYID + "' "
+ " update user_authority_range_company set VISIBLERANGE=1,MODIFIEDUSER='" + userid + "',MODIFIEDTIME=getdate() from user_authority_range_company p where USERID='" + op + "' and AUTHORITYID<>'" + AUTHORITYID + "' "
+ " and COMPANYID in (select COMPANYID from user_authority_range_company where AUTHORITYID='" + AUTHORITYID + "' and VISIBLERANGE=1 and USERID='" + op + "') "
+ " insert into user_authority_range_company (GID,USERID,AUTHORITYID,COMPANYID,VISIBLERANGE,OPERATERANGE,CREATEUSER,CREATETIME) "
+ " select newid() GID,'" + op + "' USERID,A.AUTHORITYID,U.COMPANYID,U.VISIBLERANGE,0 OPERATERANGE,'" + userid + "' CREATEUSER,GETDATE() CREATETIME from VW_User_Authority A, user_authority_range_company U where A.VISIBLERANGE=5 AND A.USERID='" + op + "' AND U.AUTHORITYID='" + AUTHORITYID + "' and U.VISIBLERANGE=1 "
+ " and a.AUTHORITYID<>'" + AUTHORITYID + "' and u.userid='" + op + "' and not EXISTS (select 1 from user_authority_range_company y where y.AUTHORITYID=a.AUTHORITYID and y.USERID='" + op + "' and y.COMPANYID=u.COMPANYID) ");
db.ExecuteNonQuery(cmdInsertVs, tran);
}
//if (UserAuthorityList != null)
//{
// foreach (var enumValueAuthority in UserAuthorityList)
// {
// if (bodyList != null)
// {
// foreach (var enumValue in bodyList)
// {
// if (rtype == "OP")
// {
// cmdInsertOp.Parameters.Clear();
// db.AddInParameter(cmdInsertOp, "@OPID", DbType.String, enumValue.OPID);
// db.AddInParameter(cmdInsertOp, "@AUTHORITYID", DbType.String, enumValueAuthority.AUTHORITYID);
// db.AddInParameter(cmdInsertOp, "@USERID", DbType.String,userid);
// db.AddInParameter(cmdInsertOp, "@GID", DbType.String, Guid.NewGuid().ToString());
// if (enumValue.OPERATERANGE)
// db.AddInParameter(cmdInsertOp, "@OPERATERANGE", DbType.String, "1");
// else
// db.AddInParameter(cmdInsertOp, "@OPERATERANGE", DbType.String, "0");
// db.AddInParameter(cmdInsertOp, "@VISIBLERANGE", DbType.String, "0");
// db.AddInParameter(cmdInsertOp, "@CREATEUSER", DbType.String, userid);
// db.AddInParameter(cmdInsertOp, "@CREATETIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd"));
// db.AddInParameter(cmdInsertOp, "@MODIFIEDUSER", DbType.String, userid);
// db.AddInParameter(cmdInsertOp, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd"));
// db.ExecuteNonQuery(cmdInsertOp, tran);
// }
// else
// {
// cmdInsertVs.Parameters.Clear();
// db.AddInParameter(cmdInsertVs, "@OPID", DbType.String, enumValue.OPID);
// db.AddInParameter(cmdInsertVs, "@AUTHORITYID", DbType.String, enumValueAuthority.AUTHORITYID);
// db.AddInParameter(cmdInsertVs, "@USERID", DbType.String, userid);
// db.AddInParameter(cmdInsertVs, "@GID", DbType.String, Guid.NewGuid().ToString());
// if (enumValue.VISIBLERANGE)
// db.AddInParameter(cmdInsertVs, "@VISIBLERANGE", DbType.String, "1");
// else
// db.AddInParameter(cmdInsertVs, "@VISIBLERANGE", DbType.String, "0");
// db.AddInParameter(cmdInsertVs, "@OPERATERANGE", DbType.String, "0");
// db.AddInParameter(cmdInsertVs, "@CREATEUSER", DbType.String, userid);
// db.AddInParameter(cmdInsertVs, "@CREATETIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd"));
// db.AddInParameter(cmdInsertVs, "@MODIFIEDUSER", DbType.String, userid);
// db.AddInParameter(cmdInsertVs, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString("yyyy-MM-dd"));
// db.ExecuteNonQuery(cmdInsertVs, tran);
// }
// }
// }
// }
//}
tran.Commit();
}
catch (Exception)

@ -4196,19 +4196,58 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (quantity == null) quantity = 0;
var taxrate = form.findField('TaxRate').getValue();
this.DataLoading = true;
if (taxrate != null) {
var taxrateb = parseFloat(1 + parseFloat(taxrate / 100));
var TaxUnitPrice = (parseFloat(unitPrice).mul(taxrateb)).toFixed(2);
var TaxUnitPrice = form.findField('TaxUnitPrice').getValue();
var taxrateb = Add(1, Div(taxrate, 100, 4), 4);
if (TaxUnitPrice != null) {
var amount = Mul(TaxUnitPrice, quantity); //(parseFloat(unitPrice).mul(quantity)).toFixed(2);
form.findField('Amount').setValue(amount);
if (amount > 0) {
var notaxamount = Div(amount, taxrateb);
form.findField('NoTaxAmount').setValue(notaxamount);
} else {
var notaxamount = Div(Math.abs(amount), taxrateb);
notaxamount = -notaxamount;
form.findField('NoTaxAmount').setValue(notaxamount);
}
var tax = Add(amount, -notaxamount); //parseFloat(notaxamount).mul(taxrate);
form.findField('Tax').setValue(tax);
//e.record.set('Tax', tax);
//var quantity = e.record.data['Quantity'];
//if (quantity != null && quantity != 0) {
// var unitPrice = Div(notaxamount, quantity, 4); //(parseFloat(notaxamount).div(parseFloat(quantity))).toFixed(2);
// e.record.set('UnitPrice', unitPrice);
//}
} else if ((TaxUnitPrice == null || TaxUnitPrice == 0 || TaxUnitPrice == NaN) && (unitPrice != null)) {
var TaxUnitPrice = Mul(unitPrice, taxrateb, 4);
form.findField('TaxUnitPrice').setValue(TaxUnitPrice);
var amount = Mul(TaxUnitPrice, quantity); //(parseFloat(unitPrice).mul(quantity)).toFixed(2);
form.findField('Amount').setValue(amount);
if (amount > 0) {
var notaxamount = Div(amount, taxrateb);
form.findField('NoTaxAmount').setValue(notaxamount);
} else {
var notaxamount = Div(Math.abs(amount), taxrateb);
notaxamount = -notaxamount;
form.findField('NoTaxAmount').setValue(notaxamount);
}
var tax = Add(amount, -notaxamount); //parseFloat(notaxamount).mul(taxrate);
form.findField('Tax').setValue(tax);
}
var notaxamount = (parseFloat(unitPrice).mul(quantity)).toFixed(2);
form.findField('NoTaxAmount').setValue(notaxamount);
taxrate = parseFloat(taxrate) / 100;
var tax = parseFloat(notaxamount).mul(taxrate);
var amount = (parseFloat(notaxamount).add(parseFloat(tax))).toFixed(2);
form.findField('Amount').setValue(amount);
//if (taxrate != null) {
// var taxrateb = parseFloat(1 + parseFloat(taxrate / 100));
// var TaxUnitPrice = (parseFloat(unitPrice).mul(taxrateb)).toFixed(2);
// form.findField('TaxUnitPrice').setValue(TaxUnitPrice);
//}
//var notaxamount = (parseFloat(unitPrice).mul(quantity)).toFixed(2);
//form.findField('NoTaxAmount').setValue(notaxamount);
//taxrate = parseFloat(taxrate) / 100;
//var tax = parseFloat(notaxamount).mul(taxrate);
//var amount = (parseFloat(notaxamount).add(parseFloat(tax))).toFixed(2);
//form.findField('Amount').setValue(amount);
var FeeType = form.findField('FeeType').getValue();
var ExChangerate = form.findField('ExChangerate').getValue();
var BPROFIT = form.findField('BPROFIT').getValue();

@ -44,6 +44,11 @@ Ext.extend(Shipping.MsCodeOpTemplateEdit, Ext.Panel, {
}
if (combo.value == '海运进口') {
this.StoreField.load({ params: { optable: "OP_SEAI"} });
} if (combo.value == '空运出口') {
this.StoreField.load({ params: { optable: "OP_AIRE" } });
}
if (combo.value == '空运进口') {
this.StoreField.load({ params: { optable: "OP_AIRI" } });
}
if (combo.value == '综合业务') {
this.StoreField.load({ params: { optable: "OP_OTHER"} });

@ -78,12 +78,16 @@ Ext.extend(Shipping.MsCwVouchersGlChFeeIndex, Ext.Panel, {
//委托单位
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListController' }
});
this.storeCustCode.load({ params: { condition: ""} }); //ISCONTROLLER='1'
//this.storeCustCode.load({ params: { condition: ""} }); //ISCONTROLLER='1'
this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '委托单位',
store: this.storeCustCode,
queryMode: 'remote',
matchFieldWidth: false,
minChars: 1,
queryParam: 'CODENAME',
forceSelection: true,
name: 'CUSTOMERNAME',
valueField: 'CustName',
@ -105,12 +109,16 @@ Ext.extend(Shipping.MsCwVouchersGlChFeeIndex, Ext.Panel, {
//结算单位
this.storeSETTLEMENTNAME = Ext.create('DsExt.ux.RefTableStore', {
model: 'DsShipping.ux.CustomRefModel',
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' }
proxy: { url: '/CommMng/BasicDataRef/GetCustomRefListRm' }
});
this.storeSETTLEMENTNAME.load({ params: { condition: ""} }); //ISCONTROLLER='1'
// this.storeSETTLEMENTNAME.load({ params: { condition: ""} }); //ISCONTROLLER='1'
this.comboxSETTLEMENTNAME = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: '结算单位',
store: this.storeSETTLEMENTNAME,
queryMode: 'remote',
matchFieldWidth: false,
minChars: 1,
queryParam: 'CODENAME',
forceSelection: true,
name: 'SETTLEMENTNAME',
valueField: 'CustName',

@ -3644,7 +3644,7 @@ Ext.extend(Shipping.MsOpAireEdit, Ext.Panel, {
var BSNO = 'topaire' + NewGuid();
var field = basicForm.findField('BSNO');
var oldbsno = field.getValue();
this.LoadCopyData(oldbsno, this.copybill);
this.LoadCopyData(oldbsno, this.copybill, this.copyfee);
//var oldmasterno = basicForm.findField('MASTERNO').getValue();
//field.setValue(BSNO);
//if (oldbsno == oldmasterno) {

@ -3696,6 +3696,8 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
{ name: 'ORDEROTCR', type: 'number' },
{ name: 'ORDERTTLDR', type: 'number' },
{ name: 'ORDERTTLCR', type: 'number' },
{ name: 'INVOICERMBDR', type: 'number' },
{ name: 'INVOICEUSDDR', type: 'number' },
{ name: 'PRMBDR', type: 'number' },
{ name: 'PUSDDR', type: 'number' },
{ name: 'PRMBCR', type: 'number' },
@ -3923,6 +3925,20 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'INVOICEUSDDR',
header: Zi.LAN.INVOICEUSDDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'INVOICERMBDR',
header: Zi.LAN.INVOICERMBDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}
];
@ -6979,6 +6995,10 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
}
if (FEERANGE == '未收未付') {
sql = ' EXISTS (select 1 from v_op_gain_sum WHERE v_op_gain_sum.BSNO=B.BSNO AND v_op_gain_sum.STLTTLDR=0 AND v_op_gain_sum.STLTTLCR=0) '
} else if (FEERANGE == '已开票未结算') {
sql = ' (isnull(f.INVOICE,0)<>0 and F.SETTLEMENT=0 ) '
} else if (FEERANGE == '未开票未申请未结算') {
sql = ' (isnull(f.INVOICE,0)=0 and F.SETTLEMENT=0 and isnull(f.ORDERAMOUNT,0)=0) '
}
}
else {
@ -7003,6 +7023,10 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
sql = sql + ' and (isnull(f.INVOICE,0)=0 and F.AMOUNT<>F.SETTLEMENT ) '
} else if (FEERANGE == '已结算未开票') {
sql = sql + ' (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>0) '
} else if (FEERANGE == '已开票未结算') {
sql = sql + ' and (isnull(f.INVOICE,0)<>0 and F.SETTLEMENT=0 ) '
} else if (FEERANGE == '未开票未申请未结算') {
sql = sql + ' and (isnull(f.INVOICE,0)=0 and F.SETTLEMENT=0 and isnull(f.ORDERAMOUNT,0)=0) '
}
if (FEERANGE == '未收未付') {
sql = sql +' EXISTS (select 1 from v_op_gain_sum WHERE v_op_gain_sum.BSNO=B.BSNO AND v_op_gain_sum.STLTTLDR=0 AND v_op_gain_sum.STLTTLCR=0) '

@ -250,6 +250,8 @@ Zi.LAN.INVSTATUSNO = "仅不开票";
Zi.LAN.ISADVANCEDPAYYES = "仅垫付";
Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
Zi.LAN.ISVOUALLNO = "是否凭证";
Zi.LAN.INVOICEUSDDR = "已开票USD金额";
Zi.LAN.INVOICERMBDR = "已开票RMB金额";
//Zi.LAN. = "";

@ -250,6 +250,8 @@ Zi.LAN.INVSTATUSNO = "仅不开票";
Zi.LAN.ISADVANCEDPAYYES = "仅垫付";
Zi.LAN.ISADVANCEDPAYNO = "仅未垫付";
Zi.LAN.ISVOUALLNO = "是否凭证";
Zi.LAN.INVOICEUSDDR = "已开票USD金额";
Zi.LAN.INVOICERMBDR = "已开票RMB金额";
//Zi.LAN. = "";

@ -89,7 +89,7 @@ Ext.extend(Shipping.MsRptOpBsListIndex, Ext.Panel, {
{ name: 'OPDATE', type: 'string' },
{ name: 'CUSTOMDATE', type: 'string' },
{ name: 'ENTERP', type: 'string' },
{ name: 'TRADETEAM', type: 'string' },
{ name: 'TRADETERM', type: 'string' },
{ name: 'REMARK', type: 'string' },
{ name: 'PKGS', type: 'number' },
{ name: 'CBM', type: 'number' },
@ -281,7 +281,7 @@ Ext.extend(Shipping.MsRptOpBsListIndex, Ext.Panel, {
width: 80
}, {
sortable: true,
dataIndex: 'TRADETEAM',
dataIndex: 'TRADETERM',
text: '贸易条款',
width: 80
}, {

@ -37,6 +37,8 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
carrierlistsortdire: '',
forwarderlistsortfield: '',
forwarderlistsortdire: '',
forwarderlistsortfield: '',
forwarderlistsortdire: '',
lanelistsortfield: '',
lanelistsortdire: '',
portlistsortfield: '',
@ -3390,25 +3392,684 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
}
];
];
// this.girdcolumscust = this.initgirdcolumscust;
this.girdcolumscarrier = DsTruck.GetGridPanel(USERID, this.formname + 'carrier', this.initgirdcolumscarrier, 1);
this.gridListCarrier = new Ext.grid.GridPanel({
store: this.storeCarrierList,
enableHdMenu: false,
region: 'center',
loadMask: { msg: Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng },
trackMouseOver: true,
disableSelection: false,
columns: this.girdcolumscarrier,
viewConfig: {
enableTextSelection: true, //允许复制数据
autoFill: true
},
// paging bar on the bottom
bbar: Ext.create('Ext.PagingToolbar', {
store: this.storeCarrierList,
displayInfo: true,
displayMsg: Zi.LAN.displayMsg,
emptyMsg: Zi.LAN.emptyMsg
})
});
// this.gridListCust.reconfigure(this.storeCustList, this.girdcolumscust);
this.gridListCarrier.addListener('sortchange', function (ct, column, direction, eOpts) {
this.carrierlistsortfield = column.dataIndex;
this.carrierlistsortdire = direction;
}, this);
//#endregion
//#region 订舱代理
this.storeForwarderList = Ext.create('Ext.data.Store', {
pageSize: this.PageSize,
fields: [
{ name: 'FORWARDER', type: 'string' },
{ name: 'BSTYPE', type: 'string' },
{ name: 'BLCOUNT', type: 'number' },
{ name: 'NETWEIGHT', type: 'number' },
{ name: 'KGS', type: 'number' },
{ name: 'CBM', type: 'number' },
{ name: 'TEU', type: 'number' },
{ name: 'CNTR1', type: 'number' },
{ name: 'CNTR2', type: 'number' },
{ name: 'CNTR3', type: 'number' },
{ name: 'CNTR4', type: 'number' },
{ name: 'CNTR5', type: 'number' },
{ name: 'CNTR6', type: 'number' },
{ name: 'CNTR7', type: 'number' },
{ name: 'CNTR8', type: 'number' },
{ name: 'CNTR9', type: 'number' },
{ name: 'CNTR10', type: 'number' },
{ name: 'OTCNTR', type: 'number' },
{ name: 'RMBDR', type: 'number' },
{ name: 'RMBCR', type: 'number' },
{ name: 'USDDR', type: 'number' },
{ name: 'USDCR', type: 'number' },
{ name: 'OTDR', type: 'number' },
{ name: 'OTCR', type: 'number' },
{ name: 'TTLDR', type: 'number' },
{ name: 'TTLCR', type: 'number' },
{ name: 'TTLTAXDR', type: 'number' },
{ name: 'TTLTAXCR', type: 'number' },
{ name: 'TTLTAXPROFIT', type: 'number' },
{ name: 'RMBPROFIT', type: 'number' },
{ name: 'USDPROFIT', type: 'number' },
{ name: 'OTPROFIT', type: 'number' },
{ name: 'RMBPROFIT', type: 'number' },
{ name: 'USDPROFIT', type: 'number' },
{ name: 'OTPROFIT', type: 'number' },
{ name: 'TTLPROFIT', type: 'number' },
{ name: 'NOTAXRMBDR', type: 'number' },
{ name: 'NOTAXRMBCR', type: 'number' },
{ name: 'NOTAXUSDDR', type: 'number' },
{ name: 'NOTAXUSDCR', type: 'number' },
{ name: 'NOTAXOTDR', type: 'number' },
{ name: 'NOTAXOTCR', type: 'number' },
{ name: 'NOTAXTTLDR', type: 'number' },
{ name: 'NOTAXTTLCR', type: 'number' },
{ name: 'NOTAXRMBPROFIT', type: 'number' },
{ name: 'NOTAXUSDPROFIT', type: 'number' },
{ name: 'NOTAXOTPROFIT', type: 'number' },
{ name: 'NOTAXTTLPROFIT', type: 'number' },
{ name: 'NOACCTAXRMBDR', type: 'number' },
{ name: 'NOACCTAXRMBCR', type: 'number' },
{ name: 'NOACCTAXUSDDR', type: 'number' },
{ name: 'NOACCTAXUSDCR', type: 'number' },
{ name: 'NOACCTAXOTDR', type: 'number' },
{ name: 'NOACCTAXOTCR', type: 'number' },
{ name: 'NOACCTAXTTLDR', type: 'number' },
{ name: 'NOACCTAXTTLCR', type: 'number' },
{ name: 'NOACCTAXRMBPROFIT', type: 'number' },
{ name: 'NOACCTAXUSDPROFIT', type: 'number' },
{ name: 'NOACCTAXOTPROFIT', type: 'number' },
{ name: 'NOACCTAXTTLPROFIT', type: 'number' },
{ name: 'RMBNODR', type: 'number' },
{ name: 'USDNODR', type: 'number' },
{ name: 'OTNODR', type: 'number' },
{ name: 'TTLNODR', type: 'number' },
{ name: 'RMBNOCR', type: 'number' },
{ name: 'USDNOCR', type: 'number' },
{ name: 'OTNOCR', type: 'number' },
{ name: 'TTLNOCR', type: 'number' },
{ name: 'STLRMBDR', type: 'number' },
{ name: 'STLUSDDR', type: 'number' },
{ name: 'STLOTDR', type: 'number' },
{ name: 'STLTTLDR', type: 'number' },
{ name: 'STLRMBCR', type: 'number' },
{ name: 'STLUSDCR', type: 'number' },
{ name: 'STLOTCR', type: 'number' },
{ name: 'STLTTLCR', type: 'number' },
{ name: 'TTLPROFIT', type: 'number' },
{ name: 'PROFITRATE', type: 'number' },
{ name: 'NOTAXPROFITRATE', type: 'number' }
],
remoteSort: true,
proxy: {
type: 'ajax',
timeout: 120000,
url: '/MvcShipping/MsRptOpProfit/ForwarderListData',
reader: {
id: '',
root: 'data',
totalProperty: 'totalCount'
}
}
});
//定义Grid
this.initgirdcolumsforwarder = [{
sortable: true,
dataIndex: 'FORWARDER',
text: Zi.LAN.FORWARDER,
width: 80
}, {
sortable: true,
dataIndex: 'BLCOUNT',
text: Zi.LAN.BLCOUNT,
width: 80
},
{
sortable: true,
id: '',
dataIndex: 'CNTR1',
text: '箱型1',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR2',
text: '箱型2',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR3',
text: '箱型3',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR4',
text: '箱型4',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR5',
text: '箱型5',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR6',
text: '箱型6',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR7',
text: '箱型7',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR8',
text: '箱型8',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR9',
text: '箱型9',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'CNTR10',
text: '箱型10',
width: 60
},
{
sortable: true,
id: '',
dataIndex: 'OTCNTR',
text: Zi.LAN.OTCNTR,
width: 60
}, {
sortable: true,
dataIndex: 'TEU',
text: 'TEU',
width: 80
}, {
sortable: true,
dataIndex: 'KGS',
text: 'KGS',
width: 80
}, {
sortable: true,
dataIndex: 'CBM',
text: 'CBM',
width: 80
}, {
text: Zi.LAN.ALLIN,
dataIndex: 'ALLIN',
columns: [{
sortable: true,
dataIndex: 'RMBDR',
text: Zi.LAN.RMBDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'RMBCR',
text: Zi.LAN.RMBCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'RMBPROFIT',
text: Zi.LAN.RMBPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'USDDR',
text: Zi.LAN.USDDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'USDCR',
text: Zi.LAN.USDCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'USDPROFIT',
text: Zi.LAN.USDPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'OTDR',
text: Zi.LAN.OTDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'OTCR',
text: Zi.LAN.OTCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'OTPROFIT',
text: Zi.LAN.OTPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLDR',
text: Zi.LAN.TTLDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLCR',
text: Zi.LAN.TTLCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLPROFIT',
text: Zi.LAN.TTLPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'PROFITRATE',
text: Zi.LAN.PROFITRATE,
width: 80,
renderer: function (value, meta) {
if (value != 0) value = value + '%';
return value;
}
}, {
sortable: true,
dataIndex: 'TTLTAXDR',
text: Zi.LAN.TTLTAXDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLTAXCR',
text: Zi.LAN.TTLTAXCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLTAXPROFIT',
text: Zi.LAN.TTLTAXPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}]
}, {
text: Zi.LAN.ALLBALANCE,
dataIndex: 'ALLBALANCE',
columns: [{
sortable: true,
dataIndex: 'STLRMBDR',
text: Zi.LAN.STLRMBDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'RMBNODR',
text: Zi.LAN.RMBNODR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLUSDDR',
text: Zi.LAN.STLUSDDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'USDNODR',
text: Zi.LAN.USDNODR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLOTDR',
text: Zi.LAN.STLOTDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'OTNODR',
text: Zi.LAN.OTNODR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLTTLDR',
text: Zi.LAN.STLTTLDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLNODR',
text: Zi.LAN.TTLNODR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLRMBCR',
text: Zi.LAN.STLRMBCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'RMBNOCR',
text: Zi.LAN.RMBNOCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLUSDCR',
text: Zi.LAN.STLUSDCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'USDNOCR',
text: Zi.LAN.USDNOCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLOTCR',
text: Zi.LAN.STLOTCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'OTNOCR',
text: Zi.LAN.OTNOCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'STLTTLCR',
text: Zi.LAN.STLTTLCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}, {
sortable: true,
dataIndex: 'TTLNOCR',
text: Zi.LAN.TTLNOCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 80
}]
}, {
text: Zi.LAN.ALLNOTAX,
dataIndex: 'ALLNOTAX',
columns: [{
sortable: true,
dataIndex: 'NOTAXRMBDR',
text: Zi.LAN.NOTAXRMBDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXRMBCR',
text: Zi.LAN.NOTAXRMBCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXRMBPROFIT',
text: Zi.LAN.NOTAXRMBPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXUSDDR',
text: Zi.LAN.NOTAXUSDDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXUSDCR',
text: Zi.LAN.NOTAXUSDCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXUSDPROFIT',
text: Zi.LAN.NOTAXUSDPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXOTDR',
text: Zi.LAN.NOTAXOTDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXOTCR',
text: Zi.LAN.NOTAXOTCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXOTPROFIT',
text: Zi.LAN.NOTAXOTPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXTTLDR',
text: Zi.LAN.NOTAXTTLDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXTTLCR',
text: Zi.LAN.NOTAXTTLCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXTTLPROFIT',
text: Zi.LAN.NOTAXTTLPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOTAXPROFITRATE',
text: Zi.LAN.NOTAXPROFITRATE,
width: 80,
renderer: function (value, meta) {
if (value != 0) value = value + '%';
return value;
}
}]
}, {
text: Zi.LAN.ALLNOACCTAX,
dataIndex: 'ALLNOACCTAX',
columns: [{
sortable: true,
dataIndex: 'NOACCTAXRMBDR',
text: Zi.LAN.NOACCTAXRMBDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXRMBCR',
text: Zi.LAN.NOACCTAXRMBCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXRMBPROFIT',
text: Zi.LAN.NOACCTAXRMBPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXUSDDR',
text: Zi.LAN.NOACCTAXUSDDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXUSDCR',
text: Zi.LAN.NOACCTAXUSDCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXUSDPROFIT',
text: Zi.LAN.NOACCTAXUSDPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXOTDR',
text: Zi.LAN.NOACCTAXOTDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXOTCR',
text: Zi.LAN.NOACCTAXOTCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXOTPROFIT',
text: Zi.LAN.NOACCTAXOTPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXTTLDR',
text: Zi.LAN.NOACCTAXTTLDR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXTTLCR',
text: Zi.LAN.NOACCTAXTTLCR,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}, {
sortable: true,
dataIndex: 'NOACCTAXTTLPROFIT',
text: Zi.LAN.NOACCTAXTTLPROFIT,
renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 2, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '<SPAN style="COLOR: red">' + lsValue + '</SPAN>'; } } else { return value; } } catch (e) { return value; } return value; },
align: 'right',
width: 90
}]
}
];
// this.girdcolumscust = this.initgirdcolumscust;
this.girdcolumscarrier = DsTruck.GetGridPanel(USERID, this.formname + 'carrier', this.initgirdcolumscarrier, 1);
this.girdcolumsforwarder= DsTruck.GetGridPanel(USERID, this.formname + 'forwarder', this.initgirdcolumsforwarder, 1);
this.gridListCarrier = new Ext.grid.GridPanel({
store: this.storeCarrierList,
this.gridListForwarder = new Ext.grid.GridPanel({
store: this.storeForwarderList,
enableHdMenu: false,
region: 'center',
loadMask: { msg: Zi.LAN.ShuJuJiaZaiZhongQingShaoDeng },
trackMouseOver: true,
disableSelection: false,
columns: this.girdcolumscarrier,
columns: this.girdcolumsforwarder,
viewConfig: {
enableTextSelection: true, //允许复制数据
autoFill: true
},
// paging bar on the bottom
bbar: Ext.create('Ext.PagingToolbar', {
store: this.storeCarrierList,
store: this.storeForwarderList,
displayInfo: true,
displayMsg: Zi.LAN.displayMsg,
emptyMsg: Zi.LAN.emptyMsg
@ -3416,9 +4077,9 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
});
// this.gridListCust.reconfigure(this.storeCustList, this.girdcolumscust);
this.gridListCarrier.addListener('sortchange', function (ct, column, direction, eOpts) {
this.carrierlistsortfield = column.dataIndex;
this.carrierlistsortdire = direction;
this.gridListForwarder.addListener('sortchange', function (ct, column, direction, eOpts) {
this.forwarderlistsortfield = column.dataIndex;
this.forwarderlistsortdire = direction;
}, this);
//#endregion
@ -13026,7 +13687,14 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
frame: true,
items: [this.gridListCarrier]
});
this.panelForwarderSum = new Ext.Panel({
title: Zi.LAN.FORWARDER,
layout: "border",
region: 'center',
margin: '0 0',
frame: true,
items: [this.gridListForwarder]
});
this.panelDeptSum = new Ext.Panel({
title: Zi.LAN.SALEDEPT,
@ -13155,6 +13823,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.panelCustSum,
this.panelSaleSum,
this.panelCarrierSum,
this.panelForwarderSum,
this.panelOpSum,
this.panelOpDeptSum,
this.panelDeptSum,
@ -13197,6 +13866,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
_this.InitGrid(_this.girdcolumslane, _this.gridListLane, _this.storeLaneList);
_this.InitGrid(_this.gridlistsumcolumn, _this.gridListSum, _this.storeSumList);
_this.InitGrid(_this.girdcolumscarrier, _this.gridListCarrier, _this.storeCarrierList);
_this.InitGrid(_this.girdcolumsforwarder, _this.gridListForwarder, _this.storeForwarderList);
_this.InitGrid(_this.girdcolumsport, _this.gridListPort, _this.storePortList);
_this.InitGrid(_this.girdcolumsportload, _this.gridListPortLoad, _this.storePortLoadList);
_this.InitGrid(_this.girdcolumsforwarder, _this.gridListForwarder, _this.storeForwarderList);
@ -13234,6 +13904,11 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
if (this.CheckAmend.checked==true) amendstr='true';
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext, feecondition: _this.feesqlcontext, amendstr: amendstr });
}, this);
this.storeForwarderList.on('beforeload', function (store) {
var amendstr = 'false';
if (this.CheckAmend.checked == true) amendstr = 'true';
Ext.apply(store.proxy.extraParams, { condition: _this.sqlcontext, feecondition: _this.feesqlcontext, amendstr: amendstr });
}, this);
this.storeDeptList.on('beforeload', function (store) {
var amendstr='false';
if (this.CheckAmend.checked==true) amendstr='true';
@ -13422,6 +14097,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.storeList.pageSize = this.PageSize;
this.storeCustList.pageSize = this.PageSize;
this.storeCarrierList.pageSize = this.PageSize;
this.storeForwarderList.pageSize = this.PageSize;
this.storeSaleList.pageSize = this.PageSize;
this.storeDeptList.pageSize = this.PageSize;
this.storeOpList.pageSize = this.PageSize;
@ -13469,7 +14145,13 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
waitMsg: "正在查询数据...",
scope: this
});
} else if (this.tabpanel.getActiveTab() == this.panelSaleSum) {
} else if (this.tabpanel.getActiveTab() == this.panelForwarderSum) {
this.storeForwarderList.load({
params: { start: 0, limit: this.PageSize, condition: sql, feecondition: feesql, amendstr: amendstr },
waitMsg: "正在查询数据...",
scope: this
});
}else if (this.tabpanel.getActiveTab() == this.panelSaleSum) {
this.storeSaleList.load({
params: { start: 0, limit: this.PageSize, condition: sql, feecondition: feesql, amendstr: amendstr },
@ -13605,6 +14287,12 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
waitMsg: "正在查询数据...",
scope: this
});
} else if (this.tabpanel.getActiveTab() == this.panelForwarderSum) {
this.storeForwarderList.load({
params: { start: 0, limit: this.PageSize, condition: sql, feecondition: feesql, amendstr: amendstr },
waitMsg: "正在查询数据...",
scope: this
});
} else if (this.tabpanel.getActiveTab() == this.panelSaleSum) {
this.storeSaleList.load({
@ -13742,7 +14430,13 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
waitMsg: "正在查询数据...",
scope: this
});
} else if (newCard == this.panelSaleSum && this.storeSaleList.getCount() == 0) {
} else if (newCard == this.panelForwarderSum && this.storeForwarderList.getCount() == 0) {
this.storeForwarderList.load({
params: { start: 0, limit: this.PageSize, condition: sql, feecondition: feesql, amendstr: amendstr },
waitMsg: "正在查询数据...",
scope: this
});
}else if (newCard == this.panelSaleSum && this.storeSaleList.getCount() == 0) {
this.storeSaleList.load({
params: { start: 0, limit: this.PageSize, condition: sql, feecondition: feesql, amendstr: amendstr},
waitMsg: "正在查询数据...",
@ -14004,7 +14698,9 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
this.girdcolumsportload = DsTruck.SaveGridPanel(USERID, this.formname + 'portload', this.gridListPortLoad.columns, this.girdcolumsportload, 1, true);
}else if (this.tabpanel.getActiveTab() == this.panelCarrierSum) {
this.girdcolumscarrier = DsTruck.SaveGridPanel(USERID, this.formname + 'carrier', this.gridListCarrier.columns, this.girdcolumscarrier, 1, true);
} else if (this.tabpanel.getActiveTab() == this.panelDocSum) {
} else if (this.tabpanel.getActiveTab() == this.panelForwarderSum) {
this.girdcolumsforwarder = DsTruck.SaveGridPanel(USERID, this.formname + 'forwarder', this.gridListForwarder.columns, this.girdcolumsforwarder, 1, true);
}else if (this.tabpanel.getActiveTab() == this.panelDocSum) {
this.girdcolumsdoc = DsTruck.SaveGridPanel(USERID, this.formname + 'doc', this.gridListDoc.columns, this.girdcolumsdoc, 1, true);
} else if (this.tabpanel.getActiveTab() == this.panelCustServiceSum) {
this.girdcolumscustservice = DsTruck.SaveGridPanel(USERID, this.formname + 'custservice', this.gridListCustService.columns, this.girdcolumscustservice, 1, true);
@ -14056,7 +14752,10 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
}else if (this.tabpanel.getActiveTab() == this.panelCarrierSum) {
this.gridListCarrier.reconfigure(this.storeCarrierList, this.initgirdcolumscarrier);
this.girdcolumscarrier = DsTruck.SaveGridPanel(USERID, this.formname + 'carrier', this.gridListCarrier.columns, this.initgirdcolumscarrier, 1, true);
} else if (this.tabpanel.getActiveTab() == this.panelDocSum) {
} else if (this.tabpanel.getActiveTab() == this.panelForwarderSum) {
this.gridListForwarder.reconfigure(this.storeForwarderList, this.initgirdcolumsforwarder);
this.girdcolumsforwarder = DsTruck.SaveGridPanel(USERID, this.formname + 'forwarder', this.gridListForwarder.columns, this.initgirdcolumsforwarder, 1, true);
}else if (this.tabpanel.getActiveTab() == this.panelDocSum) {
this.gridListDoc.reconfigure(this.storeDocList, this.initgirdcolumsdoc);
this.girdcolumsdoc = DsTruck.SaveGridPanel(USERID, this.formname + 'doc', this.gridListDoc.columns, this.initgirdcolumsdoc, 1, true);
} else if (this.tabpanel.getActiveTab() == this.panelCustServiceSum) {
@ -14810,7 +15509,64 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
}
}
});
} else if (this.tabpanel.activeTab == this.panelDocSum) {
} else if (this.tabpanel.activeTab == this.panelForwarderSum) {
if (this.storeForwarderList.getCount() == 0) {
return;
}
var sortstr = ' B.FORWARDER';
if (this.forwarderlistsortfield != '' && this.forwarderlistsortdire != '') {
sortstr = this.forwarderlistsortfield + ' ' + this.forwarderlistsortdire;
}
Ext.Msg.wait('正在组织数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在组织数据...',
url: '/MvcShipping/MsRptOpProfit/ForwarderListData',
scope: this,
params: {
start: 0, limit: this.PageSize,
condition: _this.sqlcontext,
feecondition: _this.feesqlcontext,
amendstr: amendstr,
printstr: 'true',
sortstr: sortstr
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
var returnstr = jsonresult.Data;
var printType = 'MSRPTPROFITFORWARDER';
var sql1 = returnstr;
sql1 = sql1.replace(/\+/g, "@@@")
if (sql1 != '') {
GridExportBySql(sql1, this.formname + 'carrier', '利润报表-订舱代理.xls');
//var openSet = "height=1, width=400, toolbar=no, menubar=no,scrollbars=no, resizable=no,location=no, status=no,Top=" + (screen.height - 200) / 2 + ",Left=" + (screen.width - 400) / 2;
//var openType = "_blank";
//var openUrl = "../../Reports/RptExport.aspx?handle=DsRptExcel&formname=" + this.formname + 'carrier' + "&condition1=" + sql1;
//window.open(openUrl, openType, openSet);
}
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
}else if (this.tabpanel.activeTab == this.panelDocSum) {
if (this.storeDocList.getCount() == 0) {
return;
@ -15630,6 +16386,61 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
}
}
});
} else if (this.tabpanel.activeTab == this.panelForwarderSum) {
if (this.storeForwarderList.getCount() == 0) {
return;
}
var sortstr = ' B.FORWARDER';
if (this.forwarderlistsortfield != '' && this.forwarderlistsortdire != '') {
sortstr = this.forwarderlistsortfield + ' ' + this.forwarderlistsortdire;
}
Ext.Msg.wait('正在组织数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在组织数据...',
url: '/MvcShipping/MsRptOpProfit/ForwarderListData',
scope: this,
params: {
start: 0, limit: this.PageSize,
condition: _this.sqlcontext,
feecondition: _this.feesqlcontext,
amendstr: amendstr,
printstr: 'true',
sortstr: sortstr
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
var returnstr = jsonresult.Data;
var printType = 'MSRPTPROFITFORWARDER';
var sql1 = returnstr;
var sql2 = "";
var sql3 = "";
var sql4 = "";
var sql5 = "";
var sql6 = "";
PrintComm(printType, sql1, sql2, sql3, sql4, sql5, sql6);
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
} else if (this.tabpanel.activeTab == this.panelBltypeSum) {

@ -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 = "开船日期";

@ -388,7 +388,12 @@ Ext.extend(Shipping.MsRptOpProfitMonthIndex, Ext.Panel, {
dataIndex: 'CARRIER',
text: Zi.LAN.CARRIER,
width: 80
}, {
}, {
sortable: true,
dataIndex: 'FORWARDER',
text: Zi.LAN.FORWARDER,
width: 80
}, {
sortable: true,
dataIndex: 'LANE',
text: Zi.LAN.LANE,

@ -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 = "开船日期";

@ -582,7 +582,14 @@ Ext.extend(Shipping.MsUserAuthorityIndex, Ext.Panel, {
this.onPostCompanyVsDetailClick(button, event);
},
scope: this
}],
}, '-', {
text: '更新到此人所有[选择公司]',
tooltip: '更新到此人所有[选择公司]',
handler: function (button, event) {
this.onPostCompanyAllClick('VS');
},
scope: this
}],
columns: [{
sortable: true,
dataIndex: 'GID',
@ -677,7 +684,14 @@ Ext.extend(Shipping.MsUserAuthorityIndex, Ext.Panel, {
this.onPostCompanyOpDetailClick(button, event);
},
scope: this
}],
}, '-', {
text: '更新到此人所有[选择公司]',
tooltip: '更新到此人所有[选择公司]',
handler: function (button, event) {
this.onPostCompanyAllClick('OP');
},
scope: this
}],
columns: [{
sortable: true,
dataIndex: 'GID',
@ -1256,6 +1270,40 @@ Ext.extend(Shipping.MsUserAuthorityIndex, Ext.Panel, {
}
});
}, //end save
onPostCompanyAllClick: function (rtype) {
_this = this;
Ext.Msg.wait('正在保存数据, 请稍侯..');
Ext.Ajax.request({
waitMsg: '正在保存数据...',
url: '/MvcShipping/MsUserAuthority/SaveAuthorityCompanyVsAll_Tree',
scope: this,
params: {
USERID: _this.SELECTUSERID,
AUTHORITYID: _this.AUTHORITYID,
rtype: rtype
},
callback: function (options, success, response) {
if (success) {
Ext.MessageBox.hide();
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
this.storeListCompanyOp.reload();
this.storeListCompanyVs.reload();
} else {
Ext.Msg.show({ title: '错误', msg: jsonresult.Message, icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK });
}
} else {
Ext.Msg.show({
title: '请重试',
msg: '服务器响应出错',
icon: Ext.Msg.ERROR, buttons: Ext.Msg.OK
});
}
}
});
}, //end save
onPostOpVsDetailClick: function (button, event) {

@ -1244,11 +1244,14 @@ namespace DSWeb.SoftMng.Controllers
}
}
if (!string.IsNullOrEmpty(billerrorstr)) {
if (iserror) {
errorstr = errorstr + "<br>序号:" + CodeSgAuditRuleGroup.SGANO + "(" + billerrorstr + ")";
}
//if (!string.IsNullOrEmpty(billerrorstr)) {
errorstr = errorstr+ "<br>序号:" + CodeSgAuditRuleGroup.SGANO+"("+billerrorstr+")";
// errorstr = errorstr+ "<br>序号:" + CodeSgAuditRuleGroup.SGANO+"("+billerrorstr+")";
}
//}
}

@ -55,16 +55,16 @@ function showTopNotice()
{
layer.open({
type: 1,
title: Zi.LAN.GONGGAODETAIL,
title: Zi.GONGGAODETAIL,
skin:"layui-layer-molv",
area: ['80%', '80%'],
content: buildNoticeDetail(res[0]),
btn: [Zi.LAN.BUZAITISHI, Zi.LAN.CLOSE],
btn: [Zi.BUZAITISHI, Zi.CLOSE],
yes: function (index, layero)
{
CommonAjax.Post("/SoftMng/Home/SetNoticeUserRelation", { id: res[0].GID}, function (res)
{
layer.msg(res ? Zi.LAN.SHEZHICHENGGONG : Zi.LAN.SHEZHISHIBAI);
layer.msg(res ? Zi.SHEZHICHENGGONG : Zi.SHEZHISHIBAI);
layer.close(index);
});
}
@ -78,7 +78,7 @@ function showNotice(obj) {
{
layer.open({
type: 1,
title: Zi.LAN.GONGGAODETAIL,
title: Zi.GONGGAODETAIL,
area: ['80%', '80%'],
content: buildNoticeDetail(res)
});
@ -88,8 +88,8 @@ function showNotice(obj) {
//构造公告详情
function buildNoticeDetail(item) {
return "<h3 style='text-align:center;margin-bottom:0;'>" + item.Title + "</h3><div style='text-align: right;color:#969696'>"
+ "<span class='mr-2'>" + Zi.LAN.GONGGAOSHIJIAN+ CommonJson.GetDate(item.CreateTime).format('yyyy-mm-dd hh:ii') + "</span>"
+ "<span class='mr-2'>" + Zi.LAN.GONGGAOREN+ item.CreateUser + "</span>"
+ "<span class='mr-2'>" + Zi.GONGGAOSHIJIAN+ CommonJson.GetDate(item.CreateTime).format('yyyy-mm-dd hh:ii') + "</span>"
+ "<span class='mr-2'>" + Zi.GONGGAOREN+ item.CreateUser + "</span>"
+ "</div > <div class='ibox-content'>".concat(decodeURIComponent(item.Content)).concat("</div>");
}
//获取预警
@ -97,12 +97,12 @@ function getpreWarning() {
//默认列配置项
var columnsDefault = [{
field: 'BSTYPE',
title: Zi.LAN.BSTYPE,
title: Zi.BSTYPE,
width: 160
}
, {
field: 'BSMSG',
title: Zi.LAN.BSMSG,
title: Zi.BSMSG,
width: 290
}];
$("#preWarning").bootstrapTable({

@ -1,15 +1,15 @@
// 官方推荐的多国语言方法 兼容性不好
// 自定义多国语言动态加载方法
var Zi = window.NameSpace || {};
Zi.LAN.GONGGAODETAIL = "E公告详情";
Zi.LAN.CLOSE = "E关闭";
Zi.LAN.BUZAITISHI = "E不再提示";
Zi.LAN.SHEZHICHENGGONG = "E设置成功"
Zi.LAN.SHEZHISHIBAI = "E设置失败";
Zi.LAN.GONGGAOSHIJIAN = "E公告时间";
Zi.LAN.GONGGAOREN = "E公告人";
Zi.LAN.BSTYPE = "E单据类型";
Zi.LAN.BSMSG = "E消息主题";
Zi.GONGGAODETAIL = "E公告详情";
Zi.CLOSE = "E关闭";
Zi.BUZAITISHI = "E不再提示";
Zi.SHEZHICHENGGONG = "E设置成功"
Zi.SHEZHISHIBAI = "E设置失败";
Zi.GONGGAOSHIJIAN = "E公告时间";
Zi.GONGGAOREN = "E公告人";
Zi.BSTYPE = "E单据类型";
Zi.BSMSG = "E消息主题";

@ -2,20 +2,20 @@
// 官方推荐的多国语言方法 兼容性不好
// 自定义多国语言动态加载方法
var Zi = window.NameSpace || {};
Zi.GONGGAODETAIL = "公告详情";
Zi.CLOSE = "关闭";
Zi.BUZAITISHI = "不再提示";
Zi.SHEZHICHENGGONG = "设置成功"
Zi.SHEZHISHIBAI = "设置失败";
Zi.GONGGAOSHIJIAN = "公告时间:";
Zi.GONGGAOREN = "公告人:";
Zi.BSTYPE = "单据类型";
Zi.BSMSG = "消息主题";
Zi.LAN.GONGGAODETAIL = "公告详情";
Zi.LAN.CLOSE = "关闭";
Zi.LAN.BUZAITISHI = "不再提示";
Zi.LAN.SHEZHICHENGGONG = "设置成功"
Zi.LAN.SHEZHISHIBAI = "设置失败";
Zi.LAN.GONGGAOSHIJIAN = "公告时间:";
Zi.LAN.GONGGAOREN = "公告人:";
Zi.LAN.BSTYPE = "单据类型";
Zi.LAN.BSMSG = "消息主题";
//Zi.LAN. = "";

@ -519,9 +519,9 @@ Ext.extend(Shipping.SingleIndex, Ext.Panel, {
return '';
}
var sql = " s.COMPOP<>'" + SHOWNAME + "' ";
// var sql = " s.COMPOP<>'" + SHOWNAME + "' ";
// var sql = " 1=1 ";
var sql = " 1=1 ";
var BillState = form.findField('BillState').getValue();
sql = sql + getAndConSql(sql, BillState, " d.BillState='" + BillState + "'");

@ -638,7 +638,7 @@ namespace DSWeb.TruckMng.DAL.MsOpTruckBulkDAL
db.AddInParameter(cmdInsertFee, "@ACCTAXRATE", DbType.Decimal, 0);
db.AddInParameter(cmdInsertFee, "@LINENUM", DbType.Int16, 1);
db.AddInParameter(cmdInsertFee, "@TAXUNITPRICE", DbType.Decimal, headData.UNITPRICE);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, userid);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, OP.GID);
db.AddInParameter(cmdInsertFee, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString());
db.AddInParameter(cmdInsertFee, "@WMSOUTBSNO", DbType.String, "");
@ -802,7 +802,7 @@ namespace DSWeb.TruckMng.DAL.MsOpTruckBulkDAL
db.AddInParameter(cmdInsertFee, "@ACCTAXRATE", DbType.Decimal, 0);
db.AddInParameter(cmdInsertFee, "@LINENUM", DbType.Int16, 1);
db.AddInParameter(cmdInsertFee, "@TAXUNITPRICE", DbType.Decimal, headData.FREIGHT);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, userid);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, OP.GID);
db.AddInParameter(cmdInsertFee, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString());
db.AddInParameter(cmdInsertFee, "@WMSOUTBSNO", DbType.String, "");

@ -14,6 +14,7 @@ using DSWeb.DataAccess;
using DSWeb.TruckMng.DAL.MsOpTruckBulkDAL;
using DSWeb.Areas.CommMng.DAL;
using DSWeb.TruckMng.DAL.MsCustTruckFeeTemplate;
using DSWeb.Areas.SysMng.DAL.SysUser;
namespace DSWeb.TruckMng.DAL.MsOpTruckBulkPcDAL
{
@ -1446,7 +1447,7 @@ namespace DSWeb.TruckMng.DAL.MsOpTruckBulkPcDAL
public static DBResult CreateFeeBl(MsOpTruckBulkPc headData, string userid)
{
var result = new DBResult();
var OP = SysUserDAL.GetData(" SHOWNAME='" + headData.OP + "'");
Database db = DatabaseFactory.CreateDatabase();
using (var conn = db.CreateConnection())
{
@ -1513,7 +1514,7 @@ namespace DSWeb.TruckMng.DAL.MsOpTruckBulkPcDAL
db.AddInParameter(cmdInsertFee, "@REASON", DbType.String, "");
db.AddInParameter(cmdInsertFee, "@REMARK", DbType.String, "");
db.AddInParameter(cmdInsertFee, "@COMMISSIONRATE", DbType.Decimal, 0);
db.AddInParameter(cmdInsertFee, "@ENTEROPERATOR", DbType.String, userid);
db.AddInParameter(cmdInsertFee, "@ENTEROPERATOR", DbType.String, OP.GID);
db.AddInParameter(cmdInsertFee, "@ENTERDATE", DbType.String, DateTime.Now.ToString());
db.AddInParameter(cmdInsertFee, "@ISOPEN", DbType.Boolean, false);
db.AddInParameter(cmdInsertFee, "@ISADVANCEDPAY", DbType.Boolean, false);
@ -1526,7 +1527,7 @@ namespace DSWeb.TruckMng.DAL.MsOpTruckBulkPcDAL
db.AddInParameter(cmdInsertFee, "@ACCTAXRATE", DbType.Decimal, 0);
db.AddInParameter(cmdInsertFee, "@LINENUM", DbType.Int16, 1);
db.AddInParameter(cmdInsertFee, "@TAXUNITPRICE", DbType.Decimal, headData.UNITPRICE);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, userid);
db.AddInParameter(cmdInsertFee, "@MODIFIEDUSER", DbType.String, OP.GID);
db.AddInParameter(cmdInsertFee, "@MODIFIEDTIME", DbType.String, DateTime.Now.ToString());
db.AddInParameter(cmdInsertFee, "@WMSOUTBSNO", DbType.String, "");

Loading…
Cancel
Save