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

1

Browse Source
main
hanxuntao 3 months ago
parent 24149476b4
commit 7c13dc0685
13 changed files with 559 additions and 536 deletions
Show Stats Download Patch File Download Diff File

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

@ -945,7 +945,7 @@ namespace DSWeb.Areas.Dispatch.Helper
Auditexecute.processInstanceId = instanceId; Auditexecute.processInstanceId = instanceId;
Auditexecute.operatingUserId = user.DingTalkAccount; Auditexecute.operatingUserId = user.DingTalkAccount;
Auditexecute.isSystem = false; Auditexecute.isSystem = false;
Auditexecute.remark = ""; //Auditexecute.remark = "";
jsonObj = Auditexecute; jsonObj = Auditexecute;
@ -1569,7 +1569,7 @@ namespace DSWeb.Areas.Dispatch.Helper
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
public string remark { get; set; } //public string remark { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>

4
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeEdiController.cs
Unescape Escape View File

@ -1464,7 +1464,7 @@ namespace DSWeb.MvcShipping.Controllers
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME='大简云舱单'", Convert.ToString(Session["COMPANYID"])); 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) if(result.Success)
@ -1937,7 +1937,7 @@ namespace DSWeb.MvcShipping.Controllers
} }
var result = new DBResult(); var result = new DBResult();
var ftpset = MsCodeFtpSetDAL.GetData("EDINAME=''", Convert.ToString(Session["COMPANYID"])); 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), "", "直发舱单_分单", "结果"); BasicDataRefDAL.SaveLog(JsonConvert.Serialize(result), "", "直发舱单_分单", "结果");
//增加费用 //增加费用

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

@ -2025,16 +2025,19 @@ namespace DSWeb.MvcShipping.Controllers
//} //}
var strSql = new StringBuilder(); var strSql = new StringBuilder();
strSql.Append("select * from ("); //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(" 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(" 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(" 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.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(" 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(" 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(" 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(" 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(" 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)) if (!string.IsNullOrEmpty(condition))
{ {

6
DSWeb/Areas/MvcShipping/DAL/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceDAL.cs
Unescape Escape View File

@ -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.OPERATOR) as OPERATORNAME");
strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME"); strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME");
strSql.Append(",dbo.GetFeeNoStlByInvNo(cm.BILLNO) as NOSTL,FEEAMOUNT "); 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 "); strSql.Append(" FROM ch_fee_invoice cm where 1=1 ");
if (!string.IsNullOrEmpty(strCondition)) 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.OPERATOR) as OPERATORNAME");
strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME"); strSql.Append(",(select ShowName from [user] where GID=cm.DELETEOPERATOR) as DELOPERATORNAME");
strSql.Append(",dbo.GetFeeNoStlByInvNo(cm.BILLNO) as NOSTL,FEEAMOUNT "); 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 "); strSql.Append(" FROM ch_fee_invoice cm where 1=1 ");
if (!string.IsNullOrEmpty(strCondition)) if (!string.IsNullOrEmpty(strCondition))
{ {

8
DSWeb/Areas/MvcShipping/DAL/MsOpSeaeEdi/MsOpSeaeEdiDAL.cs
Unescape Escape View File

@ -7463,7 +7463,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
/// <param name="ftpset"></param> /// <param name="ftpset"></param>
/// <param name="remarks"></param> /// <param name="remarks"></param>
/// <returns></returns> /// <returns></returns>
public static DBResult CreateCustomList(List<MsOpSeae> billList, string userid, string usercode, string companyid, string path, string companyname, string dcarrier, int iscvessel, CodeFtpSet ftpset, string remarks) public static DBResult CreateCustomList(List<MsOpSeae> 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 result = new DBResult();
var companydef = DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.GetCompanyDef(companyid); var companydef = DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.GetCompanyDef(companyid);
@ -7498,7 +7498,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
email = user.EMAIL1; email = user.EMAIL1;
} }
var mailbody = "公司名称：" + companyname + "\r\n" + "申请人：" + usercode + "\r\n" + "邮箱：" + email 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"; //string toNames = "frank,lee";
var MAILTONAME = "admin@dongshengsoft.com"; var MAILTONAME = "admin@dongshengsoft.com";
@ -11116,7 +11116,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiDAL
#region 直发舱单_分单 #region 直发舱单_分单
//public static DBResult CreateCustomListBill_HBLNO(List<MsOpSeaeBill> 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<MsOpSeaeBill> 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<MsOpSeae> headList, List<MsOpSeaeManifest> 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<MsOpSeae> headList, List<MsOpSeaeManifest> 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 result = new DBResult();
var companydef = DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL.MsOpSeaeEdiPortDAL.GetCompanyDef(companyid); 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 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(DONGSHENGMAILADDR, MAILTONAME, "", "", mailtopic, mailbody, false);
// SendEmail se = new SendEmail("dev001@dongshengsoft.com", "admin@dongshengsoft.com", "", "", mailtopic, mailbody, false); // SendEmail se = new SendEmail("dev001@dongshengsoft.com", "admin@dongshengsoft.com", "", "", mailtopic, mailbody, false);

9
DSWeb/Areas/MvcShipping/Viewsjs/MsChFeeYsAutoDui/MsChFeeYsAutoDuiEdit.js
Unescape Escape View File

@ -646,7 +646,10 @@ Ext.extend(Shipping.MsChFeeYsAutoDuiEdit, Ext.Panel, {
this.storeFeiYongZhuangTai.add({ "DC": "17", "NAME": "仅未开票未收款" }); this.storeFeiYongZhuangTai.add({ "DC": "17", "NAME": "仅未开票未收款" });
this.storeFeiYongZhuangTai.add({ "DC": "18", "NAME": "仅已付款未收发票" }); this.storeFeiYongZhuangTai.add({ "DC": "18", "NAME": "仅已付款未收发票" });
this.storeFeiYongZhuangTai.add({ "DC": "19", "NAME": "仅已收发票未付款" }); this.storeFeiYongZhuangTai.add({ "DC": "19", "NAME": "仅已收发票未付款" });
this.storeFeiYongZhuangTai.add({ "DC": "20", "NAME": "未开票未结算费用已审核费用" });
this.comboxFeiYongZhuangTai = Ext.create('DsExt.ux.RefTableCombox', { this.comboxFeiYongZhuangTai = Ext.create('DsExt.ux.RefTableCombox', {
fieldLabel: "费用状态", fieldLabel: "费用状态",
store: this.storeFeiYongZhuangTai, 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)<ISNULL(C.INVOICE,0))) "); 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)<ISNULL(C.INVOICE,0))) ");
} else if (FeiYongZhuangTai == "19") { } else if (FeiYongZhuangTai == "19") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) "); sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) ");
} else if (FeiYongZhuangTai == "20") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " ISNULL(C.SETTLEMENT,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)<ISNULL(C.INVOICE,0))) "); 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)<ISNULL(C.INVOICE,0))) ");
} else if (FeiYongZhuangTai == "19") { } else if (FeiYongZhuangTai == "19") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) "); sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) ");
} else if (FeiYongZhuangTai == "20") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " ISNULL(C.SETTLEMENT,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)<ISNULL(C.INVOICE,0))) "); 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)<ISNULL(C.INVOICE,0))) ");
} else if (FeiYongZhuangTai == "19") { } else if (FeiYongZhuangTai == "19") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) "); sql = sql + getAndConSql(sql, FeiYongZhuangTai, " C.FEETYPE=2 AND ISNULL(C.INVOICE,0)<>0 AND ((C.AMOUNT>0 and ISNULL(C.INVOICE,0)>ISNULL(C.SETTLEMENT,0)) or (C.AMOUNT<0 and ISNULL(C.INVOICE,0)<ISNULL(C.SETTLEMENT,0))) ");
} else if (FeiYongZhuangTai == "20") {
sql = sql + getAndConSql(sql, FeiYongZhuangTai, " ISNULL(C.SETTLEMENT,0)<>C.AMOUNT AND ISNULL(C.INVOICE,0)<>C.AMOUNT AND F.FEESTATUS IN (0,8) ");
} }
} }

12
DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoice/MsCwVouchersGlInvoiceIndex.js
Unescape Escape View File

@ -863,18 +863,18 @@ Ext.extend(Shipping.MsCwVouchersGlInvoiceIndex, Ext.Panel, {
//凭证状态 //凭证状态
var ISVOUNO = form.findField('ISVOUNO').getValue(); var ISVOUNO = form.findField('ISVOUNO').getValue();
if (ISVOUNO == "未生成") { 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 == "已生成") { 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(); 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; return sql;
}, },

12
DSWeb/Areas/MvcShipping/Viewsjs/MsCwVouchersGlInvoiceHeXiao/MsCwVouchersGlInvoiceHeXiaoIndex.js
Unescape Escape View File

@ -767,18 +767,18 @@ Ext.extend(Shipping.MsCwVouchersGlInvoiceHeXiaoIndex, Ext.Panel, {
//凭证状态 //凭证状态
var ISVOUNO = form.findField('ISVOUNO').getValue(); var ISVOUNO = form.findField('ISVOUNO').getValue();
if (ISVOUNO == "未生成") { 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 == "已生成") { 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(); 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; return sql;
}, },

2
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/HistryOpSeaeIndex.js
Unescape Escape View File

@ -933,7 +933,7 @@ Ext.extend(Shipping.HistryOpSeaeIndex, Ext.Panel, {
parentWin.formEdit.getForm().findField('VESSELID').setValue(record.data.VESSELID); parentWin.formEdit.getForm().findField('VESSELID').setValue(record.data.VESSELID);
parentWin.formEdit.getForm().findField('HSCODE').setValue(record.data.HSCODE); parentWin.formEdit.getForm().findField('HSCODE').setValue(record.data.HSCODE);
parentWin.formEdit.getForm().findField('ISSUEPLACEID').setValue(record.data.ISSUEPLACEID); 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({ Ext.Ajax.request({
waitMsg: '正在查询主表数据...', //'正在查询主表数据...', waitMsg: '正在查询主表数据...', //'正在查询主表数据...',
url: '/MvcShipping/MsOpSeae/GetAmsData', url: '/MvcShipping/MsOpSeae/GetAmsData',

13
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeaeModule/MsOpSeaeModuleIndex.js
Unescape Escape View File

@ -316,7 +316,11 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
layout: 'hbox', layout: 'hbox',
flex: 1, flex: 1,
defaultType: 'textfield', defaultType: 'textfield',
items: [{ items: [{
fieldLabel: '航次',
name: 'VOYNO',
// flex: 1.5
}, {
fieldLabel: '装货港', fieldLabel: '装货港',
name: 'PORTLOAD', name: 'PORTLOAD',
// flex: 1.5 // flex: 1.5
@ -612,9 +616,10 @@ Ext.extend(Shipping.MsOpSeaeModuleIndex, Ext.Panel, {
var selections = this.gridList.getSelectionModel().getSelection(); var selections = this.gridList.getSelectionModel().getSelection();
for (var i in selections) { for (var i in selections) {
var record = selections[i]; var record = selections[i];
parentWin.formEdit.getForm().findField('SHIPPER').setValue(record.data.SHIPPER); //parentWin.formEdit.getForm().findField('SHIPPER').setValue(record.data.SHIPPER);
parentWin.formEdit.getForm().findField('CONSIGNEE').setValue(record.data.CONSIGNEE); //parentWin.formEdit.getForm().findField('CONSIGNEE').setValue(record.data.CONSIGNEE);
parentWin.formEdit.getForm().findField('NOTIFYPARTY').setValue(record.data.NOTIFYPARTY); //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('MARKS').setValue(record.data.MARKS);
parentWin.formEdit.getForm().findField('DESCRIPTION').setValue(record.data.DESCRIPTION); parentWin.formEdit.getForm().findField('DESCRIPTION').setValue(record.data.DESCRIPTION);
parentWin.formEdit.getForm().findField('PORTLOADID').setValue(record.data.PORTLOADID); parentWin.formEdit.getForm().findField('PORTLOADID').setValue(record.data.PORTLOADID);

34
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUESPIndex.js
Unescape Escape View File

@ -539,7 +539,33 @@ Ext.extend(Shipping.MsOp_BLISSUESPIndex, Ext.Panel, {
fieldLabel: '提单号', fieldLabel: '提单号',
name: 'MBLNO' name: 'MBLNO'
}, this.comboxCustCode, this.comboxBLSTATUS }, 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', xtype: 'container',
layout: 'hbox', 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 + "')) "); 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(); var BLSTATUS = form.findField('BLSTATUS').getValue();

952
DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptCdTotalIndex.js
View File

File diff suppressed because it is too large Load Diff

16
DSWeb/Areas/MvcShipping/Viewsjs/MsRptNoTotal/MsRptNoTotalIndex.js
Unescape Escape View File

@ -7075,11 +7075,11 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
} if (FEERANGE == '未申请未结算') { } if (FEERANGE == '未申请未结算') {
sql = ' (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 ' sql = ' (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 '
} else if (FEERANGE == '未对账未结算') { } 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 == '已对账未结算') { } else if (FEERANGE == '已对账未结算') {
sql = ' (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' sql = ' (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) '
} else if (FEERANGE == '未开票未结算') { } 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 == '已结算未开票') { } 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)<>0) '
} else if (FEERANGE == '已审核未结算') { } else if (FEERANGE == '已审核未结算') {
@ -7088,9 +7088,9 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
if (FEERANGE == '未收未付') { 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) ' 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 == '已开票未结算') { } 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 == '未开票未申请未结算') { } 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 == '应收全部结算') { } 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) ' 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 == '应付全部结算') { } else if (FEERANGE == '应付全部结算') {
@ -7120,7 +7120,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
} if (FEERANGE == '未申请未结算') { } if (FEERANGE == '未申请未结算') {
sql = sql +' and (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 ' sql = sql +' and (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 '
} if (FEERANGE == '未对账未结算') { } 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 == '已对账未结算') { } else if (FEERANGE == '已对账未结算') {
sql = sql + ' and (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) ' sql = sql + ' and (f.ISDEBIT=1 and isnull(f.SETTLEMENT,0)<>isnull(f.AMOUNT,0)) '
}if (FEERANGE == '未开票未结算') { }if (FEERANGE == '未开票未结算') {
@ -7128,9 +7128,9 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
} else if (FEERANGE == '已结算未开票') { } else if (FEERANGE == '已结算未开票') {
sql = sql + ' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>0) ' sql = sql + ' and (isnull(f.INVOICE,0)=0 and isnull(f.SETTLEMENT,0)<>0) '
} else if (FEERANGE == '已开票未结算') { } 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 == '未开票未申请未结算') { } 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 == '未收未付') { }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) ' 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 == '应收全部结算') { } else if (FEERANGE == '应收全部结算') {
@ -7142,7 +7142,7 @@ Ext.extend(Shipping.MsRptNoTotalIndex, Ext.Panel, {
} else if (FEERANGE == '应付全部结算(含更改单)') { } 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) ' 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 == '未开票未作收费申请未结算') { } 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 == '已审核未结算') { } else if (FEERANGE == '已审核未结算') {
sql = sql + ' and F.FEESTATUS IN (0,8,9) AND F.AMOUNT<>F.SETTLEMENT ' sql = sql + ' and F.FEESTATUS IN (0,8,9) AND F.AMOUNT<>F.SETTLEMENT '
} }

Write Preview
Loading…
Cancel
Save