From 3ababf3e326de4a1f6f49b8567b5ff9949f86f42 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Tue, 29 Mar 2022 21:39:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=80=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj | 1 + APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs | 667 ++++++++++ APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj | 1 + APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs | 6 +- APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs | 1116 +++++++++++++++++ APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs | 4 + APPQ5/QMAPP.WinForm/App.config | 14 +- .../Forms/Operation/OperationForm.cs | 8 +- .../Forms/TianJin/TJFrmItemList.cs | 37 +- .../Forms/TianJin/TJPastCard.rpt | Bin 32768 -> 32768 bytes .../TianJin/TJPrintPlanLabel.Designer.cs | 89 +- .../Forms/TianJin/TJPrintPlanLabel.cs | 20 +- .../Forms/TianJin/TJPrintPlanLabel.resx | 3 - .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 +- .../App_Data/FJCServiceList.xml | 7 + .../WCF/QMFrameWork.WebServiceHost/Web.config | 4 +- 16 files changed, 1909 insertions(+), 72 deletions(-) create mode 100644 APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs create mode 100644 APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs diff --git a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj index 67d9f36..e5da0f1 100644 --- a/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj +++ b/APPQ5/QMAPP.FJC.BLL/QMAPP.FJC.BLL.csproj @@ -190,6 +190,7 @@ + diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs new file mode 100644 index 0000000..5d369fd --- /dev/null +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJWorkOrderBLL.cs @@ -0,0 +1,667 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMAPP.BLL; +using QMAPP.FJC.Entity.ProductionPlan; +using QMAPP.FJC.DAL.ProductionPlan; +using QMFrameWork.Data; +using QMAPP.Entity; +using System.Data; +using QMAPP.FJC.Entity.Operation; +using QMAPP.FJC.Entity.FIS; +using QMAPP.FJC.DAL.TianJin; +using QMAPP.FJC.Entity.TianJin; + +namespace QMAPP.FJC.BLL.TianJin +{ + /// + ///　模块名称：派工单 + ///　作 者：张鹏 + ///　编写日期：2017年10月24日 + /// + public class TJWorkOrderBLL : BaseBLL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// 信息 + public WorkOrder Get(WorkOrder info) + { + try + { + return new TWorkOrderDAL().Get(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataPage GetList(WorkOrder condition, DataPage page) + { + try + { + return new TWorkOrderDAL().GetList(condition, page); + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 获取指定工序的生产计划清单 + /// + /// 工序编码 + /// 过滤选项：0全部；1隐藏挂起；2只看挂起 + /// + public List GetOrderInCell(string workcellcode,int filter, DataPage dataPage) + { + try + { + return new TWorkOrderDAL().GetOrderInCell(workcellcode,filter,dataPage.PageSize); + } + catch (Exception ex) + { + throw ex; + } + } + + + /// + /// + /// + /// + /// + public List GetOrderInfo(string orderplanno) + { + try + { + return new TWorkOrderDAL().GetWorkOrderInfo(orderplanno); + } + catch (Exception ex) + { + throw ex; + } + } + + public List GetOrderUnPrinted(string RouteCode, int filter, DataPage dataPage,string Direction) + { + try + { + return new TWorkOrderDAL().GetOrderUnPrinted(RouteCode, Direction, filter, dataPage.PageSize); + } + catch (Exception ex) + { + throw ex; + } + } + + public int SetOrderPrinted(string orderpid) + { + try + { + return new TWorkOrderDAL().SetOrderPrinted(orderpid); + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取指定工序下待完成计划数量 + /// + /// 工序编码 + /// 班次 + /// 日期 + /// + public int GetOrderCountInCell(string workcellcode, string shift) + { + try + { + var date = DateTime.Now; + return new TWorkOrderDAL().GetOrderCountInCell(workcellcode, shift, date); + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取工作中心当日的总计划数量 + /// + /// 工作中心 + /// + public int GetDayPlanCount(string workcentercode) + { + try + { + var date = DateTime.Now; + return new TWorkOrderDAL().GetDayPlanCount(workcentercode, date); + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取计划标签数据 + /// + /// + /// + public Entity.View.PlanLabel GetPlanLabel(string workorderid) + { + Entity.View.PlanLabel labeldata = new Entity.View.PlanLabel(); + TWorkOrderDAL dal = new TWorkOrderDAL(); + var order = dal.Get(new WorkOrder { PID = workorderid }); + if (order == null) + { + throw new Exception("获取工单信息失败！"); + } + + labeldata.BOM = order.PBOM_CODE; + labeldata.PN = order.MATERIAL_CODE; + labeldata.SEQ = order.SEQ; + labeldata.PlanDate = order.PLAN_DATE.ToString("yyyy-MM-dd HH:mm:ss"); + switch (order.ORDER_TYPE) + { + case "0": + { + labeldata.PlanType = "FIS"; + break; + } + case "1": + { + labeldata.PlanType = "STOCK"; + break; + } + case "2": + { + labeldata.PlanType = "INSERT"; + break; + } + } + var plandal = new DAL.FIS.OrderPlanDAL(); + var plan = plandal.Get(new Entity.FIS.OrderPlan { PID = order.ORDERPLANID }); + if (plan == null) + { + throw new Exception("获取计划信息异常!"); + } + labeldata.PlanNo = plan.PLAN_NO; + + + if (order.ORDER_TYPE == "0") + { + var fisdal = new DAL.FIS.FISOrderDAL(); + var fis = fisdal.GetByPlan(plan.PLAN_NO, plan.MATERIAL_CODE); + if (fis == null) + { + throw new Exception("获取FIS信息异常!"); + } + labeldata.VIN = fis.VIN; + labeldata.KIN = fis.KIN; + } + else + { + labeldata.VIN = "N/A"; + labeldata.KIN = "N/A"; + } + var materialdal = new MD.DAL.MaterialDAL(); + var material = materialdal.Get(new MD.Entity.Material { MATERIAL_CODE = order.MATERIAL_CODE }); + if (material == null) + { + throw new Exception("获取物料信息异常!"); + } + labeldata.HBType = material.HBTYPE; + labeldata.ProjectCode = material.PROJECTCODE; + labeldata.Color = material.COLOR; + labeldata.ProdName = material.MATERIAL_NAME; + return labeldata; + } + + /// + /// 获取计划标签数据 + /// + /// + /// + public Entity.View.PlanLabel GetPlanLabelBindProdut(Product Product) + { + Entity.View.PlanLabel labeldata = new Entity.View.PlanLabel(); + + var plandal = new DAL.FIS.OrderPlanDAL(); + var plan = plandal.Get(new Entity.FIS.OrderPlan { PID = Product.PLAN_ID }); + if (plan == null) + { + throw new Exception("获取计划信息异常!"); + } + labeldata.BOM = plan.PBOM_CODE; + labeldata.PN = plan.MATERIAL_CODE; + + labeldata.PlanDate = plan.PLAN_DATE.ToString("yyyy-MM-dd HH:mm:ss"); + + TWorkOrderDAL dal = new TWorkOrderDAL(); + var order = dal.GetOneByProduct(Product.PRODUCTCODE); + if (order != null) + { + labeldata.SEQ = order.SEQ; + } + else + { + labeldata.SEQ = "N/A"; + } + switch (plan.PLANSOURCE) + { + case "0": + { + labeldata.PlanType = "FIS"; + break; + } + case "1": + { + labeldata.PlanType = "STOCK"; + break; + } + case "2": + { + labeldata.PlanType = "INSERT"; + break; + } + } + + labeldata.PlanNo = plan.PLAN_NO; + + + if (plan.PLANSOURCE == "0") + { + var fisdal = new DAL.FIS.FISOrderDAL(); + var fis = fisdal.GetByPlan(plan.PLAN_NO, plan.MATERIAL_CODE); + if (fis == null) + { + throw new Exception("获取FIS信息异常!"); + } + labeldata.VIN = fis.VIN; + labeldata.KIN = fis.KIN; + } + else + { + labeldata.VIN = "N/A"; + labeldata.KIN = "N/A"; + } + var materialdal = new MD.DAL.MaterialDAL(); + var material = materialdal.Get(new MD.Entity.Material { MATERIAL_CODE = plan.MATERIAL_CODE }); + if (material == null) + { + throw new Exception("获取物料信息异常!"); + } + labeldata.HBType = material.HBTYPE; + labeldata.ProjectCode = material.PROJECTCODE; + labeldata.Color = material.COLOR; + labeldata.ProdName = material.MATERIAL_NAME; + return labeldata; + } + + #endregion + + #region 信息是否重复 + /// + /// 判断名称是否存在 + /// + /// 信息 + /// true:已存在；fasel:不存在。 + public bool Exists(WorkOrder info) + { + try + { + return new TWorkOrderDAL().Exists(info); + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public DataResult Insert(WorkOrder info) + { + DataResult result = new DataResult(); + try + { + if (string.IsNullOrWhiteSpace(info.PID)) + { + info.PID = Guid.NewGuid().ToString(); + } + TWorkOrderDAL cmdDAL = new TWorkOrderDAL(); + result.Result = new TWorkOrderDAL().Insert(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// 信息 + /// 更新行数 + public DataResult Update(WorkOrder info) + { + DataResult result = new DataResult(); + try + { + result.Result = new TWorkOrderDAL().Update(info); + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 挂起工单 + /// + /// + public int SuspendOrder(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + foreach (var order in orders) + { + if (int.Equals(order.STATE, 2)) + { + throw new Exception("不可将状态为执行中的工单挂起！"); + } + order.STATE = 4; + } + var dal = new TWorkOrderDAL(); + return dal.Update(orders); + } + /// + /// 取消挂起 + /// + /// + /// + public int CancelSuspend(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + foreach (var order in orders) + { + if (!int.Equals(order.STATE, 4)) + { + throw new Exception("只可取消状态为挂起状态的工单！"); + } + order.STATE = 1; + } + var dal = new TWorkOrderDAL(); + return dal.Update(orders); + } + /// + /// 回收工单 + /// + /// + /// + public int TakeBack(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + foreach (var order in orders) + { + if (!int.Equals(order.STATE, 4)) + { + throw new Exception("只可回收状态为挂起状态的工单！"); + } + //order.ORDER_TYPE = "1"; + order.PRI = 1; + order.STATE = 0; + } + var dal = new TWorkOrderDAL(); + return dal.Update(orders); + } + /// + /// 重置工单 + /// + /// + /// + public int ResetOrder(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + var first = orders.FirstOrDefault(); + if (first != null) + { + QMAPP.MD.DAL.WorkCellDAL workCelldal = new QMAPP.MD.DAL.WorkCellDAL(); + string pbomcode = first.PBOM_CODE; + QMAPP.MD.Entity.ProcessRouteWorkCellSeq workcell = workCelldal.GetFirstWorkCell(pbomcode).FirstOrDefault(); + foreach (var order in orders) + { + if (!int.Equals(order.STATE, 4)) + { + throw new Exception("只可重置状态为挂起状态的工单！"); + } + //order.ORDER_TYPE = "1"; + order.WORKCELL_CODE = workcell.WORKCELL_CODE; + order.PRI = 1; + order.STATE = 0; + } + var dal = new TWorkOrderDAL(); + return dal.Update(orders); + } + return 0; + } + + /// + /// 忽略FIS断号 + /// + /// + /// + public int IgnoreFISBreak(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + var first = orders.FirstOrDefault(); + var plans = new List(); + var plandal = new DAL.FIS.OrderPlanDAL(); + foreach (var order in orders) + { + if (!int.Equals(order.ORDER_TYPE, "0")) + { + throw new Exception("只可对FIS工单进行忽略断号操作！"); + } + var plan = plandal.Get(new OrderPlan { PID = order.ORDERPLANID }); + if (plan != null) + { + plan.IGNORE_FISBREAK = "1"; + plandal.Update(plan); + plans.Add(plan); + } + } + return plans.Count; + + } + /// + /// 删除工单 + /// + /// + /// + public int DeleteOrder(List orderid) + { + var orders = GetListByID(orderid.ToArray()); + foreach (var order in orders) + { + if (!int.Equals(order.STATE, 4)) + { + throw new Exception("只可删除状态为挂起状态的工单！"); + } + //order.STATE = 1; + } + var dal = new TWorkOrderDAL(); + return dal.Delete(orders); + } + + + /// + /// 根据主键获取列表 + /// + /// + /// + private List GetListByID(params string[] orderid) + { + var dal = new TWorkOrderDAL(); + return dal.GetListByID(orderid); + } + + #endregion + + #region 删除 + /// + /// 删除信息 + /// + /// 主键串 + /// 删除个数 + public DataResult DeleteArray(string strs) + { + int count = 0; + DataResult result = new DataResult(); + string[] list = strs.Split(":".ToCharArray()); + try + { + foreach (string str in list) + { + count += this.Delete(new WorkOrder { PID = str }); + } + result.Result = count; + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 删除信息 + /// + /// 信息 + /// 删除个数 + public int Delete(WorkOrder info) + { + try + { + return new TWorkOrderDAL().Delete(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 导出数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(WorkOrder info) + { + try + { + return new TWorkOrderDAL().GetExportData(info); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 导入数据 + /// + /// 导入数据 + /// + /// 数据 + /// 导入结果 + public DataResult ImportData(List list) + { + DataResult result = new DataResult(); + TWorkOrderDAL cmDal = new TWorkOrderDAL(); + List List = new List(); + int index = 0; + try + { + result.Result = new ImportMessage(); + result.Result.Errors = new List(); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //状态判断 + foreach (WorkOrder ma in list) + { + index++; + if (!string.IsNullOrEmpty(ma.InfoError)) + { + ma.PID = null; + result.Result.failureNum += 1; + continue; + } + //修改改时根据主键等信息获取详细内容信息 + WorkOrder oldInfo = cmDal.Get(ma); + if (oldInfo != null) + { + //更新 + ma.PID = oldInfo.PID; + ma.IsNewInfo = false; + result.Result.updateNum += 1; + } + else + { + //新增 + oldInfo = new WorkOrder(); + if (string.IsNullOrWhiteSpace(ma.PID)) + { + ma.PID = Guid.NewGuid().ToString(); + } + ma.IsNewInfo = true; + result.Result.insertNum += 1; + } + List.Add(ma); + } + } + //导入 + cmDal.GetImportData(List); + result.Msg = "导入成功"; + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + result.IsSuccess = false; + result.Ex = ex; + return result; + } + } + #endregion + } +} diff --git a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj index e8ca8d5..5cf245c 100644 --- a/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj +++ b/APPQ5/QMAPP.FJC.DAL/QMAPP.FJC.DAL.csproj @@ -180,6 +180,7 @@ + diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs index 48331ac..09ea74c 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJWorkOrderDAL.cs @@ -332,7 +332,7 @@ namespace QMAPP.FJC.DAL.TianJin /// 数量 /// 过滤选项：0全部；1隐藏挂起；2只看挂起 /// - public List GetOrderUnPrinted(string routecode, int filter = 0, int count = 20) + public List GetOrderUnPrinted(string routecode, string Direction, int filter = 0, int count = 20) { try { @@ -371,6 +371,10 @@ namespace QMAPP.FJC.DAL.TianJin sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); sql.AppendFormat(" WHERE P.[ROUTE_CODE]=@routecode "); sql.AppendFormat(" AND W.[PRINTED]='0' "); + if (!string.IsNullOrEmpty(Direction)) + { + sql.AppendFormat($" AND M.[MATERIAL_NAME] like '%{Direction}%' "); + } switch (filter) { case 1: diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs new file mode 100644 index 0000000..7f40761 --- /dev/null +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TWorkOrderDAL.cs @@ -0,0 +1,1116 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using QMFrameWork.Data; +using QMAPP.FJC.Entity.ProductionPlan; +using System.Data; +using QMAPP.Entity; +using QMAPP.DAL; +using QMFrameWork.Log; +using QMAPP.FJC.Entity.FIS; + +namespace QMAPP.FJC.DAL.TianJin +{ + /// + ///　模块名称：派工单 + ///　作 者：张鹏 + ///　编写日期：2017年10月24日 + /// + public class TWorkOrderDAL : BaseDAL + { + + #region 获取信息 + /// + /// 获取信息 + /// + /// 条件 + /// *信息 + public WorkOrder Get(WorkOrder info) + { + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + info = session.Get(info); + } + return info; + } + catch (Exception ex) + { + throw ex; + } + } + public WorkOrder GetOne(string ORDERPLANID) + { + string sql = "SELECT * FROM [T_PP_WORKORDER] WITH(NOLOCK) where [ORDERPLANID]='" + ORDERPLANID + "'"; + List parameters = new List(); + try + { + if (BaseSession != null) + { + return BaseSession.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + public WorkOrder GetOneByID(string id) + { + string sql = "SELECT * FROM [T_PP_WORKORDER] WITH(NOLOCK) where [PID]='" + id + "'"; + List parameters = new List(); + try + { + if (BaseSession != null) + { + return BaseSession.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + public WorkOrder GetOneByOrderNO(string ORDERPLANNO) + { + string sql = "SELECT * FROM [T_PP_WORKORDER] WITH(NOLOCK) where [ORDERPLAN_NO]='" + ORDERPLANNO + "'"; + List parameters = new List(); + try + { + if (BaseSession != null) + { + return BaseSession.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + public WorkOrder GetOneByProduct(string productCode) + { + string sql = "SELECT * FROM [T_PP_WORKORDER] WITH(NOLOCK) where [REMARK]='" + productCode + "'"; + List parameters = new List(); + try + { + if (BaseSession != null) + { + return BaseSession.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql, parameters.ToArray()).FirstOrDefault(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + + /// + /// 获取计划单号下所有派工单信息 + /// + /// + /// + public int GetAllWorkOrder(string ORDERPLANID) + { + int count = 0; + string sql = "SELECT COUNT(1) FROM [T_PP_WORKORDER] WITH(NOLOCK) where [ORDERPLANID]='" + ORDERPLANID + "' AND STATE<>0"; + List parameters = new List(); + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + count =Convert.ToInt32(session.ExecuteSqlScalar(sql, parameters.ToArray())); + } + } + catch (Exception ex) + { + throw ex; + } + return count; + } + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 条件 + /// 数据页 + /// 数据页 + public DataPage GetList(WorkOrder condition, DataPage page) + { + string sql = null; + List parameters = new List(); + try + { + sql = this.GetQuerySql(condition, ref parameters); + //分页关键字段及排序 + page.KeyName = "PID"; + if (string.IsNullOrEmpty(page.SortExpression)) + page.SortExpression = "UPDATEDATE DESC"; + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + page = session.GetDataPage(sql, parameters.ToArray(), page); + } + return page; + } + catch (Exception ex) + { + throw ex; + } + } + + public List GetList(WorkOrder condition) + { + List workOrderList = new List(); + string sql = "select * from T_PP_WORKORDER WITH(NOLOCK) where 1=1 "; + if (string.IsNullOrEmpty(condition.ORDERPLANID) == false) + { + sql += string.Format(" and ORDERPLANID='{0}'",condition.ORDERPLANID); + } + + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + workOrderList = session.GetList(sql, new List().ToArray()).ToList(); + } + + return workOrderList; + } + + + public List GetWorkOrderInfo(string planno) + { + try + { + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT W.[PID]"); + sql.AppendFormat(" ,W.[ORDERPLANID] "); + sql.AppendFormat(" ,W.[ORDERPLAN_NO] "); + sql.AppendFormat(" ,W.[ORDER_TYPE] "); + sql.AppendFormat(" ,W.[SEQ] "); + sql.AppendFormat(" ,W.[MATERIAL_CODE] "); + sql.AppendFormat(" ,M.[MATERIAL_NAME] "); + sql.AppendFormat(" ,W.[PBOM_CODE] "); + sql.AppendFormat(" ,W.[QTY] "); + sql.AppendFormat(" ,W.[COMPLETE_QTY] "); + sql.AppendFormat(" ,W.[PLAN_DATE] "); + sql.AppendFormat(" ,W.[SHIFT_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_NAME] "); + sql.AppendFormat(" ,W.[WORKCELL_CODE] "); + sql.AppendFormat(" ,W.[WORKCELL_NAME] "); + sql.AppendFormat(" ,W.[WORKLOC_CODE] "); + sql.AppendFormat(" ,W.[REMARK] "); + sql.AppendFormat(" ,W.[EQPT_NAME] "); + sql.AppendFormat(" ,W.[EQPT_CODE] "); + sql.AppendFormat(" ,W.[STATE] "); + sql.AppendFormat(" ,W.[MOULD_CODE] "); + sql.AppendFormat(" ,W.[PRI] "); + sql.AppendFormat(" ,W.[UPDATEDATE] "); + sql.AppendFormat(" ,W.[PRINTED] "); + sql.AppendFormat(" ,P.[IGNORE_FISBREAK] "); + sql.AppendFormat(" ,P.[FIS_ASMSETCODE] "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendFormat(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) "); + sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); + sql.AppendFormat(" WHERE P.[PLAN_NO]=@planno "); + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + List parameters = new List(); + parameters.Add(new DataParameter("planno", planno)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取指定工序的生产计划清单 + /// + /// 工序编码 + /// 数量 + /// 过滤选项：0全部；1隐藏挂起；2只看挂起 + /// + public List GetOrderInCell(string workcellcode,int filter=0, int count = 20) + { + try + { + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count); + sql.AppendFormat(" ,W.[ORDERPLANID] "); + sql.AppendFormat(" ,W.[ORDERPLAN_NO] "); + sql.AppendFormat(" ,W.[ORDER_TYPE] "); + sql.AppendFormat(" ,W.[SEQ] "); + sql.AppendFormat(" ,W.[MATERIAL_CODE] "); + sql.AppendFormat(" ,M.[MATERIAL_NAME] "); + sql.AppendFormat(" ,W.[PBOM_CODE] "); + sql.AppendFormat(" ,W.[QTY] "); + sql.AppendFormat(" ,W.[COMPLETE_QTY] "); + sql.AppendFormat(" ,W.[PLAN_DATE] "); + sql.AppendFormat(" ,W.[SHIFT_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_NAME] "); + sql.AppendFormat(" ,W.[WORKCELL_CODE] "); + sql.AppendFormat(" ,W.[WORKCELL_NAME] "); + sql.AppendFormat(" ,W.[WORKLOC_CODE] "); + sql.AppendFormat(" ,W.[REMARK] "); + sql.AppendFormat(" ,W.[EQPT_NAME] "); + sql.AppendFormat(" ,W.[EQPT_CODE] "); + sql.AppendFormat(" ,W.[STATE] "); + sql.AppendFormat(" ,W.[MOULD_CODE] "); + sql.AppendFormat(" ,W.[PRI] "); + sql.AppendFormat(" ,W.[UPDATEDATE] "); + sql.AppendFormat(" ,P.[IGNORE_FISBREAK] "); + sql.AppendFormat(" ,P.[FIS_ASMSETCODE] "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendFormat(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK)"); + sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); + sql.AppendFormat(" WHERE W.[WORKCELL_CODE]=@workcellcode "); + switch (filter) + { + case 1: + { + sql.AppendFormat(" AND W.[STATE]<>4 "); + break; + } + case 2: + { + sql.AppendFormat(" AND W.[STATE]=4 "); + break; + } + } + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + List parameters = new List(); + parameters.Add(new DataParameter("workcellcode", workcellcode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch(Exception ex) + { + throw ex; + } + } + + /// + /// 获取指定工序的生产计划清单 + /// + /// 工序编码 + /// 数量 + /// 过滤选项：0全部；1隐藏挂起；2只看挂起 + /// + public List GetOrderUnPrinted(string routecode, string Direction, int filter = 0, int count = 20) + { + try + { + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT TOP {0} W.[PID]\r\n", count); + sql.AppendFormat(" ,W.[ORDERPLANID] "); + sql.AppendFormat(" ,W.[ORDERPLAN_NO] "); + sql.AppendFormat(" ,W.[ORDER_TYPE] "); + sql.AppendFormat(" ,W.[SEQ] "); + sql.AppendFormat(" ,W.[MATERIAL_CODE] "); + sql.AppendFormat(" ,M.[MATERIAL_NAME] "); + sql.AppendFormat(" ,W.[PBOM_CODE] "); + sql.AppendFormat(" ,W.[QTY] "); + sql.AppendFormat(" ,W.[COMPLETE_QTY] "); + sql.AppendFormat(" ,W.[PLAN_DATE] "); + sql.AppendFormat(" ,W.[SHIFT_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_CODE] "); + sql.AppendFormat(" ,W.[WORKCENTER_NAME] "); + sql.AppendFormat(" ,W.[WORKCELL_CODE] "); + sql.AppendFormat(" ,W.[WORKCELL_NAME] "); + sql.AppendFormat(" ,W.[WORKLOC_CODE] "); + sql.AppendFormat(" ,W.[REMARK] "); + sql.AppendFormat(" ,W.[EQPT_NAME] "); + sql.AppendFormat(" ,W.[EQPT_CODE] "); + sql.AppendFormat(" ,W.[STATE] "); + sql.AppendFormat(" ,W.[MOULD_CODE] "); + sql.AppendFormat(" ,W.[PRI] "); + sql.AppendFormat(" ,W.[UPDATEDATE] "); + sql.AppendFormat(" ,W.[PRINTED] "); + sql.AppendFormat(" ,P.[IGNORE_FISBREAK] "); + sql.AppendFormat(" ,P.[FIS_ASMSETCODE] "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendFormat(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendFormat(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendFormat(" LEFT JOIN [T_MD_MATERIAL] AS M WITH(NOLOCK) "); + sql.AppendFormat(" ON W.[MATERIAL_CODE]=M.[MATERIAL_CODE] "); + sql.AppendFormat(" WHERE P.[ROUTE_CODE]=@routecode "); + sql.AppendFormat(" AND W.[PRINTED]='0' "); + + if (!string.IsNullOrEmpty(Direction)) + { + sql.AppendFormat($" AND M.[MATERIAL_NAME] LIKE '%{Direction}%' "); + } + + switch (filter) + { + case 1: + { + sql.AppendFormat(" AND W.[STATE]<>4 "); + break; + } + case 2: + { + sql.AppendFormat(" AND W.[STATE]=4 "); + break; + } + } + sql.AppendFormat(" ORDER BY W.[UPDATEDATE],W.[PRI],W.[PLAN_DATE],P.PLAN_SEQ,W.[SEQ],W.[MATERIAL_CODE] "); + List parameters = new List(); + parameters.Add(new DataParameter("routecode", routecode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取指定工序的待完成计划数量 + /// + /// 工序编码 + /// 不指定班次则查询全部计划 + /// 不指定班次则无需输入日期 + /// + public int GetOrderCountInCell(string workcellcode,string shift,DateTime date) + { + try + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendFormat("SELECT COUNT(*) "); + sql.AppendFormat(" FROM [T_PP_WORKORDER] WITH(NOLOCK) "); + sql.AppendFormat(" WHERE [WORKCELL_CODE]=@workcellcode "); + sql.AppendFormat(" AND [STATE]<>4"); + if (!string.IsNullOrWhiteSpace(shift)) + { + sql.AppendFormat(" AND [SHIFT_CODE]=@shift"); + parameters.Add(new DataParameter("shift", shift)); + //sql.AppendFormat(" AND DATEDIFF(DAY,[PLAN_DATE],@date)=0"); + //parameters.Add(new DataParameter("date", date)); + sql.AppendFormat(" AND [PLAN_DATE] BETWEEN @date1 AND @date2"); + parameters.Add(new DataParameter("date1", date.Date)); + parameters.Add(new DataParameter("date2", date.Date.AddDays(1))); + } + parameters.Add(new DataParameter("workcellcode", workcellcode)); + + + using (var session = AppDataFactory.CreateMainSession()) + { + return (int)session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray()); + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取查询语句 + /// + /// 获取查询语句 + /// + /// 查询条件 + /// 参数 + /// 查询语句 + private string GetQuerySql(WorkOrder condition, ref List parameters) + { + StringBuilder sqlBuilder = new StringBuilder(); + StringBuilder whereBuilder = new StringBuilder(); + try + { + //构成查询语句 + sqlBuilder.Append("SELECT PID,ORDERPLANID,ORDERPLAN_NO,ORDER_TYPE,SEQ,MATERIAL_CODE,PBOM_CODE,QTY,COMPLETE_QTY,PLAN_DATE,SHIFT_CODE,WORKCENTER_CODE,WORKCENTER_NAME,WORKCELL_CODE,WORKCELL_NAME,WORKLOC_CODE,REMARK,EQPT_NAME,EQPT_CODE,STATE "); + sqlBuilder.Append("FROM T_PP_WORKORDER WITH(NOLOCK) "); + whereBuilder.Append(" AND FLGDEL<> '1' "); + //查询条件 + if (whereBuilder.Length > 0) + { + sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4)); + } + return sqlBuilder.ToString(); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 获取导出的数据 + /// + /// 获取导出的数据 + /// + /// 查询条件 + /// 数据 + public DataTable GetExportData(WorkOrder info) + { + DataTable dt = null; + string sql = null; + List parameters = new List(); + try + { + //构成查询语句 + sql = this.GetQuerySql(info, ref parameters); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + dt = session.GetTable(sql, parameters.ToArray()); + dt.TableName = "WorkOrder"; + } + return dt; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 信息是否重复 + /// + /// 判断名称是否存在 + /// + /// + /// true:已存在；fasel:不存在。 + public bool Exists(WorkOrder info) + { + StringBuilder sqlBuilder = new StringBuilder(); + StringBuilder whereBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + sqlBuilder.Append("SELECT COUNT(0) FROM T_PP_WORKORDER WITH(NOLOCK) "); + if (info.PID == null) + { + info.PID = ""; + } + whereBuilder.Append(" AND PID <> @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID }); + + //添加进行无重复字段判断代码 + + if (whereBuilder.Length > 0) + { + sqlBuilder.Append(" WHERE " + whereBuilder.ToString().Substring(4)); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), parameters.ToArray())); + } + return count > 0; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public int Insert(WorkOrder info) + { + try + { + if (BaseSession != null) + { + return BaseSession.Insert(info); + } + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //插入基本信息 + return session.Insert(info); + } + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 更新信息 + /// + /// 更新信息 + /// + /// + /// 更新行数 + public int Update(WorkOrder info) + { + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //更新基本信息 + count = session.Update(info); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 逻辑删除 + /// + /// 逻辑删除信息 + /// + /// + /// 删除个数 + public int Delete(WorkOrder info) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + int count = 0; + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //删除基本信息 + sqlBuilder.Append("UPDATE T_PP_WORKORDER "); + sqlBuilder.Append("SET FLGDEL = '1' "); + sqlBuilder.Append("WHERE PID = @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = info.PID }); + count = session.ExecuteSql(sqlBuilder.ToString(), parameters.ToArray()); + } + return count; + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + /// + /// 删除派工单 + /// + /// + public void BatchDeleteByOrderPlan(WorkOrder entity) + { + try + { + string deleteSql = string.Format("delete from T_PP_WORKORDER where ORDERPLANID='{0}' ", entity.ORDERPLANID); + this.BaseSession.ExecuteSql(deleteSql, new List().ToArray()); + } + catch (Exception ex) + { + + throw ex; + } + + } + + #region 导入 + public ImportMessage GetImportData(List list) + { + ImportMessage em = new ImportMessage(); + List parameters = new List(); + try + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //设置祖先对象数据会话 + session.OpenTs(); + foreach (WorkOrder info in list) + { + if (info.IsNewInfo) + { + //插入信息 + int count = session.Insert(info); + em.insertNum++; + } + else + { + //更新信息 + int count = session.Update(info); + em.updateNum++; + } + } + session.CommitTs(); + } + } + catch (Exception ex) + { + throw ex; + } + return em; + } + #endregion + + /// + /// 获取指定工位正在执行的派工单 + /// + /// + /// + public WorkOrder GetWorkingOrderInLoc(string workloccode,string mouldcode) + { + try + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT O.* "); + sql.AppendLine(" ,P.[IGNORE_FISBREAK] "); + sql.AppendLine(" ,P.[FIS_ASMSETCODE] "); + sql.AppendLine(" FROM [T_PP_WORKORDER] AS O WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendLine(" ON P.[PID]=O.[ORDERPLANID] "); + sql.AppendLine(" WHERE O.[WORKLOC_CODE]=@workloccode "); + sql.AppendLine(" AND O.[MOULD_CODE]=@mouldcode "); + sql.AppendLine(" AND O.[STATE]='2' "); //工单状态为执行中 + parameters.Add(new DataParameter("workloccode", workloccode)); + parameters.Add(new DataParameter("mouldcode", mouldcode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.Get(sql.ToString(), parameters.ToArray()); + } + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 获取第一条匹配的派工单 + /// + /// 工序 + /// 产品物料号 + /// + public WorkOrder GetFirstMatchOrder(string workcellcode, string productmaterial,string planpid="") + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT TOP 1 O.* "); + sql.AppendLine(" ,P.[IGNORE_FISBREAK] "); + sql.AppendLine(" ,P.[FIS_ASMSETCODE] "); + sql.AppendLine(" FROM [T_PP_WORKORDER] AS O WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendLine(" ON P.[PID]=O.[ORDERPLANID] "); + sql.AppendLine(" WHERE O.[WORKCELL_CODE]=@workcellcode "); + if (!string.IsNullOrWhiteSpace(planpid)) + { + sql.AppendLine(" AND O.[ORDERPLANID]=@planpid"); + parameters.Add(new DataParameter("planpid", planpid)); + } + sql.AppendLine(" AND (EXISTS (SELECT 1 "); + sql.AppendLine(" FROM T_MD_PBOM_ITEM AS I "); + sql.AppendLine(" WHERE O.PBOM_CODE = I.PBOM_CODE "); + sql.AppendLine(" AND I.FLGDEL = '0' "); + sql.AppendLine(" AND I.MATERIAL_CODE = @materialcode) "); + sql.AppendLine(" OR O.[MATERIAL_CODE]=@materialcode) "); + sql.AppendLine(" AND (O.[STATE]='0' OR O.[STATE]='1') "); + sql.AppendLine(" ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P.PLAN_SEQ,SEQ "); //排序为 FIS优先、日期正序、顺序号正序 + parameters.Add(new DataParameter("workcellcode", workcellcode)); + parameters.Add(new DataParameter("materialcode", productmaterial)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.Get(sql.ToString(), parameters.ToArray()); + } + } + + /// + /// 获取工序下匹配的派工单 + /// + /// 工序 + /// + public List GetMatchOrders(string workcellcode,string planpid="") + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + + sql.AppendLine("SELECT W.* "); + sql.AppendLine(" ,P.[IGNORE_FISBREAK] "); + sql.AppendLine(" ,P.[FIS_ASMSETCODE] "); + sql.AppendLine(" FROM [T_PP_WORKORDER] AS W WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendLine(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendLine(" WHERE W.SEQ = (SELECT TOP 1 SEQ "); + sql.AppendLine(" FROM [T_PP_WORKORDER] AS O WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P1 WITH(NOLOCK) "); + sql.AppendLine(" ON P1.[PID]=O.[ORDERPLANID] "); + sql.AppendLine(" WHERE O.[WORKCELL_CODE]=@workcellcode "); + sql.AppendLine(" AND (O.[STATE]='0' OR O.[STATE]='1') "); + if (!string.IsNullOrWhiteSpace(planpid)) + { + sql.AppendLine(" AND O.[ORDERPLANID]=@planpid"); + } + sql.AppendLine(" ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P1.PLAN_SEQ,SEQ) ");//排序为 FIS优先、日期正序、计划顺序号、工单顺序号正序 + sql.AppendLine(" AND W.[WORKCELL_CODE]=@workcellcode "); + sql.AppendLine(" AND (W.[STATE]='0' OR W.[STATE]='1') "); + if (!string.IsNullOrWhiteSpace(planpid)) + { + sql.AppendLine(" AND W.[ORDERPLANID]=@planpid"); + parameters.Add(new DataParameter("planpid", planpid)); + } + + parameters.Add(new DataParameter("workcellcode", workcellcode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + + + #region 改变派工单 + /// + /// 改变派工单 + /// + /// + public void ChangeByOrderPlan(WorkOrder entity) + { + if (this.BaseSession != null) + { + + this.BaseSession.Update(entity); + } + else + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + + session.Update(entity); + } + } + + } + #endregion + /// + /// 获取派工单 + /// + /// + /// + public WorkOrder GetworkOrderInfo(WorkOrder model) + { + string sql = null; + List parameters = new List(); + try + { + sql = "SELECT TOP 1 * FROM T_PP_WORKORDER WITH(NOLOCK) WHERE STATE=0 "; + + if (string.IsNullOrEmpty(model.ORDERPLANID) == false) + { + sql += " AND ORDERPLANID = @ORDERPLANID"; + parameters.Add(new DataParameter("ORDERPLANID", model.ORDERPLANID)); + } + if (BaseSession != null) + { + //获取信息 + model = BaseSession.Get(sql, parameters.ToArray()); + } + else + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + model = session.Get(sql, parameters.ToArray()); + } + } + return model; + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "信息数据层-获取信息" + }); + throw; + } + } + + /// + /// 获取指定日期前的FIS计划顺序号 + /// + /// + /// + /// + public string GetLastFISSEQ(DateTime plandate, string workcentercode) + { + StringBuilder sql = new StringBuilder() ; + List parameters = new List(); + try + { + sql.AppendLine("SELECT TOP 1 [PLAN_SEQ] "); + sql.AppendLine(" FROM [T_PP_ORDERPLAN] WITH(NOLOCK) "); + sql.AppendLine(" WHERE [PLANSOURCE]='0' "); + sql.AppendLine(" AND [PLAN_DATE]<@plandate "); + sql.AppendLine(" AND [WORKCENTER_CODE]=@workcentercode "); + sql.AppendLine(" ORDER BY [PLAN_DATE] DESC "); + + parameters.Add(new DataParameter("plandate", plandate)); + parameters.Add(new DataParameter("workcentercode", workcentercode)); + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + var ret= session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray()); + if (ret != null) + { + return ret.ToString(); + } + else + { + return ""; + } + } + + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "信息数据层-获取信息" + }); + throw; + } + } + /// + /// 根据模架搜索工单 + /// + /// + /// + public WorkOrder SearchByMould(string mouldcode, string workcellcode) + { + + try + { + StringBuilder sql = new StringBuilder(); + List parameters = new List(); + + sql.AppendLine("SELECT TOP 1 W.* "); + sql.AppendLine(" FROM T_PP_WORKORDER AS W WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendLine(" ON P.[PID]=W.[ORDERPLANID] "); + sql.AppendLine(" LEFT JOIN T_MD_MATERIAL AS M WITH(NOLOCK) "); + sql.AppendLine(" ON M.MATERIAL_CODE=W.MATERIAL_CODE "); + sql.AppendLine(" LEFT JOIN T_QT_MATERIAL_BINDING AS MB WITH(NOLOCK) "); + sql.AppendLine(" ON MB.MATERIAL_CODE=M.MATERIAL_TYPE_CODE "); + sql.AppendLine(" AND MB.BINDING_TYPE='ASSY' "); + sql.AppendLine(" WHERE MB.TARGET_CODE=@mouldcode "); + sql.AppendLine(" AND W.WORKCELL_CODE=@workcellcode "); + sql.AppendLine(" AND (W.STATE='1' OR W.STATE='0') "); + sql.AppendLine(" ORDER BY W.UPDATEDATE,W.PRI,w.PLAN_DATE,P.PLAN_SEQ,W.SEQ "); + + parameters.Add(new DataParameter("mouldcode", mouldcode)); + parameters.Add(new DataParameter("workcellcode", workcellcode)); + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + return session.Get(sql.ToString(), parameters.ToArray()); + } + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "信息数据层-获取信息" + }); + throw; + } + } + + + + public List GetListByID(string[] orderid) + { + try + { + StringBuilder sql = new StringBuilder(); + List parameters = new List(); + + string ids = string.Join("','", orderid); + + sql.AppendFormat("SELECT * FROM T_PP_WORKORDER WITH(NOLOCK) WHERE PID IN ('{0}')", ids); + + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "信息数据层-获取信息GetListByID" + }); + throw; + } + } + /// + /// 批量更新 + /// + /// + /// + public int Update(List orders) + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + return session.Update(orders); + } + } + /// + /// 批量删除 + /// + /// + /// + public int Delete(List orders) + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + //获取信息 + return session.Delete(orders); + } + } + + public WorkOrder GetWorkingOrderWithProduct(string workcellcode, string productcode, string planpid = "") + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT TOP 1 O.* "); + sql.AppendLine(" ,P.[IGNORE_FISBREAK] "); + sql.AppendLine(" ,P.[FIS_ASMSETCODE] "); + sql.AppendLine(" FROM [T_PP_WORKORDER] AS O WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN [T_PP_ORDERPLAN] AS P WITH(NOLOCK) "); + sql.AppendLine(" ON P.[PID]=O.[ORDERPLANID] "); + sql.AppendLine(" WHERE O.[WORKCELL_CODE]=@workcellcode "); + if (!string.IsNullOrWhiteSpace(planpid)) + { + sql.AppendLine(" AND O.[ORDERPLANID]=@planpid"); + parameters.Add(new DataParameter("planpid", planpid)); + } + sql.AppendLine(" AND O.[REMARK]=@productcode"); + sql.AppendLine(" AND (O.[STATE]='0' OR O.[STATE]='1') "); + sql.AppendLine(" ORDER BY O.UPDATEDATE,O.PRI,O.PLAN_DATE,P.PLAN_SEQ,SEQ "); //排序为 FIS优先、日期正序、顺序号正序 + parameters.Add(new DataParameter("workcellcode", workcellcode)); + parameters.Add(new DataParameter("productcode", productcode)); + using (var session = AppDataFactory.CreateMainSession()) + { + return session.Get(sql.ToString(), parameters.ToArray()); + } + } + + public int GetDayPlanCount(string workcentercode, DateTime date) + { + try + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT ISNULL(SUM(QTY),0) "); + sql.AppendLine(" FROM T_PP_ORDERPLAN WITH(NOLOCK) "); + sql.AppendLine(" WHERE WORKCENTER_CODE=@workcentercode "); + //sql.AppendLine(" AND DATEDIFF(DAY,PLAN_DATE,@date)=0 "); + sql.AppendFormat(" AND [PLAN_DATE] BETWEEN @date1 AND @date2"); + parameters.Add(new DataParameter("date1", date.Date)); + parameters.Add(new DataParameter("date2", date.Date.AddDays(1))); + + parameters.Add(new DataParameter("workcentercode", workcentercode)); + //parameters.Add(new DataParameter("date", date)); + + using (var session = AppDataFactory.CreateMainSession()) + { + return (int)session.ExecuteSqlScalar(sql.ToString(), parameters.ToArray()); + } + } + catch (Exception ex) + { + throw ex; + } + } + + public int SetOrderPrinted(string orderpid) + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("UPDATE T_PP_WORKORDER SET PRINTED='1' WHERE PID=@orderpid"); + parameters.Add(new DataParameter("orderpid", orderpid)); + + using (var session = AppDataFactory.CreateMainSession()) + { + return session.ExecuteSql(sql.ToString(), parameters.ToArray()); + } + } + + public List GetLastFISPlan(string workcellcode, string routecode) + { + List parameters = new List(); + StringBuilder sql = new StringBuilder(); + sql.AppendLine("SELECT TOP 2 P.* "); + sql.AppendLine(" FROM T_PP_ORDERPLAN AS P WITH(NOLOCK) "); + sql.AppendLine(" LEFT JOIN T_PP_WORKORDER AS W WITH(NOLOCK) "); + sql.AppendLine(" ON W.ORDERPLAN_NO=P.PLAN_NO "); + sql.AppendLine(" WHERE P.PLANSOURCE='0' "); + sql.AppendLine(" AND P.ROUTE_CODE=@routecode "); + sql.AppendLine(" AND ((W.WORKCELL_CODE=@workcellcode "); + sql.AppendLine(" AND W.STATE='4') "); + sql.AppendLine(" OR W.WORKCELL_CODE<>@workcellcode) "); + sql.AppendLine(" ORDER BY P.PLAN_DATE DESC,P.PLAN_SEQ DESC,P.PLAN_NO DESC"); + parameters.Add(new DataParameter("workcellcode", workcellcode)); + parameters.Add(new DataParameter("routecode", routecode)); + + using (var session = AppDataFactory.CreateMainSession()) + { + return session.GetList(sql.ToString(), parameters.ToArray()).ToList(); + } + } + } +} diff --git a/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs b/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs index 6d6ec89..7755ae5 100644 --- a/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs +++ b/APPQ5/QMAPP.FJC.Entity/TianJin/TJWorkOrder.cs @@ -93,6 +93,10 @@ namespace QMAPP.FJC.Entity.TianJin [DBColumn(ColumnName = "UPDATEDATE", DataType = DbType.DateTime)] public DateTime UPDATEDATE { get; set; } + public int PRI { get; set; } + public string PBOM_CODE { get; set; } + public string WORKCELL_CODE { get; set; } + public string ORDER_TYPE { get; set; } } } diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 585b5c1..f59e43a 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -8,10 +8,10 @@ - + + - + @@ -184,13 +184,13 @@ - + - + diff --git a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs index e71886a..ed4213f 100644 --- a/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/Operation/OperationForm.cs @@ -125,7 +125,7 @@ namespace QMAPP.WinForm.Forms.Operation if (str__cfgAutoInputLocs.Split(';').Length > 0) _cfgAutoInputLocs = str__cfgAutoInputLocs.Split(';'); _cfgAutoInputSwitch = GetAppConfigValue("AutoInputSwitch"); //查找所有 需要自动填充的工位 - _bentiBarCodeRegex = GetAppConfigValue("AutoInput条码正则表达式"); + _bentiBarCodeRegex = GetAppConfigValue("AutoInput"); _052printWorkloc = System.Configuration.ConfigurationManager.AppSettings["052打印工位"]; _371BiaoPiBarCodeRegex = System.Configuration.ConfigurationManager.AppSettings["052打印条码规则371"]; @@ -907,10 +907,10 @@ namespace QMAPP.WinForm.Forms.Operation if (!string.IsNullOrEmpty(result.MATERIAL_CODE)) { var bomCodes = GetPBOMCODEValue(result.MATERIAL_CODE); - List filterList = list.Where(p => bomCodes.Contains(p.PBOM_CODE)).ToList(); - if (filterList.Count > 0) + //List filterList = list.Where(p => bomCodes.Contains(p.PBOM_CODE)).ToList(); + if (bomCodes.Count > 0) { - string PBOM_CODE = filterList[0].PBOM_CODE; + string PBOM_CODE = bomCodes[0]; //List autoInputBarCodes = LocSwitchHelper.GetAutoInputBarCode(bomCode, _operationServiceParam.machineInfo.WORKLOC_CODE); diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs index ad4c2c3..76ac5fe 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmItemList.cs @@ -10,6 +10,7 @@ using CarSystem.Account.FileUtil; using System.Configuration; using DCS.Place; using Model; +using QMAPP.ServicesAgent; namespace QMAPP.WinForm.Forms.TianJin { @@ -18,12 +19,17 @@ namespace QMAPP.WinForm.Forms.TianJin /// public partial class TJFrmItemList : Form { + + private string _TJFYPrintName = string.Empty; //打印机名称 + /// /// /// public TJFrmItemList() { InitializeComponent(); + + _TJFYPrintName = GetAppConfigValue("FYPrintName"); //查找所有 需要自动填充的工位 } @@ -364,16 +370,35 @@ namespace QMAPP.WinForm.Forms.TianJin dt.Rows.Add(ncsdr); index++; } - prin.Print(dt); - //MessageBox.Show("打印成功！"); + //prin.Print(dt); + if (!string.IsNullOrEmpty(_TJFYPrintName)) + { + System.Drawing.Printing.PrintDocument doc = new System.Drawing.Printing.PrintDocument(); + doc.PrinterSettings.PrinterName = _TJFYPrintName; + prin.Print(dt, _TJFYPrintName); + } + else + { + prin.Print(dt); + } } + /// + /// 查找配置表 + /// + /// + public string GetAppConfigValue(string pConfigCode) + { + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); + var AppConfig = agent.InvokeServiceFunction(B9IPCService.AppConfigBLL_Get.ToString(), pConfigCode); - - - - + if (AppConfig != null) + return AppConfig.Value; + else + return null; + } + } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt index a0bab9dacff69f6e65306f4254869d05623bd5ba..01f395cd0487feb2a300b2b866533833d646a3fb 100644 GIT binary patch delta 10184 zcmbt)WmFyAvMsi8cMtCF4#C|$xVt-q#)A9C-QC^YorK^)f+WG+<>ou@y!*x*_x!un zqq=L&u2Eh6tHzpZ1_eO{1wkdUkr6@s+t48(KKu8k1Nc~FpQ+Dk+bb*KlqhA?HX`2akw{Ph2#F8llA7ji4!$KNJ z^U3=Z_t=HMvLar2S>rbn_TX#;CYb45Ehtzv(-qszdZA{U{9aUDAmBG>ioQ$4dU~e# zh@-2KMwALwl%sXnR=8Menam(HS7k7U40YUQ{_?EZKnx2=hCrJju*uI=O>VNtN{4>B zu#%xq??fbm!mnIbhd7BYLAdH4PmBh*_g!XNrf`4Q*E%Q*ednUvd$Db`=Vav~ct zN(`_>_IQ7FRdF%KLlG1aW4%AN4Q_XiaV;|;eA>cVmx6t7B}%@pzM#Aj*@E5vKCsd%WasqIALqbXf_QoKK$8KZyy8fs2peX7ZZC3`AZJX z_-xLKvZ2|WH%ZiuAZOZU*hR}s!iLvJSVHJepCT;VNkLD#Z`A?khu=2=472iRx-zcb=eM?M zGU(;-+N5@&DL1wR1fVK{^R#2P+j;JVNC)*owFG4t#ZK8Z1GN(ZLs&k#NFLIZPRT1Y4=I;_PMvK+>D24LGBL3O)^6~TUZJ{n!J-5TUNxSM@zd8H=qC8c7&xK) z4do&>`>b>m21=!(nFMQCZ)2?bB~<&7;1yCO8~eTJ*i9rDhj6y}4zjeVX407?mJ+`H z%Iif({&Ae5m_v-H16N|9X4jBL?=guOo~^tq;9-}inT6IztEQCE2H9tdt7~7`AI?oP z$?yx$rLh*U2+HxD8zZ)^H-kB_l3y<)`T7(40k%ed^*o}V*A4Bws?V5@PS&dTMzQme zPVNiX$+Y>CCSAUuTQO#;EJ)>c+L8sw#&^JJst<0e1DTvhqo&4j3Pun1R(iEQzrzv3 z^9vLLU1Jb>AwLG6ft*x5Z^+pAO&IwR*e`tpr*j7wamSe~Dlf+yVJ1O{>=`WNpo4{5 zRnLS`&2RWVBK$ESLHVA=(vY-vBybuLq{uMLt^EFeG3y;a!8z8c$1XFg5vbtbz^swV zpUjC|QQZu2w0o{V-{r{ehq{;?4T)9R7pXoeLo%1M2pX&kS(_})g-?g>4x6q)q(ql& zw6O=An;0&y?Mg0?+jyH*49N4GiJZ0B5Emu}t$lGut~@3O@b1k?|ET}uDkCw2WI!HS z0&OMD*fjobDelB-&rMlX@}y>-;30LIkfFZ_jGkcU3yP2k!1--@Nb9jHnIT4)4k#s{5JiTRHg*f z16*?X>R zj(%nBdBuj1BKcmP9Yt$MdV?^MexxTbu!gT*YG9c(D=gHCio{Bw$1v2NLmf|q%l>tH zqqCL!v*o+x`?P#&?LH2>ub)RRV|b;0rip!#?6XJ#nN!o@#2q5FAQ)sn?|~PHFpz2Y z8SPmWA0yZTP})d};uiY^|Jlm5WPcQ}XL_C< zFzRsMvIaxa2(I5m7CeT%s#YoEhrKa!mqEyofoKu5-rpFO#8!r*4vz)mQ}95P=kfx0 zG`=4Ce*(&3_9#is7P>nbTI-oKZB^s1r*n?8Vqvm$Z_}M$d#>gP_k16J-SpQ0p17su zpL|Cvn{nG??`(=$>1W;u#ioFuhgHd@WDcI`o6#%&-+xd_d*u>5!*1>dwqrv0F4nq7 z@pxA!+`8U!L+cnhRV^z?DcgI8zS5O`VD}`AZS`dDtSa#NRaBWQ;O)cDpb^`zT~q!g zgYBE=*vX85@dIzh($D%UC`W5gUp$Cag^ci-2VBmp{e}%%>f+xAuT05+sa_akk+7T0 zOH⁣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 + listDir.Add(new Direction { Code = "左", Name = "左侧" }); + listDir.Add(new Direction { Code = "右", Name = "右侧" }); + comboBox1.DisplayMember = "Name"; + comboBox1.ValueMember = "Code"; + comboBox1.DataSource = listDir; } #region 加载列表显示设置 @@ -69,6 +76,7 @@ namespace QMAPP.WinForm.Forms.TianJin cbListRowcount.SelectedIndexChanged += new EventHandler(cbListRowcount_SelectedIndexChanged); cbRefreshRate.SelectedIndexChanged += new EventHandler(cbRefreshRate_SelectedIndexChanged); cbPlanFilter.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged); + comboBox1.TextChanged += new EventHandler(cbPlanFilter_SelectedIndexChanged); #endregion } @@ -96,7 +104,7 @@ namespace QMAPP.WinForm.Forms.TianJin dataPage.PageIndex = 1; dataPage.SortExpression = " ROWVALUE ASC"; #region 服务查询 - var orderlist = _agent.InvokeServiceFunction>("WorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage); + var orderlist = _agent.InvokeServiceFunction>("TJWorkOrderBLL_GetOrderUnPrinted", cbRoutes.SelectedValue.ToString(), cbPlanFilter.SelectedIndex, dataPage, comboBox1.SelectedValue.ToString()); #endregion this.dgvPlan.DataSource = orderlist; } @@ -488,6 +496,16 @@ namespace QMAPP.WinForm.Forms.TianJin else return null; } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + SaveSetting(); + BindPlanView(); + } + } + class Direction { + public string Code { get; set; } + public string Name { get; set; } } class LabelData { diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index f09aad3..e069562 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -153,9 +153,6 @@ 17, 17 - - 17, 17 - diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 19eb21a..d27e626 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值， // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.03.28.02")] -[assembly: AssemblyFileVersion("2022.03.28.02")] +[assembly: AssemblyVersion("2022.03.29.01")] +[assembly: AssemblyFileVersion("2022.03.29.01")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml index 733bfd5..ae81a8e 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/App_Data/FJCServiceList.xml @@ -974,4 +974,11 @@ QMAPP.FJC.BLL.DLL + + TJWorkOrderBLL + 派工单 + QMAPP.FJC.BLL.TianJin.TJWorkOrderBLL + QMAPP.FJC.BLL.dll + + \ No newline at end of file diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index d651a04..ac985c4 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -64,9 +64,9 @@ - + - +