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

1

Browse Source
DS7_JinGang
hanxuntao 1 year ago
parent 5ac4924f72
commit 3f6208b665
11 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File

2
BookingJieFeng/BookingJieFeng.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>FolderProfile</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />

2
BookingWeb/BookingWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

4
DSWeb/Areas/Account/Viewsjs/Chfee_Audit/PiLiangSubmit.js
Unescape Escape View File

@ -186,7 +186,11 @@ Ext.extend(Shipping.PiLiangSubmit, Ext.Panel, {
items: [this.panelTop, this.panelFee]
});
//#endregion
this.storeBodyAddList.on('beforeload', function (store) {
// var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: _this.strbsno });
}, this);
parentWin = window.parent.opener._this;
if (parentWin == undefined) parentWin = window.parent.opener.panelTest;

6
DSWeb/Areas/MvcShipping/Controllers/MsInfoClientController.cs
Unescape Escape View File

@ -945,11 +945,11 @@ namespace DSWeb.MvcShipping.Controllers
#region 合同
public ContentResult GetContractDataList(string condition, string sort)
public ContentResult GetContractDataList(int start, int limit, string condition, string sort)
{
var dataList = MsInfoClientDAL.GetContractDataList(condition, sort,Session["USERID"].ToString(), Convert.ToString(Session["SHOWNAME"]), Convert.ToString(Session["COMPANYID"]));
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = dataList.ToList() });
var list = dataList.Skip(start).Take(limit);
var json = JsonConvert.Serialize(new { Success = true, Message = "查询成功", totalCount = dataList.Count, data = list.ToList() });
return new ContentResult() { Content = json };
}
public ContentResult GetContractData(string handle, string condition)

6
DSWeb/Areas/MvcShipping/Viewsjs/MsFeeTemplate/FeeTemplatePLAdd.js
Unescape Escape View File

@ -479,6 +479,12 @@ Ext.extend(Shipping.FeeTemplatePLAdd, Ext.Panel, {
Ext.apply(store.proxy.extraParams, { condition: sql });
}, this);
this.storeBodyAddList.on('beforeload', function (store) {
// var sql = this.getCondition();
Ext.apply(store.proxy.extraParams, { condition: _this.strbsno });
}, this);
this.storeList.on('load', function (store, records) {
if (store.getCount() > 0) {
this.gridList.getSelectionModel().select(0);

6
DSWeb/Areas/MvcShipping/Viewsjs/MsOpSeai/MsOpSeae2SeaiIndex.js
Unescape Escape View File

@ -544,11 +544,7 @@ Ext.extend(Shipping.OpSeaeToSeaiIndex, Ext.Panel, {
if (success) {
var jsonresult = Ext.JSON.decode(response.responseText);
if (jsonresult.Success) {
_this.storeList.load({
params: { start: 0, limit: _this.PageSize, sort: '', condition: _this.sqlcontext },
waitMsg: "正在查询数据...",
scope: this
});
_this.storeList.reload();
btnadd.enable();
parentWin.onDsQuery();
Ext.Msg.show({ title: '提示', msg: jsonresult.Message, icon: Ext.Msg.INFO, buttons: Ext.Msg.OK });

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

@ -13925,9 +13925,9 @@ Ext.extend(Shipping.MsRptOpProfitIndex, Ext.Panel, {
sql = sql + getAndConSql(sql, BSSOURCEDETAIL, "B.BSSOURCEDETAIL='" + BSSOURCEDETAIL + "'");
var PS_FEELOCK = form.findField('PS_FEELOCK').getValue();
if (PS_FEELOCK == '已锁定')
if (PS_FEELOCK == Zi.LAN.LOCK)
sql = sql + getAndConSql(sql, PS_FEELOCK, "B.FEESTATUS=1");
else if (PS_FEELOCK == '未锁定')
else if (PS_FEELOCK == Zi.LAN.UNLOCK )
sql = sql + getAndConSql(sql, PS_FEELOCK, "B.FEESTATUS=0");
// var ISHYF = form.findField('ISHYF').getValue();
// if (ISHYF == '0') {

2
DSWeb/DSWeb.csproj.user
Unescape Escape View File

@ -4,7 +4,7 @@
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>配置文件1</NameOfLastUsedPublishProfile>
<UseIISExpress>true</UseIISExpress>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />

2
DispatchWeb/DispatchWeb.csproj.user
Unescape Escape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />

12
JobAutoCreateFee/JobDjyD6Xf.cs
Unescape Escape View File

@ -31,6 +31,8 @@ namespace JobCreateFee
string CustName = context.JobDetail.JobDataMap.GetString("CustName");
string companySecret = context.JobDetail.JobDataMap.GetString("DjyCompanySecret");
string bsType = context.JobDetail.JobDataMap.GetString("DjybsType");
string COSCOAUTOCREATEFEE = context.JobDetail.JobDataMap.GetString("COSCOAUTOCREATEFEE");
string CoscoCustName = context.JobDetail.JobDataMap.GetString("COSCOCustName");
string ENTEROPERATOR = context.JobDetail.JobDataMap.GetString("ENTEROPERATOR");
int reqTimeout = Convert.ToInt32(context.JobDetail.JobDataMap.GetString("RequestTimeout"));
long ts = DataTableToJsonHelper.ConvertDateTimeToInt(DateTime.Now);
@ -84,6 +86,12 @@ namespace JobCreateFee
if (returndata.price == "" || returndata.price == null) returndata.price = "0";
if (returndata.ctnrCount == "" || returndata.ctnrCount == null) returndata.ctnrCount = "0";
var feecustname = CustName;
if (COSCOAUTOCREATEFEE == "1"&& returndata.forwarder=="中远海运") {
if (Convert.ToDecimal(returndata.price) == 0) returndata.price = "30";
feecustname = CoscoCustName;
}
string sql = " if (select GID from t_op_txxp_log where GID='" + returndata.gid + "') is null INSERT INTO t_op_txxp_log([编号],[GID],[beizhu],[mblno],[bsstatus],[bstype],[createtime]";
sql = sql + ",[price],[sendtype],[ctnrCount],[ctnrInfo]) values ('" + BS.BSNO + "','" + returndata.gid + "'";
sql = sql + ",'" + returndata.beizhu + "','" + returndata.mblno + "','" + returndata.bsstatus + "','" + returndata.bstype + "','" + returndata.createtime + "'";
@ -92,14 +100,14 @@ namespace JobCreateFee
cmd.ExecuteNonQuery();
if (!string.IsNullOrEmpty(BS.BSNO) && BS.FEESTATUS != "提交财务" && BS.FEESTATUS != "费用封帐" && BS.BSSTATUS != "应付完毕")
{
if (Convert.ToDecimal(returndata.price) != 0 && !string.IsNullOrEmpty(CustName) && !string.IsNullOrEmpty(FeeName))
if (Convert.ToDecimal(returndata.price) != 0 && !string.IsNullOrEmpty(feecustname) && !string.IsNullOrEmpty(FeeName))
{
sql = "INSERT INTO [t_ch_fee] ([类型],[费用状态],[编号],[费用名称],[结算单位],[客户名称],[标准]";
sql = sql + ",[单价],[数量],[金额],[币别],[汇率],[备注],[结算金额],[开票金额]";
sql = sql + ",[录入人],[录入日期],[是否对帐],[顺序],[冲抵金额]";
sql = sql + ",[机密],[是否垫付],[申请金额],[不开发票],[费用英文名称]";
sql = sql + ",[申请开票],[提交],[不含税价],[税率],[税额],PROJECTFEEID) VALUES ";
sql = sql + "('付','审核通过','" + BS.BSNO + "','" + FeeName + "','','" + CustName + "','票'";
sql = sql + "('付','审核通过','" + BS.BSNO + "','" + FeeName + "','','" + feecustname + "','票'";
sql = sql + "," + returndata.price + ",1," + returndata.price + ",'RMB',1,'',0,0";
sql = sql + ",'"+ ENTEROPERATOR + "',GETDATE(),0,0,0";
sql = sql + ",0,0,0,0,'" + FeeName + "'";

2
JobAutoCreateFee/JobDjyXf.cs
Unescape Escape View File

@ -204,8 +204,8 @@ namespace JobCreateFee
public string createtime { get; set; }
public string price { get; set; }
public string sendtype { get; set; }
public string sendcom { get; set; }
public string forwarder { get; set; }
public string ctnrCount { get; set; }
public string ctnrInfo { get; set; }

Write Preview
Loading…
Cancel
Save