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

Merge branch 'dev' of http://60.209.125.238:13080/dengyu/DS7 into dev

Browse Source
DS7_JinGang
ddlucky 2 years ago
parent 278896a6ee 5c3e1931fc
commit 0dee2a2575
10 changed files with 182 additions and 18 deletions
Show Stats Download Patch File Download Diff File

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

@ -2152,9 +2152,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoicehexiao
data.PAYAPPID = Convert.ToString(reader["PAYAPPID"]);
data.CHEQUENUMREMARK = Convert.ToString(reader["CHEQUENUMREMARK"]);
data.INVNO = Convert.ToString(reader["INVNO"]);
if (reader["INVDATE"] != DBNull.Value)
data.INVDATE = Convert.ToDateTime(reader["INVDATE"]).ToString("yyyy-MM-dd");
data.CUSTACCOUNTGID = Convert.ToString(reader["CUSTACCOUNTGID"]);
if (reader["INVDATE"] != DBNull.Value && reader["INVDATE"].ToString() != "")
data.INVDATE = Convert.ToDateTime(reader["INVDATE"]).ToString("yyyy-MM-dd");
data.CUSTACCOUNTGID = Convert.ToString(reader["CUSTACCOUNTGID"]);
data.CUSTBANKNAME = Convert.ToString(reader["CUSTBANKNAME"]);
data.CUSTACCOUNT = Convert.ToString(reader["CUSTACCOUNT"]);

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

@ -303,7 +303,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Payapplication
data.PAYAPPID = Convert.ToString(reader["PAYAPPID"]);
data.CHEQUENUMREMARK = Convert.ToString(reader["CHEQUENUMREMARK"]);
data.INVNO = Convert.ToString(reader["INVNO"]);
if (reader["INVDATE"] != DBNull.Value)
if (reader["INVDATE"] != DBNull.Value&& reader["INVDATE"].ToString() != "")
data.INVDATE = Convert.ToDateTime(reader["INVDATE"]).ToString("yyyy-MM-dd");
data.INVOICEAMOUNT = Convert.ToString(reader["INVOICEAMOUNT"]);
//if (reader["INVDATE"] != DBNull.Value)

15
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementIndex.js
Unescape Escape View File

@ -347,6 +347,21 @@ Ext.extend(Shipping.MsChPaysettlementIndex, Ext.Panel, {
dataIndex: 'BILLDATE',
header: Zi.LAN.BILLDATE,
width: 100
}, {
sortable: true,
dataIndex: 'INVOICENO',
header: Zi.LAN.InvoiceNumber,
width: 160
}, {
sortable: true,
dataIndex: 'INVOICEDATE',
header: Zi.LAN.INVOICEDATE,
width: 160
}, {
sortable: true,
dataIndex: 'INVOICEAMOUNT',
header: Zi.LAN.INVOICEAMOUNT,
width: 160
}];
this.girdcolums = this.initgirdcolums;

1
DSWeb/Areas/MvcShipping/Controllers/MsChFeeAutoDuiController.cs
Unescape Escape View File

@ -663,6 +663,7 @@ namespace DSWeb.MvcShipping.Controllers
headShen.ENTERTIME = DateTime.Now;
headShen.DbOperationType = DbOperationType.DbotIns;
headShen.PAYABLETIME = DateTime.Now.ToString("yyyy-MM-dd");
headShen.INVDATE = null;
var billnoset = MsSysBillNoSetDAL.GetData("OPLBNAME='付费申请'", Convert.ToString(Session["COMPANYID"]));
if (billnoset.BILLTYPE != "")
headShen.BILLNO = MsSysBillNoSetDAL.GetBillNo(billnoset, headShen.PAYABLETIME.ToString().Trim(), headShen.APPLYTIME.ToString());

2
DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs
Unescape Escape View File

@ -328,7 +328,7 @@ namespace DSWeb.MvcShipping.Controllers
strSql.Append(" FROM CH_FEE F WITH (NOLOCK) ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
strSql.Append("LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN v_op_gain_sum G ON (G.BSNO=B.BSNO) ");
strSql.Append(" LEFT JOIN info_client C WITH (NOLOCK) ON (C.SHORTNAME=F.CUSTOMERNAME) ");
strSql.Append(" LEFT JOIN V_MAX_SETTLEMENTTIME S ON (S.CUSTOMERNAME=F.CUSTOMERNAME AND S.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(condition))

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

@ -2850,7 +2850,10 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
var cbmdata = new MsFeeUnit();
cbmdata.SUNIT = "C-尺码";
cbmdata.UNIT = "尺码";
cbmdata.QUANTITY = CBM;
if (CBM<1)
cbmdata.QUANTITY =1;
else
cbmdata.QUANTITY = CBM;
bodyList.Add(cbmdata);
var pkgsdata = new MsFeeUnit();
pkgsdata.SUNIT = "J-件数";

70
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeDrCrGridLR.js
Unescape Escape View File

@ -4574,6 +4574,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (isEmptyObject(recchange)) memberyf.commit();
};
var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
DRSELECTSTR.setText('', false);
} else {
var rec = selections[0];
var custname = rec.data.CustomerName;
@ -4585,6 +4587,39 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
DESCRIPTION: custname
});
_thisfee.storeCustomerNameRefDr.add(recordCustCode);
var storeSelect = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsSelectFee',
proxy: { url: '/MvcShipping/MsCompanys/GetNoPicDataList' }
});
for (var i = 0; i < selections.length; i++) {
var memberyf = selections[i];
var records = DsStoreQueryBy(storeSelect, 'CURR', memberyf.data.Currency)
if (records.getCount() > 0) {
var rec = records.getAt(0);
var AMOUNT = Add(rec.data.AMOUNT, memberyf.data.Amount);
rec.set('AMOUNT', AMOUNT);
} else {
var rec = Ext.create('MsSelectFee', {
CURR: memberyf.data.Currency,
AMOUNT: memberyf.data.Amount
});
storeSelect.add(rec);
}
}
if (storeSelect.getCount() > 0) {
str = '选中费用合计[';
for (i = 0; i < storeSelect.getCount(); i += 1) {
var memberyf = storeSelect.getAt(i);
str = str + memberyf.data.CURR + ':' + memberyf.data.AMOUNT + ';';
}
str = str + ']';
var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
DRSELECTSTR.setText(str, false);
} else {
var DRSELECTSTR = Ext.getCmp('DRSELECTSTR');
DRSELECTSTR.setText('', false);
}
}
}
});
@ -4598,6 +4633,8 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
if (isEmptyObject(recchange)) memberyf.commit();
};
var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
DRSELECTSTR.setText('', false);
} else {
var rec = selections[0];
var custname = rec.data.CustomerName;
@ -4609,6 +4646,39 @@ Ext.extend(Shipping.FeeEditGrid, Ext.Panel, {
DESCRIPTION: custname
});
_thisfee.storeCustomerNameRefCr.add(recordCustCode);
var storeSelect = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsSelectFee',
proxy: { url: '/MvcShipping/MsCompanys/GetNoPicDataList' }
});
for (var i = 0; i < selections.length; i++) {
var memberyf = selections[i];
var records = DsStoreQueryBy(storeSelect, 'CURR', memberyf.data.Currency)
if (records.getCount() > 0) {
var rec = records.getAt(0);
var AMOUNT = Add(rec.data.AMOUNT, memberyf.data.Amount);
rec.set('AMOUNT', AMOUNT);
} else {
var rec = Ext.create('MsSelectFee', {
CURR: memberyf.data.Currency,
AMOUNT: memberyf.data.Amount
});
storeSelect.add(rec);
}
}
if (storeSelect.getCount() > 0) {
str = '选中费用合计[';
for (i = 0; i < storeSelect.getCount(); i += 1) {
var memberyf = storeSelect.getAt(i);
str = str + memberyf.data.CURR + ':' + memberyf.data.AMOUNT + ' ';
}
str = str + ']';
var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
DRSELECTSTR.setText(str, false);
} else {
var DRSELECTSTR = Ext.getCmp('CRSELECTSTR');
DRSELECTSTR.setText('', false);
}
}
}

9
DSWeb/Areas/MvcShipping/Viewsjs/MsOpLetter/MsOpLetterTruckEdit.js
Unescape Escape View File

@ -599,6 +599,15 @@ Ext.extend(Shipping.MsOpLetterTruckEdit, Ext.Panel, {
this.LoadinitData();
},
scope: this
}, '-', {
id: 'btnEHistryCopy',
text: "历史引入",
handler: function (button, event) {
DsOpenEditWin('/MvcShipping/MsOpLetter/HistryTruckIndex', "派车通知历史引入", "600", "940", "10", "10");
},
scope: this
}, '-',
{
text: "生成派车单", menu: menu1, scope: this

84
DSWeb/Areas/TruckMng/Viewsjs/MsCustTruckFeeTemplate/MsCustTruckFeeTemplateIndex.js
Unescape Escape View File

@ -14,7 +14,7 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
//需求编号：SR2017061200005-3
initUIComponents: function () {
this.AuditEdit = false;
_this = this;
//定义数据集
this.storeList = Ext.create('Ext.data.Store', {
model: 'MsCustTruckFeeTemplate',
@ -127,7 +127,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
lazyRender: false,
name: 'CUSTOMERNAME',
valueField: 'CustName',
displayField: 'CodeAndName'
displayField: 'CodeAndName',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
this.storeListGoodName = Ext.create('Ext.data.Store', {
@ -168,7 +176,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
fieldLabel: '商品名称', //'费用类型',
valueField: 'GOODNAME',
displayField: 'CODEANDNAME',
name: 'GOODNAME'
name: 'GOODNAME',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
this.storeTransType = Ext.create('Ext.data.Store', {
@ -183,7 +199,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
valueField: 'DC',
displayField: 'NAME',
forceSelection: true,
name: 'TRANTYPE'
name: 'TRANTYPE',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
@ -200,7 +224,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
valueField: 'DC',
displayField: 'NAME',
forceSelection: true,
name: 'BSSTATUS'
name: 'BSSTATUS',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
@ -232,7 +264,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
valueField: 'PORT',
displayField: 'CODEANDNAME',
forceSelection: true,
name: 'LOADPORT'
name: 'LOADPORT',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
this.storeListTruckDistPort = Ext.create('Ext.data.Store', {
@ -265,7 +305,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
valueField: 'PORT',
displayField: 'CODEANDNAME',
forceSelection: true,
name: 'DISTPORT'
name: 'DISTPORT',
enableKeyEvents: true,
listeners: {
keyup: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
});
@ -296,7 +344,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
items: [this.comboxTransStatus,{
fieldLabel: '计费方案名称', //'模板名称',
labelWidth: 80,
name: 'TEMPLATENAME'
name: 'TEMPLATENAME',
enableKeyEvents: true,
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
},this.comboxCustomerNameRef, this.comboxGoodCode,this.comboxTransType
]
}, {
@ -305,7 +361,15 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
defaultType: 'textfield',
items: [{
fieldLabel: '合同号', //'模板名称',
name: 'CONTRACTNO'
name: 'CONTRACTNO',
enableKeyEvents: true,
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
}, this.comboxLoadPort, this.comboxDistPort, { xtype: 'hiddenfield' }, { xtype: 'hiddenfield' }
]
}
@ -467,7 +531,7 @@ Ext.extend(DsTruck.MsCustTruckFeeTemplateIndex, Ext.Panel, {
sql = sql + getAndConSql(sql, GOODNAME, "GOODNAME='" + GOODNAME + "'");
var TEMPLATENAME = form.findField('TEMPLATENAME').getValue();
sql = sql + getAndConSql(sql, TEMPLATENAME, "TEMPLATENAME='" + TEMPLATENAME + "'");
sql = sql + getAndConSql(sql, TEMPLATENAME, "TEMPLATENAME like '%" + TEMPLATENAME + "%'");
var LOADPORT = form.findField('LOADPORT').getValue();
var DISTPORT = form.findField('DISTPORT').getValue();

6
DSWeb/Areas/TruckMng/Viewsjs/MsOpTruckBulk/MsRptTruckBulkCtnProfitIndex.js
Unescape Escape View File

@ -1229,6 +1229,8 @@ Ext.extend(Shipping.MsRptTruckBulkCtnProfitIndex, Ext.Panel, {
var ORDERNO = form.findField('ORDERNO').getValue();
sql = sql + getAndConSql(sql, ORDERNO, "B.ORDERNO like '%" + ORDERNO + "%'");
var MBLNO = form.findField('MBLNO').getValue();
sql = sql + getAndConSql(sql, MBLNO, "B.MBLNO like '%" + MBLNO + "%'");
var PAYNO = form.findField('PAYNO').getValue();
sql = sql + getAndConSql(sql, PAYNO, "P.BSNO IN (SELECT DISTINCT BSNO FROM CH_FEE_DO WHERE BILLNO='" + PAYNO + "')");
@ -1244,9 +1246,9 @@ Ext.extend(Shipping.MsRptTruckBulkCtnProfitIndex, Ext.Panel, {
var ETDBgn = form.findField('ETDBgn').getRawValue();
sql = sql + getAndConSql(sql, ETDBgn, "CONVERT(char(10), P.ETD, 20) >='" + ETDBgn + "'");
sql = sql + getAndConSql(sql, ETDBgn, "CONVERT(char(10), P.ETA, 20) >='" + ETDBgn + "'");
var ETDEnd = form.findField('ETDEnd').getRawValue();
sql = sql + getAndConSql(sql, ETDEnd, "CONVERT(char(10), P.ETD, 20) <='" + ETDEnd + "'");
sql = sql + getAndConSql(sql, ETDEnd, "CONVERT(char(10), P.ETA, 20) <='" + ETDEnd + "'");
var TRUCKER = form.findField('TRUCKER').getValue();
sql = sql + getAndConSql(sql, TRUCKER, "P.TRUCKER='" + TRUCKER + "'");

Write Preview
Loading…
Cancel
Save