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

1

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent 6539c9037b
commit 627a89cb8d
9 changed files with 116 additions and 16 deletions
Show Stats Download Patch File Download Diff File

3
DSWeb/Areas/Account/Controllers/Chfee_InvoicehexiaoController.cs
Unescape Escape View File

@ -234,7 +234,8 @@ namespace DSWeb.Areas.Account.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose2) };
}
headData.MODIFIEDUSER = Convert.ToString(Session["USERID"]);
headData.MODIFIEDTIME = Convert.ToString(Session["SHOWNAME"]);
var BILLNO = headData.BILLNO;
string YuanBiJinE = "";

27
DSWeb/Areas/Account/DAL/Chfee_Invoicehexiao/Chfee_InvoicehexiaoDAL.cs
Unescape Escape View File

@ -64,7 +64,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97008 and EnumValueID=ch_fee_invoicehexiao.INVOICECATEGORY) as INVOICECATEGORYREF");
strSql.Append(",ADDRTEL,BANK,OP,OPDATE,INVAMOUNT,TAXRATE,TAX,BALBILLNO,ISAPP,dbo.GetPayNoByInvHxNo(BILLNO) as PAYBILLNO,dbo.GetStlNoByInvHxNo(BILLNO) as STLBILLNO,YuanBiJinE ");
strSql.Append(",SALECORPID,(select [NAME] from [company] where GID=ch_fee_invoicehexiao.SALECORPID) as SALECORP,SUBMITOP");
strSql.Append(",AUDITUSER,AUDITTIME,(select ShowName from [user] where GID=cm.AUDITUSER) as AUDITUSERREF");
strSql.Append(",MODIFIEDUSER,MODIFIEDTIME,(select ShowName from [user] where GID=cm.MODIFIEDUSER) as MODIFIEDUSERREF");
strSql.Append(" FROM ch_fee_invoicehexiao where 1=1 ");
if (!string.IsNullOrEmpty(strCondition))
@ -128,6 +130,8 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97008 and EnumValueID=i.INVOICECATEGORY) as INVOICECATEGORYREF");
strSql.Append(",i.ADDRTEL,i.BANK,i.OP,i.OPDATE,i.INVAMOUNT,i.TAXRATE,i.TAX,i.BALBILLNO,i.YuanBiJinE,i.ISAPP,dbo.GetPayNoByInvHxNo(i.BILLNO) as PAYBILLNO,dbo.GetStlNoByInvHxNo(BILLNO) as STLBILLNO ");
strSql.Append(",i.SALECORPID,(select [NAME] from [company] where GID=i.SALECORPID) as SALECORP,i.SUBMITOP");
strSql.Append(",AUDITUSER,AUDITTIME,(select ShowName from [user] where GID=cm.AUDITUSER) as AUDITUSERREF");
strSql.Append(",MODIFIEDUSER,MODIFIEDTIME,(select ShowName from [user] where GID=cm.MODIFIEDUSER) as MODIFIEDUSERREF");
strSql.Append(" FROM ch_fee_invoicehexiao i left join workflow_using wu on wu.bsno=i.billno where 1=1 ");
if (isaudit == "1")
@ -207,6 +211,13 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
data.SALECORPID = Convert.ToString(reader["SALECORPID"]);//分公司代码
data.SALECORP = Convert.ToString(reader["SALECORP"]);//分公司代码
data.SUBMITOP = Convert.ToString(reader["SUBMITOP"]);//分公司代码
if (reader["AUDITTIME"] != DBNull.Value)
data.AUDITTIME = Convert.ToDateTime(reader["AUDITTIME"]).ToString("yyyy-MM-dd hh:mm:ss");
data.AUDITUSER = Convert.ToString(reader["AUDITUSERREF"]);
if (reader["MODIFIEDUSER"] != DBNull.Value)
data.MODIFIEDUSER = Convert.ToDateTime(reader["MODIFIEDUSER"]).ToString("yyyy-MM-dd hh:mm:ss");
data.MODIFIEDUSERREF = Convert.ToString(reader["MODIFIEDUSER"]);
#endregion
headList.Add(data);
}
@ -1181,8 +1192,10 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
cmdUpdate.Parameters.Clear();
db.AddInParameter(cmdUpdate, "@GID", DbType.String, enumValue.CH_ID);
db.AddInParameter(cmdUpdate, "@ORDERINVOICE", DbType.Decimal, enumValue.BalAmount);
db.ExecuteNonQuery(cmdUpdate, tran);
db.AddInParameter(cmdUpdate, "@ORDERINVOICE", DbType.Decimal, enumValue.StlAmount);
//db.AddInParameter(cmdUpdate, "@ORDERINVOICE", DbType.Decimal, enumValue.StlAmount);
//db.AddInParameter(cmdUpdate, "@ORDERINVOICE", DbType.Decimal, enumValue.StlAmount);
db.ExecuteNonQuery(cmdUpdate, tran);
}
}
@ -1387,7 +1400,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
if (WorkResult.islast == true)
{
cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过',SUBMITOP='"+username+"' where BILLNO=@BILLNO");
cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过',SUBMITOP='"+username+ "',AUDITUSER='" + USERID + "',AUDITTIME=GETDATE() where BILLNO=@BILLNO");
var bodylist = GetBodyList("BILLNO='" + bill + "'");
if (bodylist != null)
{
@ -1506,7 +1519,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
if (WorkResult.islast == true)
{
cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过',SUBMITOP='" + username + "' where BILLNO=@BILLNO");
cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过',SUBMITOP='" + username + "',AUDITUSER='"+USERID+ "',AUDITTIME=GETDATE() where BILLNO=@BILLNO");
var bodylist = GetBodyList("BILLNO='" + bill + "'");
if (bodylist!=null)
@ -1703,7 +1716,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
if (boday != null)
{
var cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过' where BILLNO=@BILLNO");
var cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='审核通过',AUDITUSER='" + USERID + "',AUDITTIME=GETDATE() where BILLNO=@BILLNO");
foreach (var enumValue in boday)
{
@ -1781,7 +1794,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
if (boday != null)
{
var cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='驳回提交' where BILLNO=@BILLNO");
var cmdupdate = db.GetSqlStringCommand("update ch_fee_invoicehexiao set BILLSTATUS='驳回提交',AUDITUSER='',AUDITTIME=NULL where BILLNO=@BILLNO");
foreach (var enumValue in boday)
{

18
DSWeb/Areas/Account/DAL/Chfee_invoice/Chfee_InvoiceDAL.cs
Unescape Escape View File

@ -1006,11 +1006,27 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
strSql.Append(" FROM CH_FEE f ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" where f.ISINVOICE<>1 and ISNULL(f.INVLINKGID,'')='' ");
var InvAppFeeStatus = MsSysParamSetDAL.GetData("PARAMNAME='InvAppFeeStatus'");
if (InvAppFeeStatus.PARAMVALUE != "2")
strSql.Append(" and f.FEESTATUS IN (0,8,9) ");
else
strSql.Append(" and f.FEESTATUS IN (2,0,8,9) ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" and " + strCondition);
}
var INVISNOTSTL = MsSysParamSetDAL.GetData("PARAMNAME='INVISNOTSTL'");
if (INVISNOTSTL.PARAMVALUE == "1")
{
strSql.Append(" and ISNULL(f.AMOUNT,0)<>ISNULL(f.SETTLEMENT,0) ");
}
var INVISNOTRECPAY = MsSysParamSetDAL.GetData("PARAMNAME='INVISNOTRECPAY'");
if (INVISNOTRECPAY.PARAMVALUE == "1")
{
strSql.Append(" and ISNULL(f.AMOUNT,0)<>ISNULL(f.ORDERAMOUNT,0) ");
}
strSql.Append("GROUP BY b.BSNO,f.CUSTOMERNAME) AS T ");
int cnt = 0;
Database db = DatabaseFactory.CreateDatabase();

16
DSWeb/Areas/Account/DAL/Chfee_invoice_HangXin/Chfee_InvoiceDAL.cs
Unescape Escape View File

@ -1065,11 +1065,25 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
strSql.Append(" FROM CH_FEE f ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append(" where f.ISINVOICE<>1 and ISNULL(f.INVLINKGID,'')='' ");
var InvAppFeeStatus = MsSysParamSetDAL.GetData("PARAMNAME='InvAppFeeStatus'");
if (InvAppFeeStatus.PARAMVALUE != "2")
strSql.Append(" and f.FEESTATUS IN (0,8,9) ");
else
strSql.Append(" and f.FEESTATUS IN (2,0,8,9) ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" and " + strCondition);
}
var INVISNOTSTL = MsSysParamSetDAL.GetData("PARAMNAME='INVISNOTSTL'");
if (INVISNOTSTL.PARAMVALUE == "1")
{
strSql.Append(" and ISNULL(f.AMOUNT,0)<>ISNULL(f.SETTLEMENT,0) ");
}
var INVISNOTRECPAY = MsSysParamSetDAL.GetData("PARAMNAME='INVISNOTRECPAY'");
if (INVISNOTRECPAY.PARAMVALUE == "1")
{
strSql.Append(" and ISNULL(f.AMOUNT,0)<>ISNULL(f.ORDERAMOUNT,0) ");
}
strSql.Append("GROUP BY b.BSNO,f.CUSTOMERNAME) AS T ");
int cnt = 0;
Database db = DatabaseFactory.CreateDatabase();

11
DSWeb/Areas/Account/Models/Chfee_Invoicehexiao/Chfee_Invoicehexiao.cs
Unescape Escape View File

@ -227,6 +227,17 @@ namespace DSWeb.Areas.Account.Models.Chfee_Invoicehexiao
set { _salecorp = value; }
}
public string SUBMITOP { get; set; }
public string AUDITUSER { get; set; }
public string AUDITTIME { get; set; }
public string AUDITUSERREF { get; set; }
[ModelDB]
public string MODIFIEDUSER { get; set; }
[ModelDB]
public string MODIFIEDTIME { get; set; }
public string MODIFIEDUSERREF { get; set; }
#endregion
}

25
DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoIndex.js
Unescape Escape View File

@ -243,6 +243,31 @@ Ext.extend(Shipping.MsChInvoicehexiaoIndex, Ext.Panel, {
dataIndex: 'SALECORP',
header: '所属分部',
width: 100
}, {
sortable: true,
dataIndex: 'OPDATE',
header: '录入日期',
width: 100
}, {
sortable: true,
dataIndex: 'MODIFIEDUSERREF',
header: '修改人',
width: 100
}, {
sortable: true,
dataIndex: 'MODIFIEDTIME',
header: '修改时间',
width: 100
}, {
sortable: true,
dataIndex: 'AUDITUSER',
header: '审核人',
width: 100
}, {
sortable: true,
dataIndex: 'AUDITTIME',
header: '审核时间',
width: 100
}
];

4
DSWeb/Areas/Account/Viewsjs/Chfee_Invoicehexiao/ChInvoicehexiaoModel.js
Unescape Escape View File

@ -26,6 +26,10 @@
{ name: 'SALECORPID', type: 'string' },
{ name: 'SALECORP', type: 'string' },
{ name: 'SUBMITOP', type: 'string' },
{ name: 'AUDITUSER', type: 'string' },
{ name: 'AUDITTIME', type: 'string' },
{ name: 'MODIFIEDUSERREF', type: 'string' },
{ name: 'MODIFIEDTIME', type: 'string' },
{ name: 'ISAPP', type: 'string' },
{ name: 'REMARKS', type: 'string' },
{ name: 'YuanBiJinE', type: 'string' }

24
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitPerCent/Zi_en-us.js
Unescape Escape View File

@ -5,14 +5,23 @@
Ext.ns("Zi.LAN");
//#region MsOpSeae
Zi.LAN.MONTHNAME = "月份";
Zi.LAN.OBJNAME = "分析对象";
Zi.LAN.MONTHNUM = "数据";
Zi.LAN.MONTHNAME2 = "年度月份";
Zi.LAN.TITLE = "业务走势图表分析";
Zi.LAN.TITLE = "业务比例图表分析";
Zi.LAN.PS_OPLB = "业务类型";
Zi.LAN.PS_BSTYPE = "运输类型";
Zi.LAN.PS_SALE = "揽货人";
Zi.LAN.PS_OP = "操作";
Zi.LAN.PS_CUSTSERVICE = "客服";
Zi.LAN.PS_FRCUSTSERVICE = "海外客服";
Zi.LAN.PS_DOC = "单证";
Zi.LAN.DESTINATION = "目的地";
Zi.LAN.STLNAME = "结算方式";
Zi.LAN.DCCUST = "收付对象";
Zi.LAN.ENTERP = "经营单位";
Zi.LAN.rdOBJCHART = "图形类别";
Zi.LAN.rdOBJCHARTD1 = "柱状图";
Zi.LAN.rdOBJCHARTD2 = "饼形图";
Zi.LAN.PS_CUSTOMERNAME = "委托单位";
Zi.LAN.BSSOURCE = "业务来源";
Zi.LAN.BSSOURCEDETAIL = "来源明细";
@ -29,10 +38,15 @@ Zi.LAN.rdoArrearage = "欠费";
Zi.LAN.rdoKgs = "毛重";
Zi.LAN.rdoNetW = "计费吨";
Zi.LAN.rdoBill = "票数";
Zi.LAN.rdoOpXs = "操作系数";
Zi.LAN.DR = "应收";
Zi.LAN.CR = "应付";
Zi.LAN.VESSEL = "船名";
Zi.LAN.VOYNO = "航次";
Zi.LAN.PS_EXPDATEBGN = "从业务日期";
Zi.LAN.PS_EXPDATEEND = "到业务日期";
Zi.LAN.PS_TOP = "统计前";
Zi.LAN.PS_ETDDATEBGN = "从ETD";
Zi.LAN.PS_ETDDATEEND = "到ETD";
Zi.LAN.PS_ACCDATEBGN = "从会计期间";
Zi.LAN.PS_ACCDATEEND = "到会计期间";
Zi.LAN.SaveQuery = "记忆查询条件";

4
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcWFSDEdit.js
Unescape Escape View File

@ -1474,7 +1474,9 @@ Ext.extend(DsTruck.MsPcWFSDEdit, Ext.Panel, {
}
});
this.panelFee.storeChFeeGain.load({ params: { bsno: bsno, optype: "tMsWlPcHead" } });
this.storeCtnList.load({ params: { condition: "LE_ID='" + bsno+ "'" } });
this.panelFee.storeBodyList_GuDingFeeWeiHu.load();
this.storeCtnList.load({ params: { condition: "LE_ID='" + bsno + "'" } });
//this.storeBodyFix.load({ params: { billno: bsno } });
}, // end LoadDate

Write Preview
Loading…
Cancel
Save