diff --git a/DSWeb/Areas/Dispatch/Helper/DingTalkHelper.cs b/DSWeb/Areas/Dispatch/Helper/DingTalkHelper.cs index d30140d..b4f93f9 100644 --- a/DSWeb/Areas/Dispatch/Helper/DingTalkHelper.cs +++ b/DSWeb/Areas/Dispatch/Helper/DingTalkHelper.cs @@ -945,7 +945,7 @@ namespace DSWeb.Areas.Dispatch.Helper Auditexecute.processInstanceId = instanceId; Auditexecute.operatingUserId = user.DingTalkAccount; Auditexecute.isSystem = false; - Auditexecute.remark = ""; + //Auditexecute.remark = ""; jsonObj = Auditexecute; @@ -1569,7 +1569,7 @@ namespace DSWeb.Areas.Dispatch.Helper /// /// /// - public string remark { get; set; } + //public string remark { get; set; } /// /// /// diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs index 82c109b..b1e536a 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs @@ -1464,7 +1464,7 @@ namespace DSWeb.MvcShipping.Controllers var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='大简云舱单'", Convert.ToString(Session["COMPANYID"])); //制作发送的列表 - result = MsOpSeaeEdiDAL.CreateCustomList(headList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks); + result = MsOpSeaeEdiDAL.CreateCustomList(headList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks, coscotype); //增加费用 if(result.Success) @@ -1937,7 +1937,7 @@ namespace DSWeb.MvcShipping.Controllers } var result = new DBResult(); var ftpset = MsCodeFtpSetDAL.GetData("EDINAME=''", Convert.ToString(Session["COMPANYID"])); - result = MsOpSeaeEdiDAL.CreateCustomListBill_HBLNO(headList, billList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks, filetype); + result = MsOpSeaeEdiDAL.CreateCustomListBill_HBLNO(headList, billList, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), path, Convert.ToString(Session["COMPANYNAME"]), dcarrier, iscvessel, ftpset, remarks, filetype, coscotype); BasicDataRefDAL.SaveLog(JsonConvert.Serialize(result), "", "直发舱单_分单", "结果"); //增加费用 diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs index 3dd5e9e..eef8caa 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsRptNoTotalController.cs @@ -2025,16 +2025,19 @@ namespace DSWeb.MvcShipping.Controllers //} var strSql = new StringBuilder(); - strSql.Append("select * from ("); - strSql.Append(" select PARENTID,CUSTNAME,FEETYPE,CURRENCY,SUM(AMOUNT) AMOUNT,COUNT(GID) FEECOUNT,OPLB,OPLBNAME,BSTYPE,CUSTOMERNAME,MAX(CUSTNO) CUSTNO,MBLNO,HBLNO,VESSEL,VOYNO,MAX(INPUTBY) INPUTBY,BSSTATUS,SALE,OP,DOC,"); - strSql.Append(" ETD,CUSTSERVICE,PORTLOAD,PORTDISCHARGE,CUSTOMNO,CARRIER,BSSOURCE,LANE,FORWARDER,NETWEIGHT,KGS,MAX(TEU) TEU,CNTRTOTAL,CORPID"); - strSql.Append(" from (select b.bsno,b.PARENTID,f.CUSTOMERNAME CUSTNAME,f.FEETYPE,f.AMOUNT,f.CURRENCY,F.GID,"); - strSql.Append(" B.OPLB,B.OPTYPE, B.OPLBNAME, B.BSTYPE,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(" B.ETD,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID"); - strSql.Append(" from ch_fee f left join v_op_bill b on (b.BSNO=f.BSNO) "); - strSql.Append(" where f.FEESTATUS=0 and f.SETTLEMENT=0 and f.ORDERAMOUNT=0 and f.ORDERINVOICE=0 AND ISNULL(F.INVOICE,0)=0 AND F.AMOUNT<>0) as v"); - strSql.Append(" group by PARENTID,CUSTNAME,FEETYPE,CURRENCY,OPLB,OPLBNAME,BSTYPE,CUSTOMERNAME,MBLNO,HBLNO,VESSEL,VOYNO,BSSTATUS,SALE,OP,DOC,"); - strSql.Append(" ETD,CUSTSERVICE,PORTLOAD,PORTDISCHARGE,CUSTOMNO,CARRIER,BSSOURCE,LANE,FORWARDER,NETWEIGHT,KGS,CNTRTOTAL,CORPID) as vs where AMOUNT=0 AND FEECOUNT>1 "); + //strSql.Append("select * from ("); + //strSql.Append(" select PARENTID,CUSTNAME,FEETYPE,CURRENCY,SUM(AMOUNT) AMOUNT,COUNT(GID) FEECOUNT,OPLB,OPLBNAME,BSTYPE,CUSTOMERNAME,MAX(CUSTNO) CUSTNO,MBLNO,HBLNO,VESSEL,VOYNO,MAX(INPUTBY) INPUTBY,BSSTATUS,SALE,OP,DOC,"); + //strSql.Append(" ETD,CUSTSERVICE,PORTLOAD,PORTDISCHARGE,CUSTOMNO,CARRIER,BSSOURCE,LANE,FORWARDER,NETWEIGHT,KGS,MAX(TEU) TEU,CNTRTOTAL,CORPID"); + //strSql.Append(" from (select b.bsno,b.PARENTID,f.CUSTOMERNAME CUSTNAME,f.FEETYPE,f.AMOUNT,f.CURRENCY,F.GID,"); + //strSql.Append(" B.OPLB,B.OPTYPE, B.OPLBNAME, B.BSTYPE,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(" B.ETD,B.CUSTSERVICE, B.PORTLOAD, B.PORTDISCHARGE, B.CUSTOMNO, B.ACCDATE,B.CARRIER, B.BSSOURCE, B.LANE, B.FORWARDER,B.NETWEIGHT,B.KGS,B.TEU,B.CNTRTOTAL,B.CORPID"); + //strSql.Append(" from ch_fee f left join v_op_bill b on (b.BSNO=f.BSNO) "); + //strSql.Append(" where f.FEESTATUS=0 and f.SETTLEMENT=0 and f.ORDERAMOUNT=0 and f.ORDERINVOICE=0 AND ISNULL(F.INVOICE,0)=0 AND F.AMOUNT<>0) as v"); + //strSql.Append(" group by PARENTID,CUSTNAME,FEETYPE,CURRENCY,OPLB,OPLBNAME,BSTYPE,CUSTOMERNAME,MBLNO,HBLNO,VESSEL,VOYNO,BSSTATUS,SALE,OP,DOC,"); + //strSql.Append(" ETD,CUSTSERVICE,PORTLOAD,PORTDISCHARGE,CUSTOMNO,CARRIER,BSSOURCE,LANE,FORWARDER,NETWEIGHT,KGS,CNTRTOTAL,CORPID) as vs where AMOUNT=0 AND FEECOUNT>1 "); + + strSql.Append("select * from V_CD_FEELIST "); + if (!string.IsNullOrEmpty(condition)) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs index ce1df3f..78db6c1 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs @@ -39,7 +39,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlInvoiceDAL strSql.Append(",(select ShowName from [user] where GID=cm.OPERATOR) as OPERATORNAME"); strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME"); strSql.Append(",dbo.GetFeeNoStlByInvNo(cm.BILLNO) as NOSTL,FEEAMOUNT "); - strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice' and STARTGID='" + strCwSTARTGID + "')"); +// strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice' and STARTGID='" + strCwSTARTGID + "')"); + strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice')"); strSql.Append(" FROM ch_fee_invoice cm where 1=1 "); if (!string.IsNullOrEmpty(strCondition)) { @@ -160,7 +161,8 @@ namespace DSWeb.MvcShipping.DAL.MsCwVouchersGlInvoiceDAL strSql.Append(",(select ShowName from [user] where GID=cm.OPERATOR) as OPERATORNAME"); strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME"); strSql.Append(",dbo.GetFeeNoStlByInvNo(cm.BILLNO) as NOSTL,FEEAMOUNT "); - strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice' and STARTGID='" + strCwSTARTGID + "')"); +// strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice' and STARTGID='" + strCwSTARTGID + "')"); + strSql.Append(",VOUNO=(select top 1 VOUALLNO from cw_vouno_bs_gl WITH(NOLOCK) where BSGID=cm.GID and BSTABLENAME='ch_fee_invoice')"); strSql.Append(" FROM ch_fee_invoice cm where 1=1 "); if (!string.IsNullOrEmpty(strCondition)) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs index b4f874a..5ae01a3 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs @@ -7463,7 +7463,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL /// /// /// - public static DBResult CreateCustomList(List billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks) + public static DBResult CreateCustomList(List billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks,string coscotype) { var result = new DBResult(); var companydef = DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.GetCompanyDef(companyid); @@ -7498,7 +7498,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL email = user.EMAIL1; } var mailbody = "公司名称：" + companyname + "\r\n" + "申请人：" + usercode + "\r\n" + "邮箱：" + email - + "\r\n" + "电话：" + tel + "\r\n" + "备注：" + remarks + "\r\n" + "主提单号：" + bill.MBLNO; + + "\r\n" + "电话：" + tel + "\r\n" + "备注：" + remarks + "\r\n" + "主提单号：" + bill.MBLNO + "\r\n" + coscotype; //string toNames = "frank,lee"; var MAILTONAME = "admin@dongshengsoft.com"; @@ -11116,7 +11116,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL #region 直发舱单_分单 //public static DBResult CreateCustomListBill_HBLNO(List billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks) - public static DBResult CreateCustomListBill_HBLNO(List headList, List billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks, string optype = "0",string filetype="") + public static DBResult CreateCustomListBill_HBLNO(List headList, List billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks, string optype = "0",string filetype="",string coscotype="") { var result = new DBResult(); var companydef = DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.GetCompanyDef(companyid); @@ -11231,7 +11231,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL var mailbody = "公司名称：" + companyname + "\r\n" + "申请人：" + usercode + "\r\n" + "邮箱：" + email - + "\r\n" + "电话：" + tel + "\r\n" + "备注：" + remarks + "主提单号：" + bill.MBLNO; + + "\r\n" + "电话：" + tel + "\r\n" + "备注：" + remarks + "主提单号：" + bill.MBLNO+"\r\n"+ coscotype; SendEmail se = new SendEmail(DONGSHENGMAILADDR, MAILTONAME, "", "", mailtopic, mailbody, false); // SendEmail se = new SendEmail("dev001@dongshengsoft.com", "admin@dongshengsoft.com", "", "", mailtopic, mailbody, false); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/MsChFeeYsAutoDuiEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/MsChFeeYsAutoDuiEdit.js index 5363e81..ebe272a 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/MsChFeeYsAutoDuiEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/MsChFeeYsAutoDuiEdit.js @@ -646,7 +646,10 @@ Ext.extend(Shipping.MsChFeeYsAutoDuiEdit, Ext.Panel, { this.storeFeiYongZhuangTai.add({ "DC": "17", "NAME": "仅未开票未收款" }); this.storeFeiYongZhuangTai.add({ "DC": "18", "NAME": "仅已付款未收发票" }); this.storeFeiYongZhuangTai.add({ "DC": "19", "NAME": "仅已收发票未付款" }); + this.storeFeiYongZhuangTai.add({ "DC": "20", "NAME": "未开票未结算费用已审核费用" }); + + this.comboxFeiYongZhuangTai = Ext.create('DsExt.ux.RefTableCombox', { fieldLabel: "费用状态", store: this.storeFeiYongZhuangTai, @@ -1482,6 +1485,8 @@ Ext.extend(Shipping.MsChFeeYsAutoDuiEdit, Ext.Panel, { sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.SETTLEMENT,0)<>0 and ISNULL(C.ISINVOICE,0)=0 AND ((C.AMOUNT>0 and ISNULL(C.SETTLEMENT,0)>ISNULL(C.INVOICE,0)) or (C.AMOUNT<0 and ISNULL(C.SETTLEMENT,0)0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)C.AMOUNT AND ISNULL(C.INVOICE,0)<>C.AMOUNT AND F.FEESTATUS IN (0,8) "); } } @@ -1667,6 +1672,8 @@ Ext.extend(Shipping.MsChFeeYsAutoDuiEdit, Ext.Panel, { sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.SETTLEMENT,0)<>0 and ISNULL(C.ISINVOICE,0)=0 AND ((C.AMOUNT>0 and ISNULL(C.SETTLEMENT,0)>ISNULL(C.INVOICE,0)) or (C.AMOUNT<0 and ISNULL(C.SETTLEMENT,0)0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)C.AMOUNT AND ISNULL(C.INVOICE,0)<>C.AMOUNT AND F.FEESTATUS IN (0,8) "); } } @@ -1780,6 +1787,8 @@ Ext.extend(Shipping.MsChFeeYsAutoDuiEdit, Ext.Panel, { sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.SETTLEMENT,0)<>0 and ISNULL(C.ISINVOICE,0)=0 AND ((C.AMOUNT>0 and ISNULL(C.SETTLEMENT,0)>ISNULL(C.INVOICE,0)) or (C.AMOUNT<0 and ISNULL(C.SETTLEMENT,0)0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)C.AMOUNT AND ISNULL(C.INVOICE,0)<>C.AMOUNT AND F.FEESTATUS IN (0,8) "); } } diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceIndex.js index 43372f0..3b7e5d0 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceIndex.js @@ -863,18 +863,18 @@ Ext.extend(Shipping.MsCwVouchersGlInvoiceIndex, Ext.Panel, { //凭证状态 var ISVOUNO = form.findField('ISVOUNO').getValue(); if (ISVOUNO == "未生成") { - //sql = sql + getAndConSql(sql, ISVOUNO, "(VOUNO='' or VOUNO is null)"); - sql = sql + getAndConSql(sql, ISVOUNO, "gid not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "')"); +// sql = sql + getAndConSql(sql, ISVOUNO, "gid not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "')"); + sql = sql + getAndConSql(sql, ISVOUNO, "gid not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice')"); } else if (ISVOUNO == "已生成") { - //sql = sql + getAndConSql(sql, ISVOUNO, "(VOUNO<>'' and VOUNO is not null)"); - sql = sql + getAndConSql(sql, ISVOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "')"); + // sql = sql + getAndConSql(sql, ISVOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "')"); + sql = sql + getAndConSql(sql, ISVOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice')"); } //凭证号 var VOUNO = form.findField('VOUNO').getValue(); - //sql = sql + getAndConSql(sql, VOUNO, "VOUNO like '%" + VOUNO + "%'"); - sql = sql + getAndConSql(sql, VOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "' and VOUALLNO like '%" + VOUNO + "%')"); +// sql = sql + getAndConSql(sql, VOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and [STARTGID]='" + this.strCwSTARTGID + "' and VOUALLNO like '%" + VOUNO + "%')"); + sql = sql + getAndConSql(sql, VOUNO, "gid in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoice' and VOUALLNO like '%" + VOUNO + "%')"); return sql; }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoiceHeXiao/MsCwVouchersGlInvoiceHeXiaoIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoiceHeXiao/MsCwVouchersGlInvoiceHeXiaoIndex.js index dc3643a..5c3e788 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoiceHeXiao/MsCwVouchersGlInvoiceHeXiaoIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoiceHeXiao/MsCwVouchersGlInvoiceHeXiaoIndex.js @@ -767,18 +767,18 @@ Ext.extend(Shipping.MsCwVouchersGlInvoiceHeXiaoIndex, Ext.Panel, { //凭证状态 var ISVOUNO = form.findField('ISVOUNO').getValue(); if (ISVOUNO == "未生成") { - //sql = sql + getAndConSql(sql, ISVOUNO, "(VOUNO='' or VOUNO is null)"); - sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "')"); +// sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "')"); + sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO not in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' )"); } else if (ISVOUNO == "已生成") { - //sql = sql + getAndConSql(sql, ISVOUNO, "(VOUNO<>'' and VOUNO is not null)"); - sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "')"); +// sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "')"); + sql = sql + getAndConSql(sql, ISVOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao')"); } //凭证号 var VOUNO = form.findField('VOUNO').getValue(); - //sql = sql + getAndConSql(sql, VOUNO, "VOUNO like '%" + VOUNO + "%'"); - sql = sql + getAndConSql(sql, VOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "' and VOUALLNO like '%" + VOUNO + "%')"); +// sql = sql + getAndConSql(sql, VOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and [STARTGID]='" + this.strCwSTARTGID + "' and VOUALLNO like '%" + VOUNO + "%')"); + sql = sql + getAndConSql(sql, VOUNO, "BILLNO in (select BSGID from [cw_vouno_bs_gl] where [BSTABLENAME]='ch_fee_invoicehexiao' and VOUALLNO like '%" + VOUNO + "%')"); return sql; }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryOpSeaeIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryOpSeaeIndex.js index ae2ebd3..681f68f 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryOpSeaeIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryOpSeaeIndex.js @@ -933,7 +933,7 @@ Ext.extend(Shipping.HistryOpSeaeIndex, Ext.Panel, { parentWin.formEdit.getForm().findField('VESSELID').setValue(record.data.VESSELID); parentWin.formEdit.getForm().findField('HSCODE').setValue(record.data.HSCODE); parentWin.formEdit.getForm().findField('ISSUEPLACEID').setValue(record.data.ISSUEPLACEID); - parentWin.formEdit.getForm().findField('REMARK').setValue(record.data.REMARK); +/* parentWin.formEdit.getForm().findField('REMARK').setValue(record.data.REMARK);*/ Ext.Ajax.request({ waitMsg: '正在查询主表数据...', //'正在查询主表数据...', url: '/MvcShipping/MsOpSeae/GetAmsData', diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js index a57cfc2..6e25d63 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js @@ -316,7 +316,11 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, { layout: 'hbox', flex: 1, defaultType: 'textfield', - items: [{ + items: [{ + fieldLabel: '航次', + name: 'VOYNO', + // flex: 1.5 + }, { fieldLabel: '装货港', name: 'PORTLOAD', // flex: 1.5 @@ -612,9 +616,10 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, { var selections = this.gridList.getSelectionModel().getSelection(); for (var i in selections) { var record = selections[i]; - parentWin.formEdit.getForm().findField('SHIPPER').setValue(record.data.SHIPPER); - parentWin.formEdit.getForm().findField('CONSIGNEE').setValue(record.data.CONSIGNEE); - parentWin.formEdit.getForm().findField('NOTIFYPARTY').setValue(record.data.NOTIFYPARTY); + //parentWin.formEdit.getForm().findField('SHIPPER').setValue(record.data.SHIPPER); + //parentWin.formEdit.getForm().findField('CONSIGNEE').setValue(record.data.CONSIGNEE); + //parentWin.formEdit.getForm().findField('NOTIFYPARTY').setValue(record.data.NOTIFYPARTY); + parentWin.formEdit.getForm().findField('VOYNO').setValue(record.data.VOYNO); parentWin.formEdit.getForm().findField('MARKS').setValue(record.data.MARKS); parentWin.formEdit.getForm().findField('DESCRIPTION').setValue(record.data.DESCRIPTION); parentWin.formEdit.getForm().findField('PORTLOADID').setValue(record.data.PORTLOADID); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js index c67daa8..d578154 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js @@ -539,7 +539,33 @@ Ext.extend(Shipping.MsOp_BLISSUESPIndex, Ext.Panel, { fieldLabel: '提单号', name: 'MBLNO' }, this.comboxCustCode, this.comboxBLSTATUS - , this.comboxSALE] + , this.comboxSALE, { + fieldLabel: '从申请日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QR_BGN', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }, { + fieldLabel: '到申请日期', + format: 'Y-m-d', + xtype: 'datefield', + name: 'QR_END', + enableKeyEvents: true, + listeners: { + specialkey: function (field, e) { + if (e.getKey() == e.ENTER) { + _this.onRefreshClick(); + } + } + } + }] }, { xtype: 'container', layout: 'hbox', @@ -1261,6 +1287,12 @@ Ext.extend(Shipping.MsOp_BLISSUESPIndex, Ext.Panel, { sql = sql + getAndConSql(sql, CUSTOMERNAME, " ob.GID in(select LINKGID from op_blissuelist_Detail where BSNO in(select BSNO from v_op_blissue_bill where CUSTOMERNAME='" + CUSTOMERNAME + "')) "); + var QR_BGN = form.findField('QR_BGN').getRawValue(); + sql = sql + getAndConSql(sql, QR_BGN, " ob.OPTIME>='" + QR_BGN + "'"); + + var QR_END = form.findField('QR_END').getRawValue(); + sql = sql + getAndConSql(sql, QR_END, " ob.OPTIME<='" + QR_END + " 23:59:59'"); + var BLSTATUS = form.findField('BLSTATUS').getValue(); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptCdTotalIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptCdTotalIndex.js index c8aed83..50bb63a 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptCdTotalIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptCdTotalIndex.js @@ -33,50 +33,21 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.formname = 'MsRptCdTotalIndex'; this.sqlcontext = '1=2'; - + this.isinputmode = '0'; + this.selectbsno = '1'; + this.selectcust ='1'; + this.selectcurr = '1'; + this.selectfeename = '1'; + this.selectinputmode = '1'; + _thiscd = this; this.storeFeeListDr = Ext.create('Ext.data.Store', { pageSize: this.PageSize, fields: [ - { name: 'PARENTID', type: 'string' }, - { name: 'OPLB', type: 'string' }, - { name: 'OPLBNAME', type: 'string' }, - { name: 'BSTYPE', type: 'string' }, - { name: 'CUSTOMERNAME', type: 'string' }, - { name: 'CUSTNO', type: 'string' }, { name: 'MBLNO', type: 'string' }, - { name: 'HBLNO', type: 'string' }, - { name: 'ETD', type: 'string' }, - { name: 'ACTUALDAY', type: 'number' }, - { name: 'NODAY', type: 'number' }, - { name: 'VESSEL', type: 'string' }, - { name: 'VOYNO', type: 'string' }, - { name: 'INPUTBY', type: 'string' }, - { name: 'CREATETIME', type: 'string' }, - { name: 'FEESTATUSREF', type: 'string' }, - { name: 'SALE', type: 'string' }, - { name: 'OP', type: 'string' }, - { name: 'DOC', type: 'string' }, - { name: 'CUSTSERVICE', type: 'string' }, - { name: 'PORTLOAD', type: 'string' }, - { name: 'PORTDISCHARGE', type: 'string' }, - { name: 'CUSTOMNO', type: 'string' }, - { name: 'ACCDATE', type: 'string' }, - { name: 'CARRIER', type: 'string' }, - { name: 'BSSOURCE', type: 'string' }, - { name: 'LANE', type: 'string' }, - { name: 'FORWARDER', type: 'string' }, - { name: 'CNTRTOTAL', type: 'string' }, - { name: 'TRADETYPE', type: 'string' }, - { name: 'GOODSNAME', type: 'string' }, - { name: 'OPDATE', type: 'string' }, - { name: 'CUSTOMDATE', type: 'string' }, - { name: 'ENTERP', type: 'string' }, - { name: 'NETWEIGHT', type: 'number' }, - { name: 'KGS', type: 'number' }, - { name: 'TEU', type: 'number' }, { name: 'CUSTNAME', type: 'string' }, - { name: 'CUSTFULLNAME', type: 'string' }, - { name: 'FEETYPE', type: 'string' }, + { name: 'FEENAME', type: 'string' }, + { name: 'MAXAMOUNT', type: 'number' }, + { name: 'INPUTMODE', type: 'string' }, { name: 'CURRENCY', type: 'string' }, { name: 'FEECOUNT', type: 'number' } @@ -105,141 +76,64 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { minValue: 0 }) - this.initgirdcolumsfeedr = [{ - sortable: true, - dataIndex: 'BSNO', - header: '编号', - hidden: true, - width: 130 - }, { + this.initgirdcolumsfeedr = [ { sortable: true, dataIndex: 'CUSTNAME', header: '结算客户', - width: 60 - }, { - sortable: true, - dataIndex: 'OPLBNAME', - header: '业务类型', - width: 70 + width: 120 }, { - sortable: true, - dataIndex: 'BSTYPE', - header: '运输类型', - width: 70 - }, - { - sortable: true, - dataIndex: 'CUSTOMERNAME', - header: '委托单位', - width: 120 - }, { - sortable: true, - dataIndex: 'CUSTNO', - header: '委托编号', - width: 136 - }, { - sortable: true, - dataIndex: 'ENTERP', - header: '经营单位', - width: 100 - }, { sortable: true, dataIndex: 'MBLNO', header: '主提单号', - width: 120 - }, { - sortable: true, - dataIndex: 'HBLNO', - header: '分提单号', - width: 120 - }, { - sortable: true, - dataIndex: 'ETD', - header: '开船日期', - width: 86 - }, { - sortable: true, - dataIndex: 'VESSEL', - header: '船名', - width: 200 + width: 160 }, { sortable: true, - dataIndex: 'VOYNO', - header: '航次', - width: 50 - }, { - sortable: true, - dataIndex: 'SALE', - header: '业务员', - width: 80 - }, { - sortable: true, - dataIndex: 'OP', - header: '操作', - width: 80 - }, { - sortable: true, - dataIndex: 'PORTLOAD', - header: '起运港', - width: 80 - }, { - sortable: true, - dataIndex: 'PORTDISCHARGE', - header: '目的港', - width: 150 - }, { - sortable: true, - dataIndex: 'ACCDATE', - header: '会计期间', - width: 80 - }, { - sortable: true, - dataIndex: 'CARRIER', - header: '船公司', - width: 80 - }, { - sortable: true, - dataIndex: 'BSSOURCE', - header: '业务来源', - width: 120 + dataIndex: 'FEENAME', + header: '费用名称', + width: 100 }, { sortable: true, - dataIndex: 'TEU', - header: 'TEU', - width: 80 + dataIndex: 'CURRENCY', + header: '币别', + width: 60 }, { sortable: true, - dataIndex: 'KGS', - header: 'KGS', - width: 80 + dataIndex: 'MAXAMOUNT', + header: '金额', + width: 100 }, { sortable: true, - dataIndex: 'GOODSNAME', - header: '品名', + dataIndex: 'INPUTMODE', + header: '录入方式', width: 80 - }, { - sortable: true, - dataIndex: 'FEETYPE', - header: '收付类型', - width: 60, - renderer: function (value, meta) { - if (value == '1') { - return "应收"; - } else if (value == '2') { - return "应付"; - } - } - }, { - sortable: true, - dataIndex: 'CURRENCY', - header: '币别', - width: 60 }, { sortable: true, dataIndex: 'FEECOUNT', header: '费用条数', align: 'right', width: 80 + }, { + xtype: 'actioncolumn', + width: 80, + text: '查看费用明细', //操作 + items: [{ + icon: '/images/icons/L5.gif', // Use a URL in the icon config + tooltip: '查看费用明细', + getClass: function (v, meta, rec) { + + return 'button_view'; + }, + handler: function (grid, rowIndex, colIndex) { + if (_thiscd.panelFee.isHidden() == true) { + _thiscd.panelFee.setVisible(true); + _thiscd.storeDrChFee.load(); + } + else + _thiscd.panelFee.setVisible(false); + + //DsOpenEditWin(filePath, "", "650", "1250"); + } + }] } ]; @@ -266,13 +160,13 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { }); this.gridFeeListDr.addListener('itemdblclick', function (dataview, record, item, index, e, b) { - this.SelectedRecord = record; - var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2 - var openType = "_blank"; - var openUrl = ""; - openUrl = "../../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.PARENTID; + //this.SelectedRecord = record; + //var openSet = "height=700, width=1024, toolbar=no, menubar=no,scrollbars=1, resizable=1,location=no, status=no,Top= " + (screen.height - 750) / 2 + ",Left= " + (screen.width - 1100) / 2 + //var openType = "_blank"; + //var openUrl = ""; + //openUrl = "../../MvcShipping/MsOpBill/MsOpFeeView?handle=check&bsno=" + record.data.PARENTID; - window.open(openUrl, openType, openSet); + //window.open(openUrl, openType, openSet); }, this); this.gridFeeListDr.addListener('sortchange', function (ct, column, direction, eOpts) { @@ -280,6 +174,16 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.feelistdrsortdire = direction; }, this); + this.gridFeeListDr.getSelectionModel().on('select', function (model, record, index) { + this.selectbsno = record.data.MBLNO; + this.selectcust = record.data.CUSTNAME; + this.selectcurr = record.data.CURRENCY; + this.selectfeename = record.data.FEENAME; + this.selectinputmode = record.data.INPUTMODE; + if (!this.panelFee.isHidden()) { + this.storeDrChFee.load(); + } + }, this); @@ -289,113 +193,6 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { //#region formSearch枚举参照相关 _this = this; - this.StoreOpLb = Ext.create('DsExt.ux.RefEnumStore', {}); - this.StoreOpLb.load({ params: { enumTypeId: 96005} }); - - this.comboxOpLb = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '业务类型', - store: this.StoreOpLb, - forceSelection: true, - name: 'PS_OPLB', - valueField: 'EnumValueName', - displayField: 'EnumValueName', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }); - - this.storeBsType = Ext.create('DsExt.ux.RefEnumStore', {}); - this.storeBsType.load({ params: { enumTypeId: 96004} }); - - this.comboxBsType = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '运输类型', - store: this.storeBsType, - name: 'PS_BSTYPE', - valueField: 'EnumValueName', - displayField: 'EnumValueName', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }); - - this.storeSalesCode = Ext.create('DsExt.ux.RefTableStore', { - model: 'DsShipping.ux.UserRefModel', - proxy: { url: '/CommMng/BasicDataRef/GetUserRefList' } - }); - - this.storeSalesCode.load(); - this.comboxSalesCode = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '揽货人', - store: this.storeSalesCode, - forceSelection: true, - name: 'PS_SALE', - valueField: 'UserName', - displayField: 'CodeAndName', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - - if (e.getKey() == e.ENTER) { - - _this.onRefreshClick(); - } - - } - } - }); - - this.comboxOp = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '操 作', - store: this.storeSalesCode, - forceSelection: true, - name: 'PS_OP', - valueField: 'UserName', - displayField: 'CodeAndName', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }); - - this.storeCustCode = Ext.create('DsExt.ux.RefTableStore', { - model: 'DsShipping.ux.CustomRefModel', - proxy: { url: '/CommMng/BasicDataRef/GetCustomRefList' } - }); - - this.storeCustCode.load({ params: { condition: "ISCONTROLLER='1'"} }); - this.comboxCustCode = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '委托单位', - store: this.storeCustCode, - forceSelection: true, - name: 'PS_CUSTOMERNAME', - valueField: 'CustName', - displayField: 'CodeAndName', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - - }); - - this.storeCust = Ext.create('DsExt.ux.RefTableStore', { model: 'DsShipping.ux.CustomRefModel', @@ -422,98 +219,48 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { }); - //状态_业务状态 - this.StoreFeeLock = Ext.create('Ext.data.Store', { - fields: ['OpLb'] - }); - this.StoreFeeLock.add({ "OpLb": "全部" }); - this.StoreFeeLock.add({ "OpLb": "已锁定" }); - this.StoreFeeLock.add({ "OpLb": "未锁定" }); - this.comboxFeeLock = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '费用锁定', - store: this.StoreFeeLock, - forceSelection: true, - flex: 0.5, - name: 'PS_FEELOCK', - valueField: 'OpLb', - displayField: 'OpLb' - }); - - this.storeVoyVeg = Ext.create('DsExt.ux.RefTableStore', { - model: 'DsShipping.ux.VesselModel', - proxy: { url: '/CommMng/BasicDataRef/GetVesselList' } - }); - this.storeVoyVeg.load({ params: { condition: ""} }); - - this.comboxVoyVeg = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '船 名', - store: this.storeVoyVeg, - valueField: 'VESSEL', - flex: 1.5, - name: 'PS_VESSEL', - displayField: 'VESSEL', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }); - Ext.define('SubComp', { - extend: 'Ext.data.Model', - fields: [ - { name: 'GID', type: 'string' }, - { name: 'NAME', type: 'string' }, - { name: 'ENNAME', type: 'string' } - ] - }); - this.StoreSubComp = Ext.create('DsExt.ux.RefTableStore', { - model: 'SubComp', - proxy: { url: '/MvcShipping/MsBaseInfo/GetCompanyEN' } + this.storeFeeNameRef = Ext.create('DsExt.ux.RefTableStore', { + model: 'DsShipping.ux.FeeTypeRefModel', + proxy: { url: '/MvcShipping/MsChFee/GetFeeTypeRefListNew' } }); - this.StoreSubComp.load({ params: { condition: ""} }); + this.storeFeeNameRef.load(); - this.comboxSubComp = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '所属公司', - store: this.StoreSubComp, - name: 'SUBCOMP', - valueField: 'GID', - displayField: 'NAME', - enableKeyEvents: true, - listeners: { - keyup: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } + this.comboxFeeNameRef = Ext.create('DsExt.ux.DCombox', { + store: this.storeFeeNameRef, + minChars: 1, + fieldLabel: '费用名称', + matchFieldWidth: false, + //queryParam: 'Name', + lazyRender: false, + name: 'FEENAME', + valueField: 'Name', + displayField: 'CodeAndName' }); - this.storeAddDCType = Ext.create('Ext.data.Store', { - fields: ['DC', 'NAME'] + + this.storeINPUTMODE = Ext.create('Ext.data.Store', { + fields: ['FSTATUS', 'NAME'] }); - this.storeAddDCType.add({ "DC": "", "NAME": "全部" }); - this.storeAddDCType.add({ "DC": "1", "NAME": "应收" }); - this.storeAddDCType.add({ "DC": "2", "NAME": "应付" }); - - this.comboxaddDCType = Ext.create('DsExt.ux.RefTableCombox', { - fieldLabel: '收/付', - store: this.storeAddDCType, - flex: 0.5, - valueField: 'DC', + this.storeINPUTMODE.add({ "FSTATUS": "", "NAME": "否" }); + this.storeINPUTMODE.add({ "FSTATUS": "0", "NAME": "否" }); + this.storeINPUTMODE.add({ "FSTATUS": "1", "NAME": "是" }); + + this.comboxINPUTMODE = Ext.create('DsExt.ux.RefTableCombox', { + fieldLabel: '是否匹配录入方式', + labelWidth: 120, + store: this.storeINPUTMODE, + valueField: 'FSTATUS', displayField: 'NAME', forceSelection: true, - name: 'FEETYPE', - value: '1', + name: 'ISINPUTMODE', + value: '', enableKeyEvents: true, listeners: { keyup: function (field, e) { @@ -525,6 +272,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { }); + //是否生成凭证 //#endregion @@ -538,7 +286,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { margins: '2 2 2 2', labelAlign: 'right', flex: 1, - labelWidth: 60, + labelWidth: 70, msgTarget: 'qtip' }, @@ -551,17 +299,11 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { anchor: '100%' }, items: [{ - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [this.comboxCust, this.comboxOp, this.comboxSalesCode, this.comboxBsType, this.comboxSubComp - ] - }, { xtype: 'container', layout: 'hbox', defaultType: 'textfield', items: [{ - fieldLabel: '编号', + fieldLabel: '主提单号', name: 'PS_MBLNO', enableKeyEvents: true, listeners: { @@ -571,76 +313,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { } } } - }, this.comboxVoyVeg, { - fieldLabel: '航次', - labelWidth: 40, - flex: 0.5, - name: 'PS_VOYNO', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, this.comboxOpLb, this.comboxFeeLock, this.comboxaddDCType - ] - }, { - xtype: 'container', - layout: 'hbox', - defaultType: 'textfield', - items: [this.comboxCustCode, { - fieldLabel: '从ETD', - format: 'Y-m-d', - xtype: 'datefield', - name: 'PS_ETDDATEBGN', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '到ETD', - format: 'Y-m-d', - xtype: 'datefield', - name: 'PS_ETDDATEEND', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '会计期间', - xtype: 'monthfield', - name: 'PS_ACCDATEBGN', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - }, { - fieldLabel: '至', - xtype: 'monthfield', - name: 'PS_ACCDATEEND', - enableKeyEvents: true, - listeners: { - specialkey: function (field, e) { - if (e.getKey() == e.ENTER) { - _this.onRefreshClick(); - } - } - } - } + }, this.comboxCust, this.comboxFeeNameRef, this.comboxINPUTMODE ] } ]//end items(fieldset 1) @@ -715,6 +388,20 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.onCreateHexiao(); }, scope: this + }, + '-', + { + text: "显示费用明细", + iconCls: "btnrefresh", + handler: function (button, event) { + if (this.panelFee.isHidden() == true) { + this.panelFee.setVisible(true); + this.storeDrChFee.load(); + } + else + this.panelFee.setVisible(false); + }, + scope: this }, '-', { text: "打印", @@ -763,19 +450,362 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.panelSearch = new Ext.Panel({ layout: "border", region: "north", - height: 98, + height: 45, items: [this.formSearch] }); + this.storeDrChFee = Ext.create('Ext.data.Store', { + model: 'MsChFee', + remoteSort: false, + proxy: { + type: 'ajax', + url: '/MvcShipping/MsChFee/GetDataList', + reader: { + id: 'GId', + root: 'data', + totalProperty: 'totalCount' + } + } + }); + + this.initgirdDrcolums = [{ + sortable: true, + dataIndex: 'GId', + header: '惟一编号', + hidden: true, + width: 160 + }, { + sortable: true, + dataIndex: 'BsNo', + header: '业务编号', + hidden: true, + width: 200 + }, { + sortable: true, + dataIndex: 'FeeStatus', + header: '费用状态', + + renderer: function (value, p, record) { + return record.data.FeeStatus_Ref; + }, + width: 66 + }, { + sortable: true, + dataIndex: 'FeeName', + header: '应收费用名称', + width: 100 + }, { + sortable: true, + dataIndex: 'CustomerType', + header: '客户类别', + width: 80 + }, { + sortable: true, + dataIndex: 'CustomerName', + header: '结算对象', + width: 110 + }, { + sortable: true, + dataIndex: 'Unit', + header: '单位标准', + width: 60 + }, { + sortable: true, + dataIndex: 'UnitPrice', + header: '单价', + align: 'right', + width: 70, + 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 '' + lsValue + ''; + } + } + else { + return value; + } + } + catch (e) { + return value; + } + return value; + } + }, { + sortable: true, + dataIndex: 'Quantity', + header: '数量', + width: 50 + }, { + sortable: true, + dataIndex: 'TaxRate', + header: '税率', + 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 '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, + align: 'right', + width: 60 + }, { + sortable: true, + dataIndex: 'NoTaxAmount', + header: '不含税金额', + align: 'right', + width: 80, + 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 '' + lsValue + ''; + } + } + else { + return value; + } + } + catch (e) { + return value; + } + return value; + } + }, { + sortable: true, + dataIndex: 'Amount', + header: '金额', + align: 'right', + width: 80, + 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 '' + lsValue + ''; + } + } + else { + return value; + } + } + catch (e) { + return value; + } + return value; + } + }, { + sortable: true, + dataIndex: 'Currency', + header: '币别', + width: 40 + }, { + sortable: true, + dataIndex: 'ExChangerate', + header: '汇率', + renderer: function (value, cellmeta, record, rowIndex, columnIndex, store) { try { var lsValue = usMoney(value, 6, '', false); if (lsValue != "NaN") { value = lsValue; if (parseFloat(lsValue) < 0) { return '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, + align: 'right', + width: 60 + }, { + sortable: true, + dataIndex: 'IsAdvancedpay', + header: '是否垫付', + width: 60 + }, { + sortable: true, + dataIndex: 'IsInvoice', + header: '禁开发票', + width: 60, + renderer: function (value, meta, record) { + if (value == '1') + return '是'; + else + return value; + } + }, { + sortable: true, + dataIndex: 'AccTaxRate', + header: '销项税率', + 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 '' + lsValue + ''; } } else { return value; } } catch (e) { return value; } return value; }, + align: 'right', + width: 80 + }, { + sortable: true, + dataIndex: 'Remark', + header: '备注', + width: 150 + }, { + sortable: true, + dataIndex: 'FeeFrt', + header: 'FRT', + width: 40 + }, { + sortable: true, + dataIndex: 'Commissionrate', + header: '佣金比率', + width: 60 + }, { + sortable: true, + dataIndex: 'OpName', + header: '录入人', + width: 60 + }, { + sortable: true, + dataIndex: 'EnterDate', + header: '录入日期', + renderer: Ext.util.Format.dateRenderer('Y-m-d'), + width: 80 + }, { + sortable: true, + dataIndex: 'Auditoperator', + header: '审核人', + width: 60 + }, { + sortable: true, + dataIndex: 'AuditDate', + header: '审核日期', + renderer: Ext.util.Format.dateRenderer('Y-m-d'), + width: 80 + }, { + sortable: true, + dataIndex: 'MODIFIEDUSER', + header: '修改人', + width: 60 + }, { + sortable: true, + dataIndex: 'MODIFIEDTIME', + header: '修改日期', + renderer: Ext.util.Format.dateRenderer('Y-m-d H:i:s'), + width: 130 + }, { + sortable: true, + dataIndex: 'Settlement', + header: '结算金额', + align: 'right', + width: 80, + 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 '' + lsValue + ''; + } + } + else { + return value; + } + } + catch (e) { + return value; + } + return value; + } + }, { + sortable: true, + dataIndex: 'Invoice', + header: '已开票金额', + align: 'right', + width: 80, + 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 '' + lsValue + ''; + } + } + else { + return value; + } + } + catch (e) { + return value; + } + return value; + } + }, + + // { + // sortable: true, + // dataIndex: 'InvoiceNum', + // header: '发票号码', + // width: 80 + // }, + + { + sortable: true, + dataIndex: 'INPUTMODE', + header: '录入方式', //'录入方式', + width: 80 + }, { + sortable: true, + dataIndex: 'MANAGER', + header: '责任人', //'MANAGER', + renderer: function (value, p, record) { + return record.data.MANAGERREF; + }, + width: 100 + } + ]; + + this.girdDrcolums = this.initgirdDrcolums; + this.feeDrGridCheckBoxModel = Ext.create('Ext.selection.CheckboxModel'); + + _thisfeeview = this; + + this.gridDrChFee = new Ext.grid.GridPanel({ + store: this.storeDrChFee, + enableHdMenu: false, + region: 'center', + loadMask: { msg: "数据加载中，请稍等..." }, + trackMouseOver: true, + disableSelection: false, + selModel: this.feeDrGridCheckBoxModel, + selType: 'cellmodel', + viewConfig: { + autoFill: true, + enableTextSelection: true, + getRowClass: function (record, rowIndex, rowParams, store) { + var feeStatus = record.get('FeeStatus'); + var BsNo = record.get('BsNo'); + var ISSEL = record.get('ISSEL'); + if (ISSEL == '1') { return Shipping.FeeGetRowClassFont(feeStatus); } + else { + if (BsNo == _thisfeeview.strBSNO) + return Shipping.FeeGetRowClass(feeStatus); + else return Shipping.FeeGetRowClassFont(feeStatus); + } + + + } + }, + columns: this.girdDrcolums + }); + this.girdDrcolums = DsTruck.GetGridPanel(USERID, 'FEEDRGRIDVIEW', this.girdDrcolums, 0); //使用者id，表名，中间column数组，跳过一开始的几列 + this.panelFee = new Ext.Panel({ + id: "panelFee", + layout: "border", + region: "east", + width: 650, + hidden: true, + title: '费用明细', //autoScroll: true, + frame: false, + split: true, + items: [this.gridDrChFee] + }); + + this.storeDrChFee.on('beforeload', function (store) { + var xcondition = " ch_fee.BSNO IN (SELECT BSNO FROM V_OP_BILL WHERE MBLNO='" + this.selectbsno + "') and ch_fee.FEESTATUS=0 and ch_fee.SETTLEMENT=0 and ch_fee.ORDERAMOUNT=0 and ch_fee.ORDERINVOICE=0 AND ISNULL(ch_fee.INVOICE,0)=0 AND ch_fee.AMOUNT<>0 "; + xcondition = xcondition + " AND ch_fee.CUSTOMERNAME='" + this.selectcust + "' AND ch_fee.CURRENCY='" + this.selectcurr + "' and ch_fee.FEENAME='" + this.selectfeename + "' "; + if (this.isinputmode == '1') xcondition = xcondition + " and ch_fee.INPUTMODE='" + this.selectinputmode + "'"; + Ext.apply(store.proxy.extraParams, { condition: xcondition, billno: '1', type: 1, optype:'op_seae' }); + }, this); + this.panelFeeListDr = new Ext.Panel({ title: '冲抵明细', layout: "border", region: 'center', margin: '0 0', frame: true, - items: [this.gridFeeListDr] + items: [this.gridFeeListDr, this.panelFee] }); @@ -804,7 +834,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.storeFeeListDr.on('beforeload', function (store) { var sql = this.sqlcontext; - Ext.apply(store.proxy.extraParams, { condition: sql }); + Ext.apply(store.proxy.extraParams, { condition: sql, isinputmode: this.isinputmode }); }, this); @@ -826,7 +856,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { var Crsql = sql; this.storeFeeListDr.load({ - params: { start: 0, limit: this.PageSize, condition: Drsql }, + params: { start: 0, limit: this.PageSize, condition: Drsql, isinputmode:this.isinputmode }, waitMsg: "正在查询数据...", scope: this }); @@ -842,7 +872,7 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { this.storeFeeListDr.load({ - params: { start: 0, limit: this.PageSize, condition: sql }, + params: { start: 0, limit: this.PageSize, condition: sql, isinputmode: this.isinputmode }, waitMsg: "正在查询数据...", scope: this }); @@ -878,7 +908,8 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { waitMsg: '正在核销...', url: '/Account/Chfee_hexiao/AutoHeXiaoCD', params: { - data: jsonbodyAddDatas + data: jsonbodyAddDatas, + isinputmode: this.isinputmode }, callback: function (options, success, response) { if (success) { @@ -916,79 +947,20 @@ Ext.extend(Shipping.MsRptCdTotalIndex, Ext.Panel, { getCondition: function () { var form = this.formSearch.getForm(); - var data = this.formSearch.getForm().getValues(false, false, false); var sql = ''; - /* - var sqldata = form.getValues(); - sql = Ext.JSON.encode(sqldata); - */ var mblNo = form.findField('PS_MBLNO').getValue(); - sql = sql + getAndConSql(sql, mblNo, " (CUSTNO like '%" + mblNo + "%' or MBLNO like '%" + mblNo + "%' or HBLNO like '%" + mblNo + "%' ) "); - - - // var expDate_Min = form.findField('PS_EXPDATEBGN').getRawValue(); - // sql = sql + getAndConSql(sql, expDate_Min, " B.OPDATE>='" + expDate_Min + "'"); - - // var expDate_Max = form.findField('PS_EXPDATEEND').getRawValue(); - // sql = sql + getAndConSql(sql, expDate_Max, " B.OPDATE<='" + expDate_Max + " 23:59:59'"); - - var etdDate_Min = form.findField('PS_ETDDATEBGN').getRawValue(); - sql = sql + getAndConSql(sql, etdDate_Min, " ETD>='" + etdDate_Min + "'"); - - var etdDate_Max = form.findField('PS_ETDDATEEND').getRawValue(); - sql = sql + getAndConSql(sql, etdDate_Max, " ETD<='" + etdDate_Max + " 23:59:59'"); - - var accDate_Min = form.findField('PS_ACCDATEBGN').getRawValue(); - sql = sql + getAndConSql(sql, accDate_Min, " ACCDATE>='" + accDate_Min + "'"); - - var accDate_Max = form.findField('PS_ACCDATEEND').getRawValue(); - sql = sql + getAndConSql(sql, accDate_Max, " ACCDATE<='" + accDate_Max + "'"); - - // var ENTERP = form.findField('PS_ENTERP').getValue(); - // sql = sql + getAndConSql(sql, ENTERP, "B.ENTERP='" + ENTERP + "'"); - - var CUSTOMERNAME = form.findField('PS_CUSTOMERNAME').getValue(); - sql = sql + getAndConSql(sql, CUSTOMERNAME, "CUSTOMERNAME='" + CUSTOMERNAME + "'"); + sql = sql + getAndConSql(sql, mblNo, " (MBLNO like '%" + mblNo + "%') "); - var SALE = form.findField('PS_SALE').getValue(); - sql = sql + getAndConSql(sql, SALE, "SALE='" + SALE + "'"); - - var PS_FEELOCK = form.findField('PS_FEELOCK').getValue(); - if (PS_FEELOCK == '已锁定') - sql = sql + getAndConSql(sql, PS_FEELOCK, "FEESTATUS=1"); - else if (PS_FEELOCK == '未锁定') - sql = sql + getAndConSql(sql, PS_FEELOCK, "FEESTATUS=0"); - - - - var OP = form.findField('PS_OP').getValue(); - sql = sql + getAndConSql(sql, OP, "OP='" + OP + "'"); - - var BSTYPE = form.findField('PS_BSTYPE').getValue(); - sql = sql + getAndConSql(sql, BSTYPE, "BSTYPE='" + BSTYPE + "'"); - - var FEETYPE = form.findField('FEETYPE').getValue(); - sql = sql + getAndConSql(sql, FEETYPE, "FEETYPE='" + FEETYPE + "'"); - - var OPLB = form.findField('PS_OPLB').getValue(); - sql = sql + getAndConSql(sql, OPLB, "OPLBNAME='" + OPLB + "'"); - - var VESSEL = form.findField('PS_VESSEL').getValue(); - sql = sql + getAndConSql(sql, VESSEL, "VESSEL like '%" + VESSEL + "%'"); - - var VOYNO = form.findField('PS_VOYNO').getValue(); - sql = sql + getAndConSql(sql, VOYNO, "VOYNO like '%" + VOYNO + "%'"); + var FEENAME = form.findField('FEENAME').getValue(); + sql = sql + getAndConSql(sql, FEENAME, "FEENAME='" + FEENAME + "'"); var CUSTNAME = form.findField('CUSTNAME').getValue(); sql = sql + getAndConSql(sql, CUSTNAME, "CUSTNAME='" + CUSTNAME + "'"); - var SUBCOMP = form.findField('SUBCOMP').getValue(); - sql = sql + getAndConSql(sql, SUBCOMP, "CORPID='" + SUBCOMP + "'"); - - + this.isinputmode = form.findField('ISINPUTMODE').getValue(); return sql; }, diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js index 4cc10fe..8202960 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js @@ -7075,11 +7075,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { } if (FEERANGE == '未申请未结算') { sql = ' (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 ' } else if (FEERANGE == '未对账未结算') { - sql = ' (f.ISDEBIT=0 and isnull(f.SETTLEMENT,0)=0) ' + sql = ' (f.ISDEBIT=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' } else if (FEERANGE == '已对账未结算') { sql = ' (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' } else if (FEERANGE == '未开票未结算') { - sql = ' (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)=0) ' + sql = ' (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' } else if (FEERANGE == '已结算未开票') { sql = ' (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>0) ' } else if (FEERANGE == '已审核未结算') { @@ -7088,9 +7088,9 @@ 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 ' + sql = ' isnull(f.INVOICE,0)<>0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0) ' } else if (FEERANGE == '未开票未申请未结算') { - sql = ' (isnull(f.INVOICE,0)=0 and F.SETTLEMENT=0 and isnull(f.ORDERAMOUNT,0)=0) ' + sql = ' (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0) and isnull(f.ORDERAMOUNT,0)=0) ' } else 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=v_op_gain_sum.TTLDR) ' } else if (FEERANGE == '应付全部结算') { @@ -7120,7 +7120,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { } if (FEERANGE == '未申请未结算') { sql = sql +' and (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 ' } if (FEERANGE == '未对账未结算') { - sql = sql +' and (f.ISDEBIT=0 and isnull(f.SETTLEMENT,0)=0) ' + sql = sql +' and (f.ISDEBIT=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' } else if (FEERANGE == '已对账未结算') { sql = sql + ' and (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' }if (FEERANGE == '未开票未结算') { @@ -7128,9 +7128,9 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { } else if (FEERANGE == '已结算未开票') { sql = sql + ' and (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 ) ' + sql = sql + ' and (isnull(f.INVOICE,0)<>0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' } else if (FEERANGE == '未开票未申请未结算') { - sql = sql + ' and (isnull(f.INVOICE,0)=0 and F.SETTLEMENT=0 and isnull(f.ORDERAMOUNT,0)=0) ' + sql = sql + ' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0) and isnull(f.ORDERAMOUNT,0)=0) ' }else if (FEERANGE == '未收未付') { sql = sql +' and 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 == '应收全部结算') { @@ -7142,7 +7142,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, { } else if (FEERANGE == '应付全部结算(含更改单)') { sql = sql + ' and EXISTS (select 1 from v_op_gain_sum_ttl WHERE v_op_gain_sum_ttl.BSNO=B.PARENTID AND v_op_gain_sum_ttl.STLTTLCR=v_op_gain_sum_ttl.TTLCR) ' } else if (FEERANGE == '未开票未作收费申请未结算') { - sql = sql +' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)=0 and isnull(f.ORDERAMOUNT,0)=0) ' + sql = sql +' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0) and isnull(f.ORDERAMOUNT,0)=0) ' } else if (FEERANGE == '已审核未结算') { sql = sql + ' and F.FEESTATUS IN (0,8,9) AND F.AMOUNT<>F.SETTLEMENT ' }