diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs index 6266014d..efd5ba50 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOpAirnController.cs @@ -210,7 +210,7 @@ namespace DSWeb.MvcShipping.Controllers { var headData = JsonConvert.Deserialize(data); - + DBResult result=new DBResult(); var CargobodyList = JsonConvert.Deserialize>(CargoBody); var CargodelbodyList = JsonConvert.Deserialize>(CargoDelBody); @@ -220,6 +220,12 @@ namespace DSWeb.MvcShipping.Controllers //headData.CREATETIME = DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss"); } + var oldheadData = MsOpAirnDAL.GetData(" B.BSNO='" + headData.BSNO + "' "); + + if (oldheadData.FEESTATUS == true) { + result.SetErrorInfo("费用锁定的业务不允许修改"); + } + var isPost = true; var errorstr = ""; //var isuse = false; @@ -263,7 +269,7 @@ namespace DSWeb.MvcShipping.Controllers var feecount = BasicDataRefDAL.GetExist("ch_fee", " BSNO='" + headData.BSNO + "' "); if (feecount > 0) { - var oldheadData = MsOpAirnDAL.GetData(" B.BSNO='" + headData.BSNO + "' "); + headData.BLFRT = oldheadData.BLFRT; headData.PFREIGHT = oldheadData.PFREIGHT; @@ -348,7 +354,7 @@ namespace DSWeb.MvcShipping.Controllers BasicDataRefDAL.SaveLog("opstatus="+ opstatus+":"+JsonConvert.Serialize(headData)+"//"+ JsonConvert.Serialize(CargobodyList), Convert.ToString(Session["SHOWNAME"]),"内贸空运","主单保存"); var modb = new ModelObjectRepository(); - DBResult result = modb.Save(headData, + result = modb.Save(headData, ModelObjectConvert.ToModelObjectList(CargobodyList), ModelObjectConvert.ToModelObjectList(CargodelbodyList) ); @@ -506,7 +512,6 @@ namespace DSWeb.MvcShipping.Controllers if (iscreatecustno == true) MsSysBillNoSetDAL.DeleteBsNo(headData.CUSTNO); - var result = new DBResult(); result.Success = false; result.Message = errorstr + "重复,不允许保存!"; diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js index 47d20bfd..bf1e0cd1 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOpAirn/MsOpAirnMainEdit.js @@ -799,6 +799,7 @@ Ext.extend(Shipping.MsOpAirnEdit, Ext.Panel, { }] }, { fieldLabel: '分单号', + readOnly: true, name: 'HBLNO' }, this.comboxStlName, { fieldLabel: '结算日期',