diff --git a/BookingJieFeng/BookingJieFeng.csproj.user b/BookingJieFeng/BookingJieFeng.csproj.user index 28be9c4c..a48b3371 100644 --- a/BookingJieFeng/BookingJieFeng.csproj.user +++ b/BookingJieFeng/BookingJieFeng.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU FolderProfile true diff --git a/BookingWeb/BookingWeb.csproj.user b/BookingWeb/BookingWeb.csproj.user index 4edb5e0f..6bc24ada 100644 --- a/BookingWeb/BookingWeb.csproj.user +++ b/BookingWeb/BookingWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOp_YAXIANGController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOp_YAXIANGController.cs index aede91f9..86c4cb80 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOp_YAXIANGController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOp_YAXIANGController.cs @@ -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)// { @@ -516,7 +520,8 @@ namespace DSWeb.MvcShipping.Controllers var strSql = " update MsOp_YAXIANG set SPENDMONEY= "; } - + + [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) { diff --git a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs index d7e2a063..9f6bc543 100644 --- a/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/MsOpSeae/MsOpSeaeEdiPortDAL.cs @@ -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; diff --git a/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs b/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs index 0aaefc18..9e115e50 100644 --- a/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs +++ b/DSWeb/Areas/TruckMng/Models/MsWlBs/MsWlPcHead.cs @@ -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 diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js index 3437b081..b9f7e96f 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_HYRDIndex.js @@ -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 }); diff --git a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js index 2e7517c4..7b8ae83a 100644 --- a/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js +++ b/DSWeb/Areas/TruckMng/Viewsjs/MsWlBs/MsPcEdit_ZXIndex.js @@ -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 }); diff --git a/DispatchWeb/DispatchWeb.csproj.user b/DispatchWeb/DispatchWeb.csproj.user index af17a67a..e6a8406a 100644 --- a/DispatchWeb/DispatchWeb.csproj.user +++ b/DispatchWeb/DispatchWeb.csproj.user @@ -1,7 +1,7 @@  - Release|Any CPU + Debug|Any CPU true diff --git a/JobAutoCreateFee/JobBankData.cs b/JobAutoCreateFee/JobBankData.cs index 57b2b1a3..210f5e7f 100644 --- a/JobAutoCreateFee/JobBankData.cs +++ b/JobAutoCreateFee/JobBankData.cs @@ -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");