diff --git a/APPQ5/QMAPP.FJC.BLL/SendManage/SendPlanRecordBLL.cs b/APPQ5/QMAPP.FJC.BLL/SendManage/SendPlanRecordBLL.cs index fa889ce..a635e8b 100644 --- a/APPQ5/QMAPP.FJC.BLL/SendManage/SendPlanRecordBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/SendManage/SendPlanRecordBLL.cs @@ -173,5 +173,56 @@ namespace QMAPP.FJC.BLL.SendManage } #endregion + + #region 出库信息 + /// + /// 出库信息 + /// + /// + /// 更新行数 + public DataResult Delete(string strs) + { + DataResult result = new DataResult(); + result.IsSuccess = true; + try + { + int temp = 0; + if (!string.IsNullOrEmpty(strs)) + { + foreach (var str in strs.Split(':')) + { + PastCard info = new PastCard(); + info = new SendPlanRecordDAL().GetPID(str); + + //基本信息 + info.FLAGDEL = "1"; + + temp += new SendPlanRecordDAL().Update(info); + + } + } + + if (temp == 0) + { + result.IsSuccess = false; + result.Msg = "更新失败！"; + return result; + } + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "更新异常!" + }); + result.IsSuccess = false; + result.Ex = ex; + result.Msg = "更新异常"; + } + return result; + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs index 4702024..7c96fb9 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs @@ -275,6 +275,73 @@ namespace QMAPP.FJC.BLL.TianJin } #endregion + #region 出库信息 + /// + /// 出库信息 + /// + /// + /// 更新行数 + public DataResult Delete(string strs) + { + DataResult result = new DataResult(); + result.IsSuccess = true; + try + { + int temp = 0; + if (!string.IsNullOrEmpty(strs)) + { + foreach (var str in strs.Split(':')) + { + Storage info = new Storage(); + info = new StorageDAL().GetPID(str); + + //基本信息 + info.UPDATEDATE = DateTime.Now.ToString(); + info.UPDATEUSER = this.LoginUser.UserName; + info.State = "5"; + + temp += new StorageDAL().Update(info); + + var storageLog2 = new StorageLog(); + storageLog2.PID = Guid.NewGuid().ToString(); + storageLog2.CREATEUSER = this.LoginUser.UserName; + storageLog2.CREATEDATE = DateTime.Now.ToString(); + storageLog2.UPDATEUSER = info.CREATEUSER; + storageLog2.UPDATEDATE = info.CREATEDATE; + storageLog2.State = "5"; + storageLog2.ProductCode = info.ProductCode; + storageLog2.MATERIALCODE = info.MATERIALCODE; + storageLog2.MATERIALNAME = info.MATERIALNAME; + storageLog2.InStorageType = "管理员删除"; + + StorageLogDAL cmdDALlog2 = new StorageLogDAL(); + cmdDALlog2.Insert(storageLog2); + } + } + + if (temp == 0) + { + result.IsSuccess = false; + result.Msg = "更新失败！"; + return result; + } + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "更新异常!" + }); + result.IsSuccess = false; + result.Ex = ex; + result.Msg = "更新异常"; + } + return result; + } + #endregion + #region 导出数据 /// /// 获取导出的数据 diff --git a/APPQ5/QMAPP.FJC.DAL/SendManage/SendPlanRecordDAL.cs b/APPQ5/QMAPP.FJC.DAL/SendManage/SendPlanRecordDAL.cs index 236ce1f..730ea56 100644 --- a/APPQ5/QMAPP.FJC.DAL/SendManage/SendPlanRecordDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/SendManage/SendPlanRecordDAL.cs @@ -96,7 +96,7 @@ namespace QMAPP.FJC.DAL.SendManage whereBuilder.Append(" AND M.PLANTNAME LIKE @WORKCENTER_CODE "); parameters.Add(new DataParameter { ParameterName = "WORKCENTER_CODE", DataType = DbType.String, Value = condition.WORKCENTER_CODE }); } - + whereBuilder.Append(" AND M.FLAGDEL = '0' "); //时间 if (condition.STARTCREATEDATE != DateTime.MinValue) @@ -305,5 +305,52 @@ namespace QMAPP.FJC.DAL.SendManage throw ex; } } + + public PastCard GetPID(string PID) + { + try + { + string sql = $"SELECT top 1 * FROM [T_PP_PASTECARD] WHERE [PASTECARDNO]= '{PID}' "; + List parameters = new List(); + parameters.Add(new DataParameter("PID", PID)); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + var info = session.Get(sql, parameters.ToArray()); + return info; + } + } + catch (Exception ex) + { + throw ex; + } + } + + #region 更新信息 + /// + /// 更新信息 + /// + /// + /// 更新行数 + public int Update(PastCard info) + { + int count = 0; + try + { + List parameters = new List(); + var sql = $"update T_PP_PASTECARD set FLAGDEL = '1' where PASTECARDNO = '{info.PASTECARDNO}'"; + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + count = session.ExecuteSql(sql, parameters.ToArray()); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index 7acde66..9a4d6f5 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -310,8 +310,8 @@ namespace QMAPP.FJC.DAL.TianJin //strSql.AppendLine(" WHERE PASTECARDID='" + ppastercarKey.ToString() + "' "); //strSql.AppendLine(" ORDER BY D.ROWINDEX,F.SEQ,F.MATERIAL_CODE"); - strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,D.SANBARCODE as 'VIN' ,F.MATERIAL_CODE as 'PRODNO' ,D.SANBARCODE AS 'CARSETDESC_CN' ,CASE SUBSTRING(D.SANBARCODE,7,2) WHEN 'FL' THEN '左前' WHEN 'RL' THEN '左后' WHEN 'FR' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', "); - strSql.AppendLine("SUBSTRING(D.SANBARCODE,0,4) as 'LINENO' ,C.PASTECARDNO FROM T_PP_PASCARDDETAILS AS D LEFT JOIN T_PP_TJFY_WORKORDER AS F ON F.PID = D.FISDETAILID LEFT JOIN T_PP_PASTECARD AS C ON C.PID = D.PASTECARDID "); + strSql.AppendLine("SELECT D.ROWINDEX ,F.SEQ as 'VWSEQ' ,D.SANBARCODE as 'VIN' ,M.MATERIAL_CODE as 'PRODNO' ,M.MATERIAL_NAME AS 'CARSETDESC_CN' ,CASE SUBSTRING(D.SANBARCODE,7,2) WHEN 'FL' THEN '左前' WHEN 'RL' THEN '左后' WHEN 'FR' THEN '右前' WHEN 'RR' THEN '右后' ELSE F.MOULD_CODE END AS 'CP5A', "); + strSql.AppendLine("SUBSTRING(D.SANBARCODE,0,4) as 'LINENO' ,C.PASTECARDNO FROM T_PP_PASCARDDETAILS AS D LEFT JOIN T_PP_TJFY_WORKORDER AS F ON F.PID = D.FISDETAILID LEFT JOIN T_PP_PASTECARD AS C ON C.PID = D.PASTECARDID LEFT JOIN T_AW_PRODUCT AS P ON P.PRODUCTCODE = D.SANBARCODE LEFT JOIN T_MD_MATERIAL AS M ON M.MATERIAL_CODE = P.MATERIAL_CODE"); strSql.AppendLine(" WHERE PASTECARDID='" + ppastercarKey.ToString() + "' "); strSql.AppendLine(" ORDER BY D.ROWINDEX,F.SEQ,F.MATERIAL_CODE"); diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/SendPlanRecordController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/SendPlanRecordController.cs index c8bd0cb..8292655 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/SendPlanRecordController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/SendPlanRecordController.cs @@ -226,5 +226,34 @@ namespace QMAPP.FJC.Web.Controllers } #endregion + #region 删除 + /// + /// 删除 + /// + /// 结果 + [HttpPost] + [HandleException] + public ActionResult Delete(PastCardModel model) + { + string selectKey = Request.Form["selectKey"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + result = wcfAgent.InvokeServiceFunction>("SendPlanRecordBLL_Delete", selectKey); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return List(true); + } + SetMessage(AppResource.DeleteMessage); + return List(true); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion } } diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs index 7b4edef..b7796dc 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/StorageController.cs @@ -94,6 +94,36 @@ namespace QMAPP.FJC.Web.Controllers } #endregion + #region 删除 + /// + /// 删除 + /// + /// 结果 + [HttpPost] + [HandleException] + public ActionResult Delete(StorageModel model) + { + string selectKey = Request.Form["selectKey"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + result = wcfAgent.InvokeServiceFunction>("StorageBLL_Delete", selectKey); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return List(true); + } + SetMessage(AppResource.DeleteMessage); + return List(true); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + #region 导出excel /// /// 导出excel diff --git a/APPQ5/QMAPP.FJC.Web/Views/SendPlanRecord/SendPlanRecordList.aspx b/APPQ5/QMAPP.FJC.Web/Views/SendPlanRecord/SendPlanRecordList.aspx index 1eee939..d80e3b1 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/SendPlanRecord/SendPlanRecordList.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/SendPlanRecord/SendPlanRecordList.aspx @@ -156,6 +156,22 @@ Inherits="System.Web.Mvc.ViewPage submitByButton("ExportExcel2"); } $(function () { List(1); }); + + function Delete() { + var ids = getSelectKey(); + if (ids == "") { + MSI("错误", "至少选择一条记录"); + } + else { + document.getElementById("selectKey").value = ids; + MSQ("提示", + "确定要删除选中的记录吗？", + function() { + submitByButton("Delete"); + }); + } + } + @@ -166,6 +182,7 @@ Inherits="System.Web.Mvc.ViewPage <%=Html.QTButtonSearch("SendPlanRecord", "List", "List(1)")%> <%=Html.QTButton("showDetail", "ShowWindow", QMFrameWork.WebUI.IconCls.detail, "ShowWindow()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", (s, f) => { return true; })%> + <%=Html.QTButtonDelete("SendPlanRecord", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%> diff --git a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx index e3313d7..975e328 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/Storage/StorageList.aspx @@ -70,6 +70,21 @@ //} List(1) } + function Delete() { + var ids = getSelectKey(); + if (ids == "") { + MSI("错误", "至少选择一条记录"); + } + else { + document.getElementById("selectKey").value = ids; + MSQ("提示", + "确定要删除选中的记录吗？", + function() { + submitByButton("Delete"); + }); + } + } + $(function () { @@ -89,7 +104,7 @@ <%=Html.QTButtonSearch("Storage", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%> - + <%=Html.QTButtonDelete("Storage", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%>