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

20240515

Browse Source
ShenZhenCHJY
ddlucky 7 months ago
parent d2feb07b3d
commit 25d2f8583b
7 changed files with 269 additions and 86 deletions
Show Stats Download Patch File Download Diff File

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

@ -29,6 +29,7 @@ using System.Configuration;
using System.Security.Cryptography;
using DSWeb.MvcShipping.DAL.MsCompanysDAL;
using DSWeb.MvcShipping.DAL.MsChFeeDAL;
using DSWeb.MvcShipping.DAL.MsInfoClient;
namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
{
@ -3868,7 +3869,23 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
return result;
}
public static DBResult GetRemarksData(List<Chfee_do_detail> bodyList, string companyid, string billno, string templatename = "",string invdate="")
public static string GetInvTempSubStr(string html, string startstr, string endstr)
{
var subhtml = html;
var htmllength = subhtml.Length;
var startindex = subhtml.IndexOf(startstr);
//if (startindex == -1 || startindex == 0) return "";
if (startindex == -1) return "";
subhtml = subhtml.Substring(startindex + startstr.Length - 1);
var endindex = subhtml.IndexOf(endstr);
if (endindex != -1 && endindex != 0)
subhtml = subhtml.Substring(0, endindex + 1);
return subhtml;
}
public static DBResult GetRemarksData(List<Chfee_do_detail> bodyList, string companyid, string billno, string templatename = "", string invdate = "", bool isapp = false)
{
var result = new DBResult();
if (templatename == "" || templatename == null) { templatename = "发票备注"; };
@ -3903,7 +3920,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
var INVGETNOWEXCHANGE = MsSysParamSetDAL.GetData("PARAMNAME='INVGETNOWEXCHANGE'").PARAMVALUE;
if (INVGETNOWEXCHANGE == "1")
{
var invratelist = MsChFeeDAL.GetFeeNowInvCurrList(invdate);
var invratelist = MsChFeeDAL.GetFeeNowInvCurrList(invdate, companyid);
if (invratelist != null)
{
foreach (var invrate in invratelist)
@ -3922,21 +3939,60 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
if (dsUserOp != null)
exrate = dsUserOp.Tables[0].Rows[0]["EXCHANGERATE"].ToString().Trim();
}
var CUSTBANK = "";
var ACCOUNT = "";
var CUSTNAME = "";
if (isapp)
{
var head2 = ChinvoiceapplicationDAL.GetData("BILLNO='" + billno + "'");
CUSTBANK = head2.CUSTBANK;
if (!string.IsNullOrEmpty(head2.ACTUALCUSTOMERNAME))
CUSTNAME = head2.ACTUALCUSTOMERNAME;
else
CUSTNAME = head2.CUSTOMERNAME;
}
else
{
var head = GetData("BILLNO='" + billno + "'");
CUSTBANK = head.CUSTBANK;
ACCOUNT = head.ACCOUNT;
if (!string.IsNullOrEmpty(head.ACTUALCUSTOMERNAME))
CUSTNAME = head.ACTUALCUSTOMERNAME;
else
CUSTNAME = head.CUSTOMERNAME;
}
decimal rmbttl = 0;
decimal usdttl = 0;
decimal Allrmbttl = 0;
decimal Allusdttl = 0;
var str = templatestr;
var str = GetInvTempSubStr(templatestr, "《", "》");
var strl = "";
if (!string.IsNullOrEmpty(str))
{
templatestr = templatestr.Replace(str, "《明细数据》");
str = str.Replace("《", "");
str = str.Replace("》", "");
str = str.Replace("\r\n", "\\");
str = str.Replace("\n", "\\");
str = str.Replace("\r", " ");
str = str.Replace("\r\n", "\\");
str = str.Replace("\n", "\\");
str = str.Replace("\r", " ");
}
string[] StrList = str.Split('\\');
var custbank = "";
var custaccount = "";
if (CUSTBANK != null)
{
string[] custbanklist = CUSTBANK.Trim().Split(' ');
if (custbanklist.Length == 2)
{
custbank = custbanklist[0];
custaccount = custbanklist[1];
}
}
using (var conn = db.CreateConnection())
{
conn.Open();
@ -3964,38 +4020,42 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
str = StrList[i];
if (str.IndexOf("[外币金额(总计)]") < 0 && str.IndexOf("[人民币金额(总计)]") < 0 && str.IndexOf("[折算汇率(总计)]") < 0)
{
str = str.Replace("[委托编号]", enumValue.CUSTNO);
str = str.Replace("[主提单号]", enumValue.MBLNO);
str = str.Replace("[分提单号]", enumValue.HBLNO);
str = str.Replace("[委托单位]", enumValue.CUSTOMERNAME);
str = str.Replace("[开船日期]", enumValue.ETD);
str = str.Replace("[揽货人]", enumValue.SALE);
str = str.Replace("[船名]", enumValue.VESSEL);
str = str.Replace("[航次]", enumValue.VOYNO);
str = str.Replace("[装货港]", enumValue.PORTLOAD);
str = str.Replace("[卸货港]", enumValue.PORTDISCHARGE);
str = str.Replace("[目的港]", enumValue.DESTINATION);
str = str.Replace("[集装箱]", enumValue.CNTRTOTAL);
str = str.Replace("[订舱编号]", enumValue.ORDERNO);
str = str.Replace("[外币金额]", usdttl.ToString("#0.00"));
str = str.Replace("[人民币金额]", rmbttl.ToString("#0.00"));
//if (dsUserOp != null)
str = str.Replace("[折算汇率]", exrate);
//else
// str = str.Replace("[折算汇率]", "");
str = str.Replace("[外币金额(总计)]", "");
str = str.Replace("[人民币金额(总计)]", "");
str = str.Replace("[折算汇率(总计)]", "");
str = str.Replace("[委托编号]", enumValue.CUSTNO);
str = str.Replace("[主提单号]", enumValue.MBLNO);
str = str.Replace("[分提单号]", enumValue.HBLNO);
str = str.Replace("[委托单位]", enumValue.CUSTOMERNAME);
str = str.Replace("[订舱编号]", enumValue.ORDERNO);
str = str.Replace("[开船日期]", enumValue.ETD);
str = str.Replace("[揽货人]", enumValue.SALE);
str = str.Replace("[船名]", enumValue.VESSEL);
str = str.Replace("[航次]", enumValue.VOYNO);
str = str.Replace("[装货港]", enumValue.PORTLOAD);
str = str.Replace("[卸货港]", enumValue.PORTDISCHARGE);
str = str.Replace("[目的港]", enumValue.DESTINATION);
str = str.Replace("[集装箱]", enumValue.CNTRTOTAL);
str = str.Replace("[订舱编号]", enumValue.ORDERNO);
str = str.Replace("[业务发票号]", enumValue.INVNO);
str = str.Replace("[购方银行]", "");
str = str.Replace("[购方账号]", "");
str = str.Replace("[销方银行]", "");
str = str.Replace("[外币金额]", usdttl.ToString("#0.00"));
str = str.Replace("[人民币金额]", rmbttl.ToString("#0.00"));
//if (dsUserOp != null)
str = str.Replace("[折算汇率]", exrate);
//else
// str = str.Replace("[折算汇率]", "");
str = str.Replace("[外币金额(总计)]", "");
str = str.Replace("[人民币金额(总计)]", "");
str = str.Replace("[折算汇率(总计)]", "");
//if (strl == "") strl = str + Environment.NewLine;
//else strl = strl + str + Environment.NewLine;
if (strl == "") strl = str + " ";
else strl = strl + str + " ";
//if (strl == "") strl = str + Environment.NewLine;
//else strl = strl + str + Environment.NewLine;
if (strl == "") strl = str +" ";
else strl = strl + str +" ";
}
}
//rmbttl = rmbttl + enumValue.AMOUNT;
//if (enumValue.ORIGCURRENCY != "RMB")
@ -4003,40 +4063,89 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
}
}
for (var i = 0; i <= StrList.Length - 1; i++)
//for (var i = 0; i <= StrList.Length - 1; i++)
//{
// str = StrList[i];
// if (str.IndexOf("[购方银行]") >= 0 || str.IndexOf("[购方账号]") >= 0 || str.IndexOf("[销方银行]") >= 0 || str.IndexOf("[外币金额(总计)]") >=0|| str.IndexOf("[人民币金额(总计)]") >= 0 && str.IndexOf("[折算汇率(总计)]") >= 0)
// {
// str = str.Replace("[委托编号]", "");
// str = str.Replace("[主提单号]", "");
// str = str.Replace("[委托单位]", "");
// str = str.Replace("[开船日期]", "");
// str = str.Replace("[订舱编号]", "");
// str = str.Replace("[揽货人]", "");
// str = str.Replace("[船名]", "");
// str = str.Replace("[航次]", "");
// str = str.Replace("[装货港]", "");
// str = str.Replace("[卸货港]", "");
// str = str.Replace("[目的港]", "");
// str = str.Replace("[外币金额]", "");
// str = str.Replace("[人民币金额]", "");
// str = str.Replace("[折算汇率]", "");
// str = str.Replace("[购方银行]", custbank);
// str = str.Replace("[购方账号]", custaccount);
// str = str.Replace("[销方银行]", ACCOUNT);
// str = str.Replace("[外币金额(总计)]", Allusdttl.ToString("#0.00"));
// str = str.Replace("[人民币金额(总计)]", Allrmbttl.ToString("#0.00"));
// //if (dsUserOp != null)
// // str = str.Replace("[折算汇率(总计)]", dsUserOp.Tables[0].Rows[0]["EXCHANGERATE"].ToString().Trim());
// //else
// // str = str.Replace("[折算汇率(总计)]", "");
// str = str.Replace("[折算汇率(总计)]", exrate);
// if (str.Trim() != "")
// strl = strl + str + " ";
// }
//}
templatestr = templatestr.Replace("《明细数据》", strl);
templatestr = templatestr.Replace("[购方银行]", custbank);
templatestr = templatestr.Replace("[购方账号]", custaccount);
templatestr = templatestr.Replace("[销方银行]", ACCOUNT);
templatestr = templatestr.Replace("[外币金额(总计)]", Allusdttl.ToString("#0.00"));
templatestr = templatestr.Replace("[人民币金额(总计)]", Allrmbttl.ToString("#0.00"));
//if (dsUserOp != null)
// str = str.Replace("[折算汇率(总计)]", dsUserOp.Tables[0].Rows[0]["EXCHANGERATE"].ToString().Trim());
//else
// str = str.Replace("[折算汇率(总计)]", "");
templatestr = templatestr.Replace("[折算汇率(总计)]", exrate);
var BANKLIST = MsInfoClientDAL.GetBankList(" LINKID in (select GID FROM info_client where SHORTNAME='" + CUSTNAME + "')");
var isusd = false;
var isrmb = false;
if (BANKLIST != null && BANKLIST.Count != 0)
{
str = StrList[i];
if (str.IndexOf("[外币金额(总计)]") >=0|| str.IndexOf("[人民币金额(总计)]") >= 0 && str.IndexOf("[折算汇率(总计)]") >= 0)
foreach (var bank in BANKLIST)
{
str = str.Replace("[委托编号]", "");
str = str.Replace("[主提单号]", "");
str = str.Replace("[委托单位]", "");
str = str.Replace("[开船日期]", "");
str = str.Replace("[揽货人]", "");
str = str.Replace("[船名]", "");
str = str.Replace("[航次]", "");
str = str.Replace("[装货港]", "");
str = str.Replace("[卸货港]", "");
str = str.Replace("[目的港]", "");
str = str.Replace("[外币金额]", "");
str = str.Replace("[人民币金额]", "");
str = str.Replace("[折算汇率]", "");
str = str.Replace("[外币金额(总计)]", Allusdttl.ToString("#0.00"));
str = str.Replace("[人民币金额(总计)]", Allrmbttl.ToString("#0.00"));
//if (dsUserOp != null)
// str = str.Replace("[折算汇率(总计)]", dsUserOp.Tables[0].Rows[0]["EXCHANGERATE"].ToString().Trim());
//else
// str = str.Replace("[折算汇率(总计)]", "");
str = str.Replace("[折算汇率(总计)]", exrate);
if (str.Trim() != "")
strl = strl + str + " ";
if (!isusd && bank.CURRENCY == "USD")
{
templatestr = templatestr.Replace("[购方USD银行]", bank.BANKNAME);
templatestr = templatestr.Replace("[购方USD账号]", bank.ACCOUNT);
isusd = true;
}
if (!isrmb && bank.CURRENCY == "RMB")
{
templatestr = templatestr.Replace("[购方RMB银行]", bank.BANKNAME);
templatestr = templatestr.Replace("[购方RMB账号]", bank.ACCOUNT);
isrmb = true;
}
}
}
}
if (!isusd)
{
templatestr = templatestr.Replace("[购方USD银行]", "");
templatestr = templatestr.Replace("[购方USD账号]", "");
}
if (!isrmb)
{
templatestr = templatestr.Replace("[购方RMB银行]", "");
templatestr = templatestr.Replace("[购方RMB账号]", "");
isrmb = true;
}
result.Data = result.Data + strl;
result.Data = result.Data + templatestr;
tran.Commit();
}
@ -4057,12 +4166,11 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice
return result;
}
#endregion
#region 导出发票
public static string CreateInvList(List<ChInvoice> headList, string path)
{

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

@ -552,7 +552,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE");
strSql.Append(",b.DOC,b.SALE");
strSql.Append(",b.DOC,b.SALE,b.INVNO");
strSql.Append(",f.Remark Remark,f.INPUTMODE ");
strSql.Append(" FROM ch_fee_do c");
strSql.Append(" left join v_op_bill b on (b.bsno=c.bsno)");
@ -586,7 +586,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE");
strSql.Append(",b.DOC,b.SALE");
strSql.Append(",b.DOC,b.SALE,b.INVNO");
strSql.Append(",'' Remark,'' INPUTMODE ");
strSql.Append(" FROM ch_fee_do c");
strSql.Append(" left join v_op_bill b on (b.bsno=c.bsno)");
@ -599,7 +599,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.DESTINATION,b.INPUTBY,b.OP,b.CUSTSERVICE");
strSql.Append(",b.DOC,b.SALE");
strSql.Append(",b.DOC,b.SALE,b.INVNO");
return BodySetData(strSql);
}
@ -659,6 +659,10 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Invoice_HangXin
data.Remark = Convert.ToString(reader["Remark"]);
data.INPUTMODE = Convert.ToString(reader["INPUTMODE"]);
data.ORDERNO = Convert.ToString(reader["ORDERNO"]);
data.INVNO = Convert.ToString(reader["INVNO"]);
#endregion
headList.Add(data);
}

15
DSWeb/Areas/Account/Models/Chfee_do_detail/Chfee_do_detail.cs
Unescape Escape View File

@ -346,6 +346,21 @@ namespace DSWeb.Areas.Account.Models.Chfee_do_detail
public decimal FAMOUNT { get; set; }
public decimal RMBAMOUNT { get; set; }
public decimal USDAMOUNT { get; set; }
public decimal TaxUnitPrice { get; set; }
public decimal Quantity { get; set; }
public decimal TaxRate { get; set; }
public decimal Tax { get; set; }
public string INVNO { get; set; }
public bool ISOPEN { get; set; }
#endregion

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

@ -3416,7 +3416,7 @@ namespace DSWeb.MvcShipping.DAL.MsChFeeDAL
}
public static List<MsFeeCurr> GetFeeNowInvCurrList(string invdate="")
public static List<MsFeeCurr> GetFeeNowInvCurrList(string invdate = "", string companyid = "")
{
var currdate = DateTime.Now;
var evList = new List<MsFeeCurr>();

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

@ -913,27 +913,46 @@ namespace DSWeb.Areas.MvcShipping.DAL.MsOp_BLISSUE
var strSql = new StringBuilder();
strSql.Append(" update OP_BLISSUEList set ");
strSql.Append(" RMBNODR= ");
strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR from v_op_gain_billcustomer ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR from v_op_gain_cust_sum ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') and CUSTOMERNAME='"+ headdata.CUSTOMERNAME + "' ), ");
strSql.Append(" USDNODR= ");
strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR from v_op_gain_billcustomer ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR from v_op_gain_cust_sum ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') and CUSTOMERNAME='"+ headdata.CUSTOMERNAME + "' ), ");
strSql.Append(" TTLNODR= ");
strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR from v_op_gain_billcustomer ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR from v_op_gain_cust_sum ");
strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') and CUSTOMERNAME='"+ headdata.CUSTOMERNAME + "' ), ");
strSql.Append(" RMBNODR_ALL= ");
strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR_ALL from v_op_gain_billcustomer ");
strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR_ALL from v_op_gain_cust_sum ");
strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "'), ");
strSql.Append(" USDNODR_ALL= ");
strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR_ALL from v_op_gain_billcustomer ");
strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR_ALL from v_op_gain_cust_sum ");
strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "'), ");
strSql.Append(" TTLNODR_ALL= ");
strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR_ALL from v_op_gain_billcustomer ");
strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR_ALL from v_op_gain_cust_sum ");
strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "') ");
//strSql.Append(" RMBNODR= ");
//strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR from v_op_gain_billcustomer ");
//strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
//strSql.Append(" USDNODR= ");
//strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR from v_op_gain_billcustomer ");
//strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
//strSql.Append(" TTLNODR= ");
//strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR from v_op_gain_billcustomer ");
//strSql.Append(" where BSNO in(select BSNO from OP_BLISSUEList_detail where linkgid='" + GID + "') ), ");
//strSql.Append(" RMBNODR_ALL= ");
//strSql.Append(" (select sum(RMBDR-STLRMBDR) RMBNODR_ALL from v_op_gain_billcustomer ");
//strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "'), ");
//strSql.Append(" USDNODR_ALL= ");
//strSql.Append(" (select sum(USDDR-STLUSDDR) USDNODR_ALL from v_op_gain_billcustomer ");
//strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "'), ");
//strSql.Append(" TTLNODR_ALL= ");
//strSql.Append(" (select sum(TTLDR-STLTTLDR) TTLNODR_ALL from v_op_gain_billcustomer ");
//strSql.Append(" where CUSTOMERNAME='" + headdata.CUSTOMERNAME + "') ");
strSql.Append(" where GID='"+GID+"' ");
var _count = 0;
Database db = DatabaseFactory.CreateDatabase();

45
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js
Unescape Escape View File

@ -1584,7 +1584,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
}
}
}
}, this.comboxCARRIER,{
}, this.comboxCARRIER,{
xtype: 'button',
flex:0.4,
text: "执行查询",
@ -1644,14 +1644,45 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
}
}
, this.comboxISEI
, { xtype: 'hiddenfield', flex: 0.8 }
, { xtype: 'hiddenfield', flex: 0.79 }
]
}, {
xtype: 'container',
layout: 'hbox',
defaultType: 'textfield',
items: [
{
fieldLabel: 'ETD',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ATDbgn',
enableKeyEvents: true,
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
}, {
fieldLabel: '到',
format: 'Y-m-d',
xtype: 'datefield',
name: 'ATDend',
enableKeyEvents: true,
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.onRefreshClick();
}
}
}
}
, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 1 }
, { xtype: 'hiddenfield', flex: 0.79 }
]
}
@ -1861,7 +1892,7 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
this.panelTop = new Ext.Panel({
layout: "border",
region: "north",
height: 105,
height: 128,
items: [this.panelBtn, this.formSearch]
});
@ -2794,6 +2825,12 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
var ETDend = form.findField('ETDend').getRawValue();
sql = sql + getAndConSql(sql, ETDend, "B.ETD <='" + ETDend + "'");
//ETD
var ATDbgn = form.findField('ATDbgn').getRawValue();
sql = sql + getAndConSql(sql, ATDbgn, "B.ATD >='" + ATDbgn + "'");
var ATDend = form.findField('ATDend').getRawValue();
sql = sql + getAndConSql(sql, ATDend, "B.ATD <='" + ATDend + "'");
// //会计期间
// var ACCDATE = form.findField('ACCDATE').getRawValue();

2
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml
Unescape Escape View File

@ -12,7 +12,7 @@
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ExcludeApp_Data>false</ExcludeApp_Data>
<publishUrl>D:\DS7Deploy</publishUrl>
<publishUrl>E:\CHJY_DS7Deploy</publishUrl>
<DeleteExistingFiles>true</DeleteExistingFiles>
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>

Write Preview
Loading…
Cancel
Save