diff --git a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs index 26e54a8f..50d0e520 100644 --- a/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs +++ b/DSWeb/Areas/MvcShipping/Controllers/MsOp_BLISSUEController.cs @@ -2319,6 +2319,22 @@ namespace DSWeb.MvcShipping.Controllers return new ContentResult() { Content = JsonConvert.Serialize(jsonRespose) }; } + public ContentResult UnKD(string USERID, string data, string type) //扣单 取消扣单 + { + var cdc = new CommonDataContext(); + var user = cdc.VW_user.Where(x => x.USERID == USERID).ToList(); + var username = ""; + if (user != null && user.Count > 0) { + username = user[0].SHOWNAME; + } + var dataList = JsonConvert.Deserialize>(data); + var bsnoList=new List(); + bsnoList = dataList.Select(s => s.BSNO).ToList(); + var _r = MsOp_BLISSUEDAL.UnKD(bsnoList, USERID, username); + + return BasicDataRefDAL.GetContentResult(_r); + } + public ContentResult KD_NoCancel(string USERID, string data, string type) //扣单 不取消扣单 { var _r1 = SaveList_P(data); diff --git a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js index 44f246a9..ec007982 100644 --- a/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js +++ b/DSWeb/Areas/MvcShipping/Viewsjs/MsOp_BLISSUE/MsOp_BLISSUEDSIndex.js @@ -1302,7 +1302,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { text: "解除扣单", id: "UNLOCKBL", hidden: true, iconCls: 'btislock', handler: function (button, event) { - this.onKDClick(); + this.onUnKDClick(); }, scope: this }, { @@ -4376,7 +4376,7 @@ Ext.extend(Shipping.MsOp_BLISSUEIndex, Ext.Panel, { Ext.Ajax.request({ waitMsg: '正在提交数据...', - url: '/MvcShipping/MsOp_BLISSUE/KD', + url: '/MvcShipping/MsOp_BLISSUE/UnKD', params: { USERID: USERID, data: jsonBody