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

1

Browse Source
dev
hanxuntao 2 weeks ago
parent 7049900afa
commit 92465fc51f
9 changed files with 32 additions and 16 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 />

11
DSWeb/Areas/MvcShipping/Controllers/MsOp_YAXIANGController.cs
Unescape Escape View File

@ -320,6 +320,7 @@ namespace DSWeb.MvcShipping.Controllers
// string sql = MsOp_YAXIANGDAL.gethea;
//}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult GetDataList(int start, int limit, string condition, string sort="")
{
var dataList = MsOp_YAXIANGDAL.GetDataList(condition,Session["USERID"].ToString(), sort);
@ -352,6 +353,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json };
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult GetData(string handle, string condition)
{
var data = MsOp_YAXIANGDAL.GetData(condition, Session["USERID"].ToString());
@ -390,6 +392,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = json };
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult GetBodyList( string condition )
{
var dataList = MsOp_YAXIANGDAL.GetBodyList(condition);
@ -417,6 +420,7 @@ namespace DSWeb.MvcShipping.Controllers
#endregion
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult Save(string opstatus, string data, string Body, string DelBody)//
{
@ -517,6 +521,7 @@ namespace DSWeb.MvcShipping.Controllers
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult Delete(string data)
{
Database db = DatabaseFactory.CreateDatabase();
@ -548,6 +553,7 @@ namespace DSWeb.MvcShipping.Controllers
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult DelDetail(string data,string GID)
{
Database db = DatabaseFactory.CreateDatabase();
@ -592,6 +598,7 @@ namespace DSWeb.MvcShipping.Controllers
#region 状态变更
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult PushState(string data,string Execution) {
Database db = DatabaseFactory.CreateDatabase();
@ -604,6 +611,7 @@ namespace DSWeb.MvcShipping.Controllers
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
private ContentResult doPushState(YXmb head, string Execution)
{
var modb = new ModelObjectRepository();
@ -631,6 +639,7 @@ namespace DSWeb.MvcShipping.Controllers
return new ContentResult() { Content = JsonConvert.Serialize(result) };
}
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult PushState_List(string dataList, string Execution)
{
@ -983,6 +992,8 @@ namespace DSWeb.MvcShipping.Controllers
}
//驳回提交
[SqlKeyWordsFilter(Type = "Action")]//sql 防注入过滤器
public ContentResult AuditBack(string dataList,string reason)
{

16
DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs
Unescape Escape View File

@ -20466,7 +20466,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else
{
error += formatlengthError("txt", bill.SHIPPER, 75, bill.MBLNO, "发货人", 6, "*", false);
error += formatlengthError("txt", bill.SHIPPER, 65, bill.MBLNO, "发货人", 6, "*", false);
}
}
@ -20492,11 +20492,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
{
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "--", false);
error += formatlengthError("txt", bill.CONSIGNEE, 65, bill.MBLNO, "收货人", 6, "--", false);
}
else
{
error += formatlengthError("txt", bill.CONSIGNEE, 75, bill.MBLNO, "收货人", 6, "**", false);
error += formatlengthError("txt", bill.CONSIGNEE, 65, bill.MBLNO, "收货人", 6, "**", false);
}
}
}
@ -20521,11 +20521,11 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
{
if (carrier == "HLCU")
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "---", false);
error += formatlengthError("txt", bill.NOTIFYPARTY, 65, bill.MBLNO, "通知人", 6, "---", false);
}
else
{
error += formatlengthError("txt", bill.NOTIFYPARTY, 75, bill.MBLNO, "通知人", 6, "***", false);
error += formatlengthError("txt", bill.NOTIFYPARTY, 65, bill.MBLNO, "通知人", 6, "***", false);
}
}
}
@ -21130,7 +21130,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
Shipping =bill.SHIPPER;
if (type == "VOLTAEDI")
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
else
ShippingList = formatlengthStr(Shipping, 35);
var shippingcode = "";
@ -21195,7 +21195,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else
Shipping =bill.CONSIGNEE;
if (type == "VOLTAEDI")
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
else
ShippingList = formatlengthStr(Shipping, 35);
if (carrier == "ZIM") shippingcode = OpAms.CONSIGNEECODE;
@ -21261,7 +21261,7 @@ namespace DSWeb.MvcShipping.DAL.MsOpSeaeEdiPortDAL
else
Shipping =bill.NOTIFYPARTY;
if (type == "VOLTAEDI")
ShippingList = formatlengthStr(Shipping, 75);
ShippingList = formatlengthStr(Shipping, 65);
else
ShippingList = formatlengthStr(Shipping, 35);
if (carrier == "ZIM") shippingcode = OpAms.NOTIFYPARTYCODE;

7
DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs
Unescape Escape View File

@ -1988,8 +1988,13 @@ namespace DSWeb.Areas.TruckMng.Models.MsWlBs
get { return _Ton; }
set { _Ton = value; }
}
private string _AroundTon = "0";
[ModelDB]
public string AroundTon { get; set; }
public string AroundTon
{
get { return _AroundTon; }
set { _AroundTon = value; }
}
[ModelDB]
public string GOODSCOUNT

2
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js
Unescape Escape View File

@ -1851,7 +1851,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.CheckSaveQuery = new Ext.form.Checkbox({
fieldLabel: '显示分票', //记忆查询条件
checked: true,
checked: false,
labelWidth: 55,
width: 80
});

2
DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js
Unescape Escape View File

@ -1747,7 +1747,7 @@ Ext.extend(DsTruck.MsPcEditIndex, Ext.Panel, {
this.CheckSaveQuery = new Ext.form.Checkbox({
fieldLabel: '显示分票', //记忆查询条件
checked: true,
checked: false,
labelWidth: 55,
width: 80
});

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 />

2
JobAutoCreateFee/JobBankData.cs
Unescape Escape View File

@ -38,7 +38,7 @@ namespace JobCreateFee
var JsonGetBankData = new GetBankData();
JsonGetBankData.AccountName = companyName;
JsonGetBankData.AccountKey = CustId;
JsonGetBankData.BeginDate = DateTime.Now.AddDays(-2).ToString("yyyyMMdd");
JsonGetBankData.BeginDate = DateTime.Now.AddDays(-3).ToString("yyyyMMdd");
JsonGetBankData.EndDate = DateTime.Now.ToString("yyyyMMdd");
var PCNO = DateTime.Now.ToString("yyyyMMddhhmmss");

Write Preview
Loading…
Cancel
Save