hanxuntao
/
D7QUANTAI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
hanxuntao 4 months ago
parent ab13044f8e
commit 417b9d0f9f
11 changed files with 61 additions and 34 deletions
Show Stats Download Patch File Download Diff File

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

@ -2144,6 +2144,9 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
region: 'center',
loadMask: { msg: "数据加载中，请稍等..." },
trackMouseOver: true,
viewConfig: {
enableTextSelection: true
},
disableSelection: false,
tbar: [{
xtype: 'label',
@ -2522,6 +2525,9 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
trackMouseOver: true,
disableSelection: false,
plugins: [this.cellEditingFee],
viewConfig: {
enableTextSelection: true
},
selModel: this.AddFeeGridCheckBoxModel,
selType: 'cellmodel',
tbar: [{
@ -2591,6 +2597,9 @@ Ext.extend(Shipping.MsChInvoiceAppEdit, Ext.Panel, {
region: 'center',
loadMask: { msg: "数据加载中，请稍等..." },
trackMouseOver: true,
viewConfig: {
enableTextSelection: true
},
disableSelection: false,
columns: [{
sortable: true,

2
DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationAudit.js
Unescape Escape View File

@ -253,7 +253,7 @@ Ext.extend(Shipping.ChInvoiceapplicationAudit, Ext.Panel, {
displayField: 'NAME',
forceSelection: true,
name: 'DC',
value: '1'
value: '2'
});
this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', {

3
DSWeb/Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationBLEdit.js
Unescape Escape View File

@ -1937,6 +1937,9 @@ Ext.extend(Shipping.MsChInvoiceapplicationBLEdit, Ext.Panel, {
disableSelection: false,
plugins: [this.cellEditingFee],
selModel: this.AddFeeGridCheckBoxModel,
viewConfig: {
enableTextSelection: true
},
tbar: [{
text: Zi.LAN.btnAddInvdetail,
tooltip: Zi.LAN.btnAddInvdetail,

2
DSWeb/Areas/Dispatch/Helper/DingTalkHelper.cs
Unescape Escape View File

@ -944,7 +944,7 @@ namespace DSWeb.Areas.Dispatch.Helper
var Auditexecute = new terminate();
Auditexecute.processInstanceId = instanceId;
Auditexecute.operatingUserId = user.DingTalkAccount;
Auditexecute.isSystem = true;
Auditexecute.isSystem = false;
Auditexecute.remark = "";
jsonObj = Auditexecute;

17
DSWeb/Areas/MvcShipping/Controllers/MsRptOpProfitMonthController.cs
Unescape Escape View File

@ -8,6 +8,7 @@ using System.Web.Mvc;
using DSWeb.MvcShipping.Helper;
using DSWeb.MvcShipping.Comm.Cookie;
using DSWeb.Areas.CommMng.DAL;
using DSWeb.Areas.CommMng.DAL;
using DSWeb.Areas.RptMng.Comm;
using HcUtility.Comm;
using HcUtility.Core;
@ -429,6 +430,7 @@ namespace DSWeb.MvcShipping.Controllers
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
@ -677,8 +679,11 @@ namespace DSWeb.MvcShipping.Controllers
}
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -932,6 +937,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -1197,6 +1203,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -1447,6 +1454,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -1699,6 +1707,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -1952,6 +1961,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -2203,6 +2213,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -2454,6 +2465,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -2677,6 +2689,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -2926,6 +2939,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -3175,6 +3189,7 @@ namespace DSWeb.MvcShipping.Controllers
}
if (Fieldset.TEU)
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then B.TEU else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "TEU ");
if (amendstr == "true")
{
strSql.Append(",sum(case when SUBSTRING(CONVERT(char(15), B." + datetype + ", 111), 1, 7)='" + enumValue.MONTHFIELDNAME + "' then 1 else 0 end) as ZL" + enumValue.MONTHNO.ToString() + "BL ");
@ -3579,6 +3594,7 @@ namespace DSWeb.MvcShipping.Controllers
evData.TEU = Convert.ToBoolean(reader["TEU"]);
if (reader["PROFITRATE"] != DBNull.Value)
evData.PROFITRATE = Convert.ToBoolean(reader["PROFITRATE"]);
evList.Add(evData);
}
reader.Close();
@ -3642,6 +3658,7 @@ namespace DSWeb.MvcShipping.Controllers
db.AddInParameter(cmdInsert, "@TEU", DbType.Boolean, headData.TEU);
db.AddInParameter(cmdInsert, "@PROFITRATE", DbType.Boolean, headData.PROFITRATE);
db.ExecuteNonQuery(cmdInsert, tran);

33
DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlChFee/MsCwVouchersGlChFeeDAL.cs
Unescape Escape View File

@ -8764,13 +8764,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
{
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = DREXPLAN;
else strEXPLAN = CREXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
strEXPLAN = "国外收入";
var ISEXPLAN = true;
if (dsCwDesign.Tables[0].Rows[0]["ISCLIENTNAME"].ToString().Trim() == "True")
{
@ -9484,12 +9479,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
{
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = DREXPLAN;
else strEXPLAN = CREXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
strEXPLAN = "国外收入";
var ISEXPLAN = true;
if (dsCwDesign.Tables[0].Rows[0]["ISCLIENTNAME"].ToString().Trim() == "True")
@ -10612,12 +10603,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
{
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = DREXPLAN;
else strEXPLAN = CREXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
strEXPLAN = "国外收入";
var ISEXPLAN = true;
if (dsCwDesign.Tables[0].Rows[0]["ISCLIENTNAME"].ToString().Trim() == "True")
@ -11506,12 +11493,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlChFeeDAL
{
#region 摘要内容
strEXPLAN = "";
if (dsVWChFeeAR.Tables[0].Rows[i]["FEETYPE"].ToString().Trim() == "收")
strEXPLAN = MBINCOMEEXPLAN;
else strEXPLAN = MBSPENDINGEXPLAN;
var ISEXPLAN = false;
if (strEXPLAN != "") ISEXPLAN = true;
strEXPLAN = "国外收入";
var ISEXPLAN = true;
if (dsCwDesign.Tables[0].Rows[0]["ISCLIENTNAME"].ToString().Trim() == "True")

6
DSWeb/Areas/MvcShipping/DAL/MsOp_BLISSUE/MsOp_BLISSUEDAL.cs
Unescape Escape View File

@ -3134,13 +3134,13 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
#region 该业务是否 欠费超期
//var TTLNODR=0M;
if (reader["TTLNODR"] != DBNull.Value)
data.TTLNODR = data.TTLNODR+ Convert.ToDecimal(reader["TTLNODR"]);
data.TTLNODR =Convert.ToDecimal(reader["TTLNODR"]);
//var RMBNODR=0M;
if (reader["RMBNODR"] != DBNull.Value)
data.RMBNODR = data.RMBNODR+Convert.ToDecimal(reader["RMBNODR"]);
data.RMBNODR = Convert.ToDecimal(reader["RMBNODR"]);
//var USDNODR=0M;
if (reader["USDNODR"] != DBNull.Value)
data.USDNODR=data.USDNODR + Convert.ToDecimal(reader["USDNODR"]);
data.USDNODR= Convert.ToDecimal(reader["USDNODR"]);
#endregion
#region 累计欠费

2
DSWeb/Areas/MvcShipping/Models/MsBaseInfo/ProfitFieldSet.cs
Unescape Escape View File

@ -114,6 +114,8 @@ namespace DSWeb.MvcShipping.Models.ProfitFieldSet
public bool PROFITRATE { get; set; }
public bool BLCOUNT { get; set; }
#endregion
}

13
DSWeb/Areas/MvcShipping/Viewsjs/MsChFee/FeeAmendDrCrGrid.js
Unescape Escape View File

@ -4780,6 +4780,18 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
}
}
}
var SALECORP = '';
var SALECORPID = this.EditRecord.get('SALECORPID');
if (SALECORPID != undefined && SALECORPID != NaN && SALECORPID != '') {
var records = DsStoreQueryBy(this.storeSALECORP, 'GID', SALECORPID);
if (records.getCount() > 0) {
var data = records.getAt(0).data;
SALECORP = data.NAME;
} else {
SALECORP = '';
}
}
var newSerialno = this.GetHandleSerialNo(store, type);
var newsort = store.getCount() + 1;
@ -4830,6 +4842,7 @@ Ext.extend(Shipping.FeeAmendEditGrid, Ext.Panel, {
LOCALCURR: LOCALCURR,
WmsOutBsNo: '',
MANAGER: MANAGER,
SALECORP: SALECORP,
MANAGERREF: MANAGERREF
});

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

@ -1025,7 +1025,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (records[0].data.DOC != '')
this.formHead.getForm().findField('DOC').setValue(records[0].data.DOC);
if (records[0].data.CUSTSERVICE != '')
this.formHead.getForm().findField('CUSTSERVICE').setValue(records[0].data.CUSTSERVICE);
this.formEdit.getForm().findField('FRCUSTSERVICE').setValue(records[0].data.CUSTSERVICE);
}
}
}
@ -2561,7 +2561,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (selectdata.DOC != '')
this.formHead.getForm().findField('DOC').setValue(selectdata.DOC);
if (selectdata.CUSTSERVICE != '')
this.formHead.getForm().findField('CUSTSERVICE').setValue(selectdata.CUSTSERVICE);
this.formEdit.getForm().findField('FRCUSTSERVICE').setValue(selectdata.CUSTSERVICE);
}
}
@ -2609,7 +2609,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
if (selectdata.DOC != '')
this.formHead.getForm().findField('DOC').setValue(selectdata.DOC);
if (selectdata.CUSTSERVICE != '')
this.formHead.getForm().findField('CUSTSERVICE').setValue(selectdata.CUSTSERVICE);
this.formEdit.getForm().findField('FRCUSTSERVICE').setValue(selectdata.CUSTSERVICE);
}
field.value = _rec.data.EDICODE;
field.setRawValue(_rec.data.EDICODE);

2
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfitMonth/MsProfitFieldSetEdit.js
Unescape Escape View File

@ -106,7 +106,7 @@ Ext.extend(Shipping.MsProfitFieldSetEdit, Ext.Panel, {
boxLabel: 'TEU',
inputValue: true,
name: 'TEU'
}
}
]
});

Write Preview
Loading…
Cancel
Save