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

'20221021-1'

Browse Source
临时发布20240103
ddlucky 2 years ago
parent 1c365a08d7
commit 386d2def9e
22 changed files with 564 additions and 88 deletions
Show Stats Download Patch File Download Diff File

2
DSWeb/Areas/Account/Controllers/Chfee_ForeignsettlementController.cs
Unescape Escape View File

@ -200,7 +200,7 @@ namespace DSWeb.Areas.Account.Controllers
public ContentResult GetBillDataList(int start, int limit, string sort, string condition, int billtype)
{
var dataList = ChsettlementDAL.GetAddBillList(condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort, billtype);
var dataList = ChsettlementDAL.GetAddBillList(start, limit, condition, Convert.ToString(Session["USERID"]), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort, billtype);
// var list = dataList.Skip(start).Take(limit);
var json = JsonConvert.Serialize(
new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });

19
DSWeb/Areas/Account/Controllers/Chfee_settlementController.cs
Unescape Escape View File

@ -194,9 +194,11 @@ namespace DSWeb.Areas.Account.Controllers
var dataListStr = ChsettlementDAL.GetBodyListStr(condition, sort);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", data = dataListStr });
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", Data = dataListStr });
return new ContentResult() { Content = json };
}
public ContentResult GetBillListPage(int start, int limit, string condition, string sort)
{
var dataList = ChsettlementDAL.GetBodyList(start, limit, condition, sort);
@ -224,19 +226,26 @@ namespace DSWeb.Areas.Account.Controllers
new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
return new ContentResult() { Content = json };
}
//付费结算-自由结算 编辑页面左下方得待添加业务明细
public ContentResult GetBillDataList(int start, int limit, string sort, string condition, int billtype)
{
var dataList = ChsettlementDAL.GetAddBillList(condition, CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort, billtype);
// var list = dataList.Skip(start).Take(limit);
var dataList = ChsettlementDAL.GetAddBillList(start,limit,condition, CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort, billtype);
// var list = dataList.Skip(start).Take(limit);
var totalCount = ChsettlementDAL.getAddBillDataTotalCount(condition, CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), billtype);
var json = JsonConvert.Serialize(
new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });
new { Success = true, Message = "查询成功", totalCount = totalCount, data = dataList.ToList() });
return new ContentResult() { Content = json };
}
public ContentResult GetFeeDetailList(string sort, string condition)
{
var dataList = ChsettlementDAL.GetFeeDetailList(condition, CookieConfig.GetCookie_UserId(Request), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]), sort);
//var list = dataList.Skip(start).Take(limit);
var json = JsonConvert.Serialize(
new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });

233
DSWeb/Areas/Account/DAL/Chfee_settlement/Chfee_SettlementDAL.cs
Unescape Escape View File

@ -33,6 +33,7 @@ using DSWeb.MvcShipping.DAL.MsSysParamSet;
using System.Data.SqlClient;
using DSWeb.Common.DB;
using System.Linq;
using DSWeb.MvcShipping.Models.SysBillType;
namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
{
@ -811,9 +812,9 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
#region 添加列表
static public List<BillCustDetail> GetAddBillList(string strCondition, string userid, string usercode, string orgcode, string sort, int billtype)
static public List<BillCustDetail> GetAddBillList(int start,int limit, string strCondition, string userid, string usercode, string orgcode, string sort, int billtype)
{
/*
var rangstr = "";
if (billtype == 2)
@ -863,9 +864,26 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
}
var strSql = new StringBuilder();
strSql.Append("SELECT ");
//strSql.Append("SELECT ");
strSql.Append(@"SELECT * from (SELECT row_number() over (");
var sortstring = DatasetSort.Getsortstring(sort);
if (!string.IsNullOrEmpty(sortstring))
{
strSql.Append(" order by " + sortstring);
}
else
{
strSql.Append(" order by b.BsNo ");
}
strSql.Append(@") as num , ");
strSql.Append("b.BSNO,b.OPLB,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO");
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
@ -903,23 +921,222 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.OPTYPE");
strSql.Append(",b.DOC,b.SALE,b.ENTERP,b.CUSTOMNO,f.CUSTOMERNAME,B.CORPID");
strSql.Append(@")as t ");
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit));
*/
//
//var sortstring = DatasetSort.Getsortstring(sort);
var sortstring = DatasetSort.Getsortstring(sort);
//if (!string.IsNullOrEmpty(sortstring))
//{
// sortstring = sortstring.Replace("FEEOBJNAME", "F.CUSTOMERNAME");
// strSql.Append(" order by " + sortstring);
//}
//else
//{
// strSql.Append(" order by b.BsNo");
//}
var strSql = new StringBuilder();
//strSql.Append("SELECT ");
strSql.Append(@"SELECT * from (SELECT row_number() over (");
var sortstring = DatasetSort.Getsortstring(sort);
if (!string.IsNullOrEmpty(sortstring))
{
sortstring = sortstring.Replace("FEEOBJNAME", "F.CUSTOMERNAME");
strSql.Append(" order by " + sortstring);
}
else
{
strSql.Append(" order by b.BsNo");
strSql.Append(" order by b.BsNo ");
}
strSql.Append(@") as num , ");
GetAddBillDataSqlstr(ref strSql, strCondition, userid, usercode, orgcode, billtype);
strSql.Append(@")as t ");
strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit));
return SetAddBillData(strSql);
}
private static void GetAddBillDataSqlstr(ref StringBuilder strSql, string strCondition, string userid, string usercode, string orgcode, int billtype)//, int start, int limit
{
var rangstr = "";
if (billtype == 2)
rangstr = GetRangDAStr("modPaySettlementSearch", userid, usercode, orgcode);
else if (billtype == 1)
rangstr = GetRangDAStr("modRecvSettleSearch", userid, usercode, orgcode);
if (!string.IsNullOrEmpty(rangstr))
{
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstr;
}
else
{
strCondition = rangstr;
}
}
var PAYUSEFEERANGE = MsSysParamSetDAL.GetData("PARAMNAME='STLFEERANGE'");
if (PAYUSEFEERANGE.PARAMVALUE == "1")
{
var rangstrfee = GetRangAddFeeDAStr(userid, usercode, orgcode);
if (!string.IsNullOrEmpty(rangstrfee))
{
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstrfee;
}
else
{
strCondition = rangstrfee;
}
}
}
if (billtype == 2)
{
var PaySettlMustBeFeeLock = MsSysParamSetDAL.GetData("PARAMNAME='PaySettlMustBeFeeLock'");
if (PaySettlMustBeFeeLock.PARAMVALUE == "1")
{
strCondition = strCondition + " and ((b.OPLBNAME='海运出口' and B.FEESTATUS=1) or b.OPLBNAME<>'海运出口') ";
}
}
//var strSql = new StringBuilder();
////strSql.Append("SELECT ");
//strSql.Append(@"SELECT * from (SELECT row_number() over (");
//var sortstring = DatasetSort.Getsortstring(sort);
//if (!string.IsNullOrEmpty(sortstring))
//{
// strSql.Append(" order by " + sortstring);
//}
//else
//{
// strSql.Append(" order by b.BsNo ");
//}
//strSql.Append(@") as num , ");
strSql.Append("b.BSNO,b.OPLB,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO");
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.OPTYPE");
strSql.Append(",b.DOC,b.SALE,b.ENTERP,b.CUSTOMNO");
strSql.Append(",F.CUSTOMERNAME AS CUSTNAME ");
strSql.Append(",isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN ISNULL(AMOUNT,0) ELSE 0 END) ELSE 0 END),0) AS RMBCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) ELSE 0 END) ELSE 0 END),0) AS BALRMBDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALRMBCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN ISNULL(AMOUNT,0) ELSE 0 END)ELSE 0 END),0) AS USDCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE ISNULL(AMOUNT,0) END) END)ELSE 0 END),0) AS OTCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN 0 ELSE (CASE CURRENCY WHEN 'RMB' THEN 0 ELSE f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0) END) END) ELSE 0 END),0) AS BALOTCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'USD' THEN f.AMOUNT-ISNULL(INVOICE,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDINVDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'USD' THEN f.AMOUNT-ISNULL(INVOICE,0) ELSE 0 END)ELSE 0 END),0) AS BALUSDINVCR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 1 THEN (CASE CURRENCY WHEN 'RMB' THEN f.AMOUNT-ISNULL(INVOICE,0) ELSE 0 END)ELSE 0 END),0) AS BALRMBINVDR,");
strSql.Append("isnull(SUM(CASE FEETYPE WHEN 2 THEN (CASE CURRENCY WHEN 'RMB' THEN f.AMOUNT-ISNULL(INVOICE,0) ELSE 0 END)ELSE 0 END),0) AS BALRMBINVCR");
strSql.Append(" ,(select name from company where gid=b.corpid ) COMPANYNAME ");
strSql.Append(" FROM CH_FEE f ");
// strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO or B.BSNO = (SELECT associatedno from wms_out where GID = F.bsno)) ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 and " + strCondition);
}
strSql.Append("GROUP BY b.BSNO,b.OPLB,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO");
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.OPTYPE");
strSql.Append(",b.DOC,b.SALE,b.ENTERP,b.CUSTOMNO,f.CUSTOMERNAME,B.CORPID");
//strSql.Append(@")as t ");
//strSql.Append(string.Format("where t.num>{0} and t.num<={1} order by t.num ", start, start + limit));
//return strSql;
}
public static int getAddBillDataTotalCount(string strCondition, string userid, string usercode, string orgcode,int billtype)
{
var rangstr = "";
if (billtype == 2)
rangstr = GetRangDAStr("modPaySettlementSearch", userid, usercode, orgcode);
else if (billtype == 1)
rangstr = GetRangDAStr("modRecvSettleSearch", userid, usercode, orgcode);
if (!string.IsNullOrEmpty(rangstr))
{
if (!string.IsNullOrEmpty(strCondition))
{
strCondition = strCondition + " and " + rangstr;
}
else
{
strCondition = rangstr;
}
}
StringBuilder strSql = new StringBuilder();
strSql.Append("select count(*) _count from( select b.BSNO ");
strSql.Append(" FROM CH_FEE f ");
strSql.Append(" INNER JOIN V_OP_BILL B ON (F.BSNO=B.BSNO) ");
if (!string.IsNullOrEmpty(strCondition))
{
strSql.Append(" where (f.AMOUNT-isnull(f.SETTLEMENT,0)-isnull(f.ORDERAMOUNT,0)+isnull(f.ORDERSETTLEMENT,0))<>0 and " + strCondition);
}
strSql.Append("GROUP BY b.BSNO,b.OPLB,b.OPLBNAME,b.BSSTATUS,b.ACCDATE,b.MBLNO,b.HBLNO,b.CUSTNO,b.ORDERNO");
strSql.Append(",b.CUSTOMERNAME");
strSql.Append(",b.VESSEL,b.VOYNO,b.ETD,b.PORTLOAD");
strSql.Append(",b.PORTDISCHARGE,b.INPUTBY,b.OP,b.CUSTSERVICE,b.OPTYPE");
strSql.Append(",b.DOC,b.SALE,b.ENTERP,b.CUSTOMNO,f.CUSTOMERNAME,B.CORPID");
strSql.Append(")t");
int cnt = 0;
Database db = DatabaseFactory.CreateDatabase();
using (IDataReader reader = db.ExecuteReader(CommandType.Text, strSql.ToString()))
{
while (reader.Read())
{
cnt = Convert.ToInt32(reader["_count"]);
}
}
return cnt;
}
private static List<BillCustDetail> SetAddBillData(StringBuilder strSql)
{
var headList = new List<BillCustDetail>();
@ -3983,7 +4200,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
strSql.Append(",(select SUM(CASE FEETYPE WHEN 2 THEN -DOAMOUNT ELSE DOAMOUNT END) from ch_fee_do where CURRENCY='RMB' AND BILLNO=cm.BILLNO) as RMBDOAMOUNT ");
strSql.Append(",(select SUM(CASE FEETYPE WHEN 2 THEN -DOAMOUNT ELSE DOAMOUNT END) from ch_fee_do where CURRENCY='USD' AND BILLNO=cm.BILLNO) as USDDOAMOUNT ");
strSql.Append(",(select EnumValueName from tSysEnumValue where LangId=0 and EnumTypeID=97005 and EnumValueID=cm.BILLSTATUS) as BILLSTATUSREF");
strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME");
strSql.Append(",(select ShowName from [user] where GID=cm.APPLICANT) as APPLICANTNAME,CURR");
var OPLISTNOCANCEL = MsSysParamSetDAL.GetData("PARAMNAME='RECVAPPMUSTAUDIT'");
if (OPLISTNOCANCEL.PARAMVALUE == "1")
@ -4043,7 +4260,7 @@ namespace DSWeb.Areas.Account.DAL.Chfee_Settlement
data.SETTLEUSER = Convert.ToString(reader["SETTLEUSER"]);
data.REMARK = Convert.ToString(reader["REMARK"]);
data.COMPANYID = Convert.ToString(reader["COMPANYID"]);
data.SETTLETYPE = Convert.ToString(reader["SETTLETYPE"]);
#endregion
headList.Add(data);

0
DSWeb/Areas/Account/Files/CCHN22100003/20221017093025_0875.txt
Unescape Escape View File

0
DSWeb/Areas/Account/Files/CCHN22100003/20221017094926_7034.txt
Unescape Escape View File

20
DSWeb/Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js
Unescape Escape View File

@ -1331,16 +1331,16 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, {
var ListForm = this;
this.gridList.getSelectionModel().on('select', function (model, record, index) {
_this.billno = record.data.BILLNO;
ListForm.billno = record.data.BILLNO;
var sql = "";
sql = " BILLNO='" + _this.billno + "'";
_this.storeBodyListdetail.load({ params: { start: 0, limit: _this.BodyPageSize, condition: sql} });
_this.storeBodySum.load({ params: { condition: sql} });
_this.storeChfeeFile.load({ params: { start: 0, limit: 9999, BillNo: _this.billno} });
_this.storeBodyBillSum.removeAll();
sql = " BILLNO='" + ListForm.billno + "'";
ListForm.storeBodyListdetail.load({ params: { start: 0, limit: ListForm.BodyPageSize, condition: sql} });
ListForm.storeBodySum.load({ params: { condition: sql} });
ListForm.storeChfeeFile.load({ params: { start: 0, limit: 9999, BillNo: ListForm.billno} });
ListForm.storeBodyBillSum.removeAll();
var CUSTOMERNAME = record.data.CUSTOMERNAME;
Ext.Ajax.request({
waitMsg: '',
@ -1352,12 +1352,12 @@ Ext.extend(Shipping.ChPayapplicationAudit, Ext.Panel, {
if (success) {
var result = Ext.JSON.decode(response.responseText);
if (result.Data == 0) {
_this.panelBillSum.setTitle(Zi.LAN.SumMoney, false);
ListForm.panelBillSum.setTitle(Zi.LAN.SumMoney, false);
} else {
_this.panelBillSum.setTitle(Zi.LAN.SumMoney + "<font color='red'>(此付费客户存在应收费用" + result.Data + ")</font>", false);
ListForm.panelBillSum.setTitle(Zi.LAN.SumMoney + "<font color='red'>(此付费客户存在应收费用" + result.Data + ")</font>", false);
}
} else {
_this.panelBillSum.setTitle(Zi.LAN.SumMoney, false);
ListForm.panelBillSum.setTitle(Zi.LAN.SumMoney, false);
}
},

49
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js
Unescape Escape View File

@ -731,9 +731,9 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
this.GridCheckBoxModel = Ext.create('Ext.selection.CheckboxModel');
//明细表-数据集
this.storeBodyList = Ext.create('Ext.data.Store', {
pageSize: this.BodyPageSize,
model: 'Chfee_do_detail',
remoteSort: true,
pageSize: this.BodyPageSize,
proxy: {
type: 'ajax',
timeout: 120000,
@ -747,6 +747,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
});
this.BodyPagenum = Ext.create('Ext.form.field.Number', {
name: 'bottles',
id:'BodyPagenum',
fieldLabel: '每页记录数', //每页记录数
labelAlign: 'right',
value: this.BodyPageSize,
@ -756,7 +757,8 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
_this.storeBodyList.reload();
//_this.storeBodyList.reload();
_this.onRefreshBodyList();
}
}
}
@ -989,14 +991,15 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
listeners: {
specialkey: function (field, e) {
if (e.getKey() == e.ENTER) {
var billno = _this.formEdit.getForm().findField('BILLNO').getValue();
var mblno = field.value;
var sql = " BILLNO='" + billno + "' ";
if (mblno != '' && mblno != null) {
sql = sql + " and (b.MBLNO+b.HBLNO+b.CUSTNO+b.ORDERNO like '%" + mblno + "%') ";
}
_this.storeBodyList.load({ params: { start: 0, limit: _this.BodyPageSize, condition: sql } });
//var billno = _this.formEdit.getForm().findField('BILLNO').getValue();
//var mblno = field.value;
//var sql = " BILLNO='" + billno + "' ";
//if (mblno != '' && mblno != null) {
// sql = sql + " and (b.MBLNO+b.HBLNO+b.CUSTNO+b.ORDERNO like '%" + mblno + "%') ";
//}
//_this.storeBodyList.load({ params: { start: 0, limit: _this.BodyPageSize, condition: sql } });
this.onRefreshBodyList();
}
}
}
@ -1012,8 +1015,8 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
bbar: [Ext.create('Ext.PagingToolbar', {
store: this.storeBodyList,
displayInfo: true,
displayMsg: '当前显示条数据', //当前显示条数据
emptyMsg: '没有数据'//没有数据
displayMsg: Zi.LAN.FenYe,
emptyMsg: Zi.LAN.DataEmptyMsg
}), this.BodyPagenum]
});
@ -1122,6 +1125,7 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
});
this.Pagenum = Ext.create('Ext.form.field.Number', {
name: 'bottles',
id: 'Pagenum',
fieldLabel: Zi.LAN.PageNum,
labelAlign: 'right',
value: this.PageSize,
@ -6287,6 +6291,27 @@ Ext.extend(Shipping.MsChPaySettlementBLEdit, Ext.Panel, {
this.storeBodyAddList.load({ params: { start: 0, limit: this.PageSize, sort: '', condition: this.sqlcontext, billtype: 2} });
},
onRefreshBodyList: function (button, event) {
var billno = this.formEdit.getForm().findField('BILLNO').getValue();
var mblno = Ext.getCmp("BILLBSNO").getValue();
//var mblno = field.value;
var sql = " BILLNO='" + billno + "' ";
if (mblno != '' && mblno != null) {
sql = sql + " and (b.MBLNO+b.HBLNO+b.CUSTNO+b.ORDERNO like '%" + mblno + "%') ";
}
//this.storeBodyList.load({ params: { start: 0, limit: this.BodyPageSize, condition: sql } });
//var sql = this.getCondition();
//this.sqlcontext = sql;
this.BodyPageSize = this.BodyPagenum.getValue();
this.storeBodyList.pageSize = this.BodyPageSize;
this.storeBodyList.load({ params: { start: 0, limit: this.BodyPageSize, sort: '', condition: sql } });
},
onDsQuery: function () {
//var girdcolums = this.gridList.getColumnMode();
var sql = this.sqlcontext;

140
DSWeb/Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js
Unescape Escape View File

@ -128,7 +128,7 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
this.StoreCurr.load({ params: { condition: ""} });
this.StoreDateCurr = Ext.create('DsExt.ux.RefTableStore', {
model: 'MsFeeCurr',
proxy: { url: '/MvcShipping/MsChFee/GetFeeNowCurrList' }
proxy: { url: '/MvcShipping/MsChFee/GetDateCurrList' }
});
this.StoreDateCurr.load({ params: { condition: ""} });
@ -1097,6 +1097,11 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
return value;
},
width: 100
}, {
sortable: true,
dataIndex: 'CURR',
header: Zi.LAN.Currency,
width: 40
}, {
sortable: true,
dataIndex: 'APPLYTIME',
@ -3399,12 +3404,111 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
}
}
});
}, //end save
}, //end save
//onAddDetailClick: function (button, event, curr) {
// this.addstore = true;
// this.addDetail(curr);
//}, //end onAddDetailClick
onAddDetailClick: function (button, event, curr) {
this.addstore = true;
this.addDetail(curr);
}, //end onAddDetailClick
//this.addDetail(curr);
_this = this;
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (curr == 'USD') {
if (!CURR) { //|| CURR=="USD"
this.formEdit.getForm().findField('CURR').setValue('USD');
var DateStr = _this.formEdit.getForm().findField("SETTLETIME").getRawValue();
//this.formEdit.getForm().findField('CURR').setValue('USD');
this.StoreDateCurr.load({
params: {
DateStr: DateStr
},
callback: function (r, options, success) {
if (success) {
if (_this.StoreDateCurr.getCount() > 0) {
for (var i = 0; i < _this.StoreDateCurr.getCount(); i += 1) {
var member = _this.StoreDateCurr.getAt(i);
if (member.data.CURR == curr) {
this.formEdit.getForm().findField('RATE').setValue(member.data.DEFRATE);
this.addDetail(curr);
}
}
} else {
var DFrecords = DsStoreQueryBy(this.StoreCurr, 'CURR', CURR);
if (DFrecords.getCount() > 0) {
var dfdata = DFrecords.getAt(0).data;
var DEFRATE = dfdata.DEFRATE;
this.formEdit.getForm().findField('RATE').setValue(DEFRATE);
this.addDetail(curr);
} else {
this.formEdit.getForm().findField('RATE').setValue(1);
this.addDetail(curr);
}
}
}
},
scope: this
});
} else {
this.addDetail(curr);
}
}
else if (curr == 'RMB') {
if (!CURR) {
this.formEdit.getForm().findField('CURR').setValue('RMB');
this.formEdit.getForm().findField('RATE').setValue(1);
this.addDetail(curr);
} else {
this.addDetail(curr);
}
}
else {
if (!CURR) {
//看选中的申请当中 第一条的申请金额中 rmb usd数量的关系
//如usd不为0rmb为0 则为usd 反之则为rmb
var selectedRecords = this.gridAddFeeList.selModel.getSelection();
if (selectedRecords.length > 0) {
var rec = selectedRecords[0];
USDAMOUNT = parseFloat(rec.data.USDAMOUNT);
RMBAMOUNT = parseFloat(rec.data.AMOUNT);
if (USDAMOUNT > 0 && RMBAMOUNT == 0) {
curr = "USD";
this.formEdit.getForm().findField('CURR').setValue(curr);
this.LoadDateCurr();
} else {
curr = "RMB";
this.formEdit.getForm().findField('CURR').setValue(curr);
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
this.addDetail(curr);
} else {
this.addDetail('RMB');
this.formEdit.getForm().findField('RATE').setValue(1);
}
}
},
onDelDetailClick: function (button, event, type) {
this.deleteDetail();
@ -3489,21 +3593,25 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
var CUSTOMERNAME = this.formEdit.getForm().findField('CUSTOMERNAME').getValue();
var CURR = this.formEdit.getForm().findField('CURR').getValue();
if (addcurr == '') {
if ((CURR == '') || (CURR == null)) {
this.formEdit.getForm().findField('CURR').setValue('RMB');
this.formEdit.getForm().findField('RATE').setValue(1);
}
} else {
if ((CURR == '') || (CURR == null)) {
this.formEdit.getForm().findField('CURR').setValue(addcurr);
}
}
//if (addcurr == '') {
// if ((CURR == '') || (CURR == null)) {
// this.formEdit.getForm().findField('CURR').setValue('RMB');
// this.formEdit.getForm().findField('RATE').setValue(1);
// }
//} else {
// if ((CURR == '') || (CURR == null)) {
// this.formEdit.getForm().findField('CURR').setValue(addcurr);
// }
//}
//if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null) || (CURR == '') || (CURR == null)) {
var selectedRecords = this.gridAddFeeList.selModel.getSelection();
if (selectedRecords.length > 0) {
var rec = selectedRecords[0];
var cust = rec.data.CUSTOMERNAME;
var curr = rec.data.CURR;
SALECORP = rec.data.SALECORP;
var addcurr2 = rec.data.CURR;
if ((CUSTOMERNAME == '') || (CUSTOMERNAME == null))
this.formEdit.getForm().findField('CUSTOMERNAME').setValue(cust);
@ -3516,8 +3624,8 @@ Ext.extend(Shipping.MsChRecvAppSettlementEdit, Ext.Panel, {
// }
//}
if (CURR != curr) {
this.formEdit.getForm().findField('CURR').setValue(curr);
if (curr == 'RMB') {
this.formEdit.getForm().findField('CURR').setValue(CURR);
if (CURR == 'RMB') {
this.formEdit.getForm().findField('RATE').setValue(1);
} else {
//var FFrecords = DsStoreQueryBy(this.StoreDateCurr, 'CURR', curr);

7
DSWeb/Areas/MvcShipping/Controllers/MsOpSeaeController.cs
Unescape Escape View File

@ -2267,6 +2267,13 @@ namespace DSWeb.MvcShipping.Controllers
}
if (!string.IsNullOrWhiteSpace( enumValue.MBLNO ))
{
errstr = errstr + "," + enumValue.CUSTNO + "已有提单号"+ enumValue.MBLNO;
iscancel = false;
}
}
if (errstr != "")

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

@ -7650,6 +7650,68 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
//#endregion
//#region 增加一个步骤进度条
this.StepProgressLine= Ext.widget({
//xtype: 'form',
//autoShow: true,
height:70,
width: 500,
//items: {
xtype: 'form',
region: 'north',
frame: true,
bodyPadding: 10,
collapsed: false,
collapsible: true,
trackResetOnLoad: true,
fieldDefaults: {
margins: '2 2 2 2',
labelAlign: 'right',
flex: 1,
labelWidth: 70,
msgTarget: 'qtip'
},
items: {
//xtype: 'dataview',
//store: Ext.create('Ext.data.Store', {
// storeId: 'cardstore',
// fields: ['name', 'step', 'index', 'valid'],
// data: [{
// step: 1,
// index: 0,
// name: 'label 1',
// valid: true
// }, {
// step: 2,
// index: 1,
// name: 'label 2',
// valid: false
// }, {
// step: 3,
// index: 2,
// name: 'label 3',
// valid: false
// }]
//}),
//padding: '0 0 20 0',
//tpl: new Ext.XTemplate(
// '<tpl for=".">',
// '<div style="width: ' + parseInt(100 / Ext.getStore('cardstore').getCount()) + '%;" class="step step_valid__{valid}">',
// '<span class="step_index">{step}</span><span class="step_name">{name}</span>',
// '</div>',
// '</tpl>'
//),
//itemSelector: 'div.step',
}
});
//#endregion
//#region 框架结构
this.panelpage = new Ext.Panel({
@ -7660,6 +7722,7 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
autoScroll: true,
frame: false,
items: [
this.formEdit
]
});
@ -7729,7 +7792,13 @@ Ext.extend(Shipping.MsOpSeaeEdit, Ext.Panel, {
autoScroll: true,
frame: false,
//closable:true,
items: [this.panelBtn, this.formHead, this.tabSeaeWTpanel]
items: [
this.panelBtn,
//this.StepProgressLine,
this.formHead, this.tabSeaeWTpanel]
});
this.treestore = new Ext.data.TreeStore({

4
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js
Unescape Escape View File

@ -7585,10 +7585,10 @@ Ext.extend(Shipping.MsOpSeaeIndex, Ext.Panel, {
xtype: 'datefield',
name: 'ATD'
}, {
fieldLabel: Zi.LAN.VGM_TIME, //'开船日期',
fieldLabel: Zi.LAN.VGM_TIME, //'截VGM时间',
format: 'Y-m-d',
flex: 1,
xtype: 'datefield',
xtype: 'datetimefield',
name: 'VGM_TIME'
}

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

@ -1685,6 +1685,14 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
}],
scope: this
}, '-', {
text: "费用编辑",
id: "btnFeeEdit",
handler: function (button, event) {
this.onFeeEditClick(button, event);
},
scope: this
}, '-', {
iconCls: "btnotherinf",
menu: [
@ -3352,6 +3360,31 @@ Ext.extend(Shipping.MsOpSeaeSaleIndex, Ext.Panel, {
});
}
//#endregion
//#region 费用编辑
,
onFeeEditClick: function (menu, event) {
var selections = this.gridList.getSelectionModel().getSelection();
if (selections.length == 0) {
Ext.Msg.show({ title: Zi.LAN.TiShi, msg: Zi.LAN.QingXianXuanZeYeWu, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });
return;
}
var record = selections[0];
this.SelectedRecord = record;
this.OprationStatus = 'edit';
//if (FEELR == '1')
DsOpenEditWin('/MvcShipping/MsOpSeae/PiLiangFeeLREdit');
//else
// DsOpenEditWin('/MvcShipping/MsOpSeae/PiLiangFeeEdit');
}
//#endregion
});

12
DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js
Unescape Escape View File

@ -1337,10 +1337,16 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, {
// isloadfee = false;
if (record.data.BLNO != "" && BSNO != "") {
if (LINKGID!= "") {
this.storeLog.removeAll();
if (LINKGID != "") {
this.logsql = " (BSNO='" + LINKGID + "' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + BSNO + "')) ";
this.storeLog.load({ params: { condition: " (BSNO='" + LINKGID + "' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + BSNO + "')) "} });
} else this.storeLog.removeAll();
this.storeLog.load({ params: { condition: " (BSNO='" + LINKGID + "' or BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + BSNO + "')) " } });
} else {
this.logsql = " ( BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + BSNO + "')) ";
this.storeLog.load({ params: { condition: " ( BSNO in(select linkgid from op_blissuelist_detail where BSNO='" + BSNO + "')) " } });
}
Ext.Ajax.request({
waitMsg: '正在提交数据...',

4
DSWeb/Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js
Unescape Escape View File

@ -12321,7 +12321,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
flex: 1,
autosize: true,
name: 'SUBDEPT',
valueField: 'GID',
valueField: 'DeptName',
displayField: 'DeptName'
});
@ -13722,7 +13722,7 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
}
var SUBDEPT = form.findField('SUBDEPT').getRawValue();
var SUBDEPT = form.findField('SUBDEPT').getValue();
if (SUBDEPT) {
deptstr = ListToSqlStr(SUBDEPT);
sql = sql + getAndConSql(sql, deptstr, "B.SALEDEPT in(" + deptstr + ")");

14
DSWeb/Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js
Unescape Escape View File

@ -1175,12 +1175,12 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
scope: this
}, {
text: "高级查询面板",
id: "btIsShowAdvancedQuery",
handler: function (button, event) {
this.setIsShowAdvancedQuery(button, event);
},
scope: this
text: "高级查询面板",
id: "btIsShowAdvancedQuery",
handler: function (button, event) {
this.setIsShowAdvancedQuery(button, event);
},
scope: this
}, '-', {
xtype: 'button',
width: 50,
@ -1863,6 +1863,8 @@ Ext.extend(Shipping.MsSeaeOrderIndex, Ext.Panel, {
//#endregion
OprationSwap: function () {
var ret = new Array();
ret[0] = this.OprationStatus;

44
DSWeb/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -7,7 +7,7 @@
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<_PublishTargetUrl>F:\DS7Deploy</_PublishTargetUrl>
<History>True|2022-10-09T02:19:46.2980229Z;True|2022-09-30T17:35:06.7888422+08:00;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
<History>True|2022-10-17T07:28:15.6044058Z;True|2022-10-09T10:19:46.2980229+08:00;True|2022-09-30T17:35:06.7888422+08:00;True|2022-09-28T15:09:31.3794587+08:00;True|2022-09-26T17:38:31.7822040+08:00;True|2022-09-23T10:50:12.4477513+08:00;True|2022-09-20T11:43:07.7861580+08:00;True|2022-09-19T17:29:15.0054651+08:00;True|2022-09-15T17:51:03.0418191+08:00;True|2022-09-13T18:11:07.4886072+08:00;True|2022-09-08T18:27:59.4866314+08:00;True|2022-09-07T10:48:22.4374600+08:00;True|2022-08-30T08:55:51.2483797+08:00;False|2022-08-29T17:42:44.5787657+08:00;True|2022-08-26T20:59:45.9746506+08:00;True|2022-08-26T20:43:47.7232727+08:00;True|2022-08-24T09:18:21.4053992+08:00;False|2022-08-21T20:16:52.1945951+08:00;False|2022-08-19T19:22:34.5180558+08:00;True|2022-08-18T14:48:38.9875943+08:00;True|2022-08-17T21:13:13.1492813+08:00;True|2022-08-15T12:05:05.0180251+08:00;True|2022-08-14T16:09:42.2679613+08:00;False|2022-08-14T14:52:29.4220318+08:00;False|2022-08-14T14:52:06.2230253+08:00;True|2022-08-14T10:57:19.4758701+08:00;False|2022-08-13T23:04:14.0629097+08:00;False|2022-08-13T23:03:22.5804991+08:00;True|2022-08-10T19:05:35.6012831+08:00;False|2022-07-19T17:04:39.8836330+08:00;False|2022-07-18T17:16:12.0161331+08:00;False|2022-07-18T17:14:22.0392241+08:00;False|2022-07-18T17:13:36.1034940+08:00;False|2022-07-18T17:05:08.7106572+08:00;False|2022-07-18T17:04:11.8851385+08:00;False|2022-07-18T14:30:54.7755285+08:00;True|2022-07-14T10:29:35.4634877+08:00;True|2022-07-14T10:27:21.4061602+08:00;False|2022-07-14T10:22:40.9640558+08:00;True|2022-06-29T15:32:11.0848982+08:00;False|2022-06-29T15:15:50.7821661+08:00;False|2022-05-10T16:09:29.5038169+08:00;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -618,7 +618,7 @@
<publishTime>09/30/2022 09:30:41</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationIndex.js">
<publishTime>09/29/2022 15:44:33</publishTime>
<publishTime>10/14/2022 16:51:13</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_invoiceapplication/ChInvoiceapplicationModel.js">
<publishTime>09/15/2022 11:35:08</publishTime>
@ -822,7 +822,7 @@
<publishTime>08/26/2022 20:26:40</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationAudit.js">
<publishTime>10/08/2022 12:01:44</publishTime>
<publishTime>10/17/2022 09:45:08</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_payapplication/ChPayapplicationBalEdit.js">
<publishTime>09/06/2022 13:49:00</publishTime>
@ -924,7 +924,7 @@
<publishTime>09/29/2022 15:52:04</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPaysettlementBLEdit.js">
<publishTime>09/29/2022 15:46:04</publishTime>
<publishTime>10/17/2022 15:25:33</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChPaySettlementEdit.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -933,16 +933,16 @@
<publishTime>09/29/2022 15:12:42</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppBLsettlementEdit.js">
<publishTime>09/29/2022 15:44:33</publishTime>
<publishTime>10/21/2022 16:39:41</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvAppsettlementEdit.js">
<publishTime>09/29/2022 13:48:34</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvInvsettlementEdit.js">
<publishTime>09/29/2022 15:55:17</publishTime>
<publishTime>10/14/2022 16:44:53</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementBLEdit.js">
<publishTime>09/29/2022 15:41:43</publishTime>
<publishTime>10/21/2022 14:20:08</publishTime>
</File>
<File Include="Areas/Account/Viewsjs/Chfee_settlement/ChRecvsettlementEdit.js">
<publishTime>09/29/2022 11:55:42</publishTime>
@ -7752,7 +7752,7 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEdit.js">
<publishTime>08/28/2022 03:33:28</publishTime>
<publishTime>10/17/2022 17:24:48</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeEditView.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -7773,7 +7773,7 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeIndex.js">
<publishTime>09/21/2022 15:49:36</publishTime>
<publishTime>10/17/2022 09:13:03</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeModel.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -7785,7 +7785,7 @@
<publishTime>08/26/2022 20:31:11</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeSaleIndex.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>10/21/2022 14:02:28</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOpSeae/MsOpSeaeTaskView.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -8208,7 +8208,7 @@
<publishTime>08/26/2022 20:26:43</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js">
<publishTime>09/15/2022 11:43:50</publishTime>
<publishTime>10/18/2022 11:01:39</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEIndex.js">
<publishTime>09/16/2022 16:26:13</publishTime>
@ -8376,7 +8376,7 @@
<publishTime>08/26/2022 20:31:11</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitIndex.js">
<publishTime>09/22/2022 11:24:35</publishTime>
<publishTime>10/21/2022 14:14:20</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsRptOpProfit/MsRptOpProfitLHIndex.js">
<publishTime>08/26/2022 20:31:11</publishTime>
@ -8523,7 +8523,7 @@
<publishTime>10/08/2022 11:35:38</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderIndex.js">
<publishTime>08/26/2022 20:31:11</publishTime>
<publishTime>10/21/2022 14:02:30</publishTime>
</File>
<File Include="Areas/MvcShipping/Viewsjs/MsSeaeOrder/MsSeaeOrderModel.js">
<publishTime>09/05/2022 17:55:01</publishTime>
@ -12822,10 +12822,10 @@
<publishTime>08/26/2022 20:26:37</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>10/09/2022 10:18:57</publishTime>
<publishTime>10/21/2022 16:41:39</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>10/09/2022 10:18:57</publishTime>
<publishTime>10/21/2022 16:41:39</publishTime>
</File>
<File Include="bin/AspNetPager.dll">
<publishTime>08/26/2022 20:26:48</publishTime>
@ -12885,19 +12885,19 @@
<publishTime>09/14/2022 18:07:40</publishTime>
</File>
<File Include="bin/DSWeb.dll">
<publishTime>10/09/2022 10:18:37</publishTime>
<publishTime>10/21/2022 16:41:18</publishTime>
</File>
<File Include="bin/DSWeb.Interface.dll">
<publishTime>10/09/2022 10:18:27</publishTime>
<publishTime>10/21/2022 16:40:59</publishTime>
</File>
<File Include="bin/DSWeb.Interface.pdb">
<publishTime>10/09/2022 10:18:27</publishTime>
<publishTime>10/21/2022 16:40:59</publishTime>
</File>
<File Include="bin/DSWeb.pdb">
<publishTime>10/09/2022 10:18:37</publishTime>
<publishTime>10/21/2022 16:41:18</publishTime>
</File>
<File Include="bin/DSWeb.XmlSerializers.dll">
<publishTime>10/09/2022 10:18:38</publishTime>
<publishTime>10/21/2022 16:41:19</publishTime>
</File>
<File Include="bin/DSWebComponent.dll">
<publishTime>08/28/2022 03:33:29</publishTime>
@ -17529,7 +17529,7 @@
<publishTime>08/26/2022 20:26:46</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>10/09/2022 10:18:51</publishTime>
<publishTime>10/21/2022 16:41:32</publishTime>
</File>
<File Include="PriceCarrier/CrmPriceCarrierInfo.aspx">
<publishTime>08/26/2022 20:26:46</publishTime>
@ -24078,7 +24078,7 @@
<publishTime>08/26/2022 20:26:48</publishTime>
</File>
<File Include="Web.config">
<publishTime>10/08/2022 10:32:01</publishTime>
<publishTime>10/18/2022 10:36:20</publishTime>
</File>
<File Include="WebSearchEngine/SearchEngineAdapter.aspx">
<publishTime>08/26/2022 20:26:48</publishTime>

BIN
DSWeb/bin/DSWeb.XmlSerializers.dll
View File

Binary file not shown.

BIN
DSWeb/bin/DSWebComponent.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/JsonHelper.pdb
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.dll
View File

Binary file not shown.

BIN
DSWeb/bin/WebSqlHelper.pdb
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save