diff --git a/APP/QMAPP.Web/App_Data/Menu.xml b/APP/QMAPP.Web/App_Data/Menu.xml index 71056d4..e5fd674 100644 --- a/APP/QMAPP.Web/App_Data/Menu.xml +++ b/APP/QMAPP.Web/App_Data/Menu.xml @@ -291,21 +291,23 @@ 下载模板 --> - - - 查询 - 添加 - 整车添加 - 修改 - 修改计划顺序号 - 插单 - 删除 - 发布 - 导入 - 导出 - 下载模板 + + + + 查询 + 添加 + 整车添加 + 修改 + 修改计划顺序号 + 插单 + 删除 + 发布 + 导入 + 导出 + 下载模板 + 查询 diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs index a8ed666..7b4ae33 100644 --- a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs @@ -17,6 +17,7 @@ using QMAPP.FJC.DAL.ProductionPlan; using QMAPP.FJC.Entity.ProductionPlan; using QMFrameWork.Common.Util; using QMAPP.FJC.Entity.FileCopy.FIS; +using QMAPP.FJC.DAL.TianJin; namespace QMAPP.FJC.BLL.FIS { @@ -171,6 +172,7 @@ namespace QMAPP.FJC.BLL.FIS model.PLANSOURCE = model.PLANSOURCE; //int no = new DoorPlankPlanDAL().GetNum(model); //model.PLAN_SEQ = model.PLAN_DATE.ToString("yyyyMMdd") + no; + Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE }); model.PBOM_CODE = pbomcode.PBOM_CODE; string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); @@ -223,6 +225,109 @@ namespace QMAPP.FJC.BLL.FIS } #endregion + #region 插入信息 + /// + /// 插入信息(单表) + /// + /// 信息 + /// 插入行数 + public DataResult TJInsert(OrderPlan model) + { + DataResult result = new DataResult(); + //基本信息 + + try + { + if (model.MATERIAL_CODE.Length <= 8) + { + var listMatral = new TJDoorPlankPlanDAL(); + var ListMachine = listMatral.GetListMachine(model.MATERIAL_CODE); + foreach (var Machint in ListMachine) + { + model.PID = Guid.NewGuid().ToString(); + model.PLAN_STATE = "0"; + model.PLANSOURCE = model.PLANSOURCE; + model.MATERIAL_CODE = Machint.MATERIALNO; + model.MATERIAL_NAME = Machint.MATERIALNAME; + Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = Machint.MATERIALNO }); + model.PBOM_CODE = pbomcode.PBOM_CODE; + string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); + model.WORKCENTER_CODE = workcentercode; + if (model.WORKCENTER_CODE != "") + { + string factory = new FactoryDAL().GetFactoryWithWorkcenter(model.WORKCENTER_CODE); + model.FACTORY_CODE = factory; + } + QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(Machint.MATERIALNO); + //QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE); + model.ROUTE_CODE = routecode != null ? routecode.ROUTE_CODE : ""; + model.CREATEUSER = this.LoginUser.UserID; + model.CREATEDATE = DateTime.Now; + model.UPDATEUSER = model.CREATEUSER; + model.UPDATEDATE = model.CREATEDATE; + DoorPlankPlanDAL cmdDAL = new DoorPlankPlanDAL(); + FISPlan condition = new FISPlan(); + condition.PREFIX = "DP"; + condition.DATASTR = model.PLAN_DATE.ToString("yyyyMMdd"); + //获取流水号 + FISPlan info = this.GetOrderPlanSeq(condition); + //计划单号 + model.PLAN_SEQ = info.SEQSTR; + model.PLAN_NO = condition.PREFIX + condition.DATASTR + info.SEQSTR; + result.Result = new DoorPlankPlanDAL().Insert(model); + } + + } + else + { + model.PID = Guid.NewGuid().ToString(); + model.PLAN_STATE = "0"; + model.PLANSOURCE = model.PLANSOURCE; + Pbom pbomcode = new PbomDAL().Get(new Pbom { MATERIAL_CODE = model.MATERIAL_CODE }); + model.PBOM_CODE = pbomcode.PBOM_CODE; + string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); + model.WORKCENTER_CODE = workcentercode; + if (model.WORKCENTER_CODE != "") + { + string factory = new FactoryDAL().GetFactoryWithWorkcenter(model.WORKCENTER_CODE); + model.FACTORY_CODE = factory; + } + QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE); + //QMAPP.MD.Entity.ProcessRoute routecode = new QMAPP.MD.DAL.ProcessRouteDAL().RouteWithMaterial(model.MATERIAL_CODE); + model.ROUTE_CODE = routecode != null ? routecode.ROUTE_CODE : ""; + model.CREATEUSER = this.LoginUser.UserID; + model.CREATEDATE = DateTime.Now; + model.UPDATEUSER = model.CREATEUSER; + model.UPDATEDATE = model.CREATEDATE; + DoorPlankPlanDAL cmdDAL = new DoorPlankPlanDAL(); + FISPlan condition = new FISPlan(); + condition.PREFIX = "DP"; + condition.DATASTR = model.PLAN_DATE.ToString("yyyyMMdd"); + //获取流水号 + FISPlan info = this.GetOrderPlanSeq(condition); + //计划单号 + model.PLAN_SEQ = info.SEQSTR; + model.PLAN_NO = condition.PREFIX + condition.DATASTR + info.SEQSTR; + result.Result = new DoorPlankPlanDAL().Insert(model); + } + } + catch (Exception ex) + { + LogManager.LogHelper.Error(new LogInfo() + { + ErrorInfo = ex, + Tag = ex.StackTrace, + Info = "信息逻辑层-插入信息！" + }); + result.IsSuccess = false; + result.Msg = Resource.SystemException; + throw ex; + } + result.IsSuccess = true; + return result; + } + #endregion + #region 获取流水号信息 /// /// 获取流水号信息 diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs index 1f8c70e..baaf46a 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs @@ -183,12 +183,15 @@ namespace QMAPP.FJC.BLL.TianJin { Storage info = new StorageDAL().Get(model.ProductCode); + if (info.State == "2") + { + result.IsSuccess = false; + result.Msg = $"条码{model.ProductCode}在{info.UPDATEDATE}已进行过出库操作！"; + return result; + } + //基本信息 info.State = "2"; - info.MATERIALNAME = model.MATERIALNAME; - info.MATERIALCODE = model.MATERIALCODE; - info.CREATEUSER = model.CREATEUSER; - info.CREATEDATE = model.CREATEDATE; info.UPDATEDATE = DateTime.Now.ToString(); info.UPDATEUSER = this.LoginUser.UserName; int temp = new StorageDAL().Update(info); diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs index e11042c..4a74539 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJDoorPlankPlanBLL.cs @@ -325,22 +325,30 @@ namespace QMAPP.FJC.BLL.TianJin //可以删除的订单 List deleteOrderList = new List(); - - TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = strs }); - int Num = TJworkOrderDal.GetAllWorkOrder(strs); - if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString() - || (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && Num == 0)) + if (!string.IsNullOrEmpty(strs)) { - //删除订单 - TJOrderPlanDAL.DeleteOrderPlan(op); - TJworkOrderDal.BatchDeleteByOrderPlan(new TJWorkOrder() { ORDERPLANID = op.PID }); - } - else - { - result.IsSuccess = false; - result.Msg = "只有初始化或是确认生产并且生产数量为0订单可以删除!"; - return result; + foreach (var str in strs.Split(':')) + { + TJOrderPlan op = TJOrderPlanDAL.Get(new TJOrderPlan() { PID = str }); + int Num = TJworkOrderDal.GetAllWorkOrder(str); + if (op.PLAN_STATE == EnumGeter.PLANSTATE.INIT.GetHashCode().ToString() + || (op.PLAN_STATE == EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString() && Num == 0)) + { + //删除订单 + TJOrderPlanDAL.DeleteOrderPlan(op); + TJworkOrderDal.BatchDeleteByOrderPlan(new TJWorkOrder() { ORDERPLANID = op.PID }); + count++; + } + else + { + result.IsSuccess = false; + result.Msg = $"只有初始化或是确认生产并且生产数量为0订单可以删除!成功删除{count}条计划！"; + return result; + } + } } + + result.Result = count; result.Msg = "订单删除成功!"; @@ -476,9 +484,21 @@ namespace QMAPP.FJC.BLL.TianJin } else { - var list = "LF,LR,RF,RR".Split(','); + var list = "".Split(','); var dal = new TJDoorPlankPlanDAL(); var MachineList = dal.GetListMachine(info.MATERIAL_CODE); + if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "L") + { + list = "LF,LR".Split(','); + } + else if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "R") + { + list = "RF,RR".Split(','); + } + else if (info.MATERIAL_CODE.Length == 6) + { + list = "LF,LR,RF,RR".Split(','); + } //注入派工单信息 for (int i = 0; i < info.QTY; i++) { diff --git a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs index 1e2da35..c27f747 100644 --- a/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/FIS/DoorPlankPlanDAL.cs @@ -385,11 +385,10 @@ namespace QMAPP.FJC.DAL.FIS PID = model.PID; } sqlBuilder.AppendLine("SELECT COUNT(*) FROM T_PP_ORDERPLAN "); - sqlBuilder.AppendLine(" WHERE PID <> @PID AND PLAN_NO=@PLAN_NO"); + sqlBuilder.AppendLine($" WHERE PID <> '{model.PID}' AND PLAN_NO=@PLAN_NO"); using (IDataSession session = AppDataFactory.CreateMainSession()) { count = Convert.ToInt32(session.ExecuteSqlScalar(sqlBuilder.ToString(), - new DataParameter("PID", PID), new DataParameter { ParameterName = "PLAN_NO", Value = model.PLAN_NO })); } return count; diff --git a/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs b/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs index 0abd2b9..16f5b9d 100644 --- a/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/ProductionPlan/WorkOrderDAL.cs @@ -185,7 +185,7 @@ namespace QMAPP.FJC.DAL.ProductionPlan public List GetList(WorkOrder condition) { List workOrderList = new List(); - string sql = "select * from T_PP_WORKORDER WITH(NOLOCK) t where 1=1 "; + 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); diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs index 2311697..fce2856 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/StorageDAL.cs @@ -49,7 +49,7 @@ namespace QMAPP.FJC.DAL.TianJin { try { - string sql = "SELECT top1 * FROM [T_AW_Storage] WHERE [ProductCode]=@ProductCode"; + string sql = $"SELECT top 1 * FROM [T_AW_Storage] WHERE [ProductCode]= '{materialcode}' ORDER BY CREATEDATE DESC"; List parameters = new List(); parameters.Add(new DataParameter("ProductCode", materialcode)); using (IDataSession session = AppDataFactory.CreateMainSession()) diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs index 42c10d1..c774da8 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJDoorPlankPlanDAL.cs @@ -1021,7 +1021,19 @@ namespace QMAPP.FJC.DAL.TianJin string sql = null; List parameters = new List(); sql = $"SELECT MATERIAL_NAME as 'MATERIALNAME',MATERIAL_CODE as 'MATERIALNO' FROM [dbo].[T_MD_MATERIAL] where MATERIAL_CODE != '{MaterielCode}' and MATERIAL_TYPE_CODE = (select MATERIAL_TYPE_CODE from [dbo].[T_MD_MATERIAL] where MATERIAL_CODE = '{MaterielCode}') "; - using (IDataSession session = AppDataFactory.CreateMainSession()) + if (MaterielCode.Substring(MaterielCode.Length - 1, 1) == "L") + { + sql += " AND MATERIAL_NAME LIKE '%左%'"; + } + else if (MaterielCode.Substring(MaterielCode.Length - 1, 1) == "R") + { + sql += " AND MATERIAL_NAME LIKE '%右%'"; + } + else if (MaterielCode.Length == 6) + { + sql += $" AND MATERIAL_CODE not in ('{MaterielCode}L','{MaterielCode}R')"; + } + using (IDataSession session = AppDataFactory.CreateMainSession()) { var datatable = session.GetList(sql, parameters.ToArray()).ToList(); return datatable; diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index 30b7d54..4a95484 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -223,7 +223,7 @@ namespace QMAPP.FJC.DAL.TianJin } if (!string.IsNullOrEmpty(PlantCode)) { - strSql.Append(string.Format(" AND PLANTNAME='{0}' ", PlantCode)); + strSql.Append(string.Format(" AND PLANTNAME like '%{0}%' ", PlantCode)); } if (!string.IsNullOrEmpty(Operator)) { diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs new file mode 100644 index 0000000..f673bea --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs @@ -0,0 +1,738 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.Mvc; +using QMAPP.Common.Web.Controllers; +using QMFrameWork.WebUI.Attribute; +using QMAPP.FJC.Web.Models.FIS; +using QMFrameWork.Data; +using QMAPP.ServicesAgent; +using QMAPP.FJC.Entity.FIS; +using QMAPP.Entity; +using QMFrameWork.WebUI.DataSource; +using QMFrameWork.Common.Serialization; +using System.Data; +using QMAPP.Common.Web.Models; +using QMAPP.FJC.Entity.Basic; +using QMAPP.MD.Entity; +using QMAPP.FJC.BLL.FIS; + +namespace QMAPP.FJC.Web.Controllers +{ + /// + /// 门板计划查询 + /// 作 者：郭兆福 + /// 时 间：2017年09月15日 + /// + public class TJDoorPlankPlanPrintController : QController + { + #region 获取信息 + /// + /// 加载列表 + /// + /// 结果 + [HandleException] + public ActionResult List(bool? callback) + { + string order_type = Request["ORDER_TYPE"]; + DoorPlankPlanModel seachModel = new DoorPlankPlanModel(); + seachModel.ORDER_TYPE = order_type; + seachModel.PLANTIMESTART = DateTime.Now.Date.AddDays(-10).ToString("yyyy-MM-dd HH:mm:ss"); + seachModel.PLANTIMEEND = DateTime.Now.Date.AddDays(1).ToString("yyyy-MM-dd HH:mm:ss"); + seachModel.ImmediateSearch = false; + if (callback == true) + TryGetSelectBuffer(out seachModel); + seachModel.rownumbers = false; + seachModel.url = "/DoorPlankPlan/GetList"; + return View("DoorPlankPlanList", seachModel); + } + #endregion + + #region 获取列表 + /// + /// 获取列表 + /// + /// 是否回调 + /// 列表 + [HandleException] + public ActionResult GetList(bool? callBack) + { + DoorPlankPlanModel seachModel = null; + DataPage page = null; + ServiceAgent wcfAgent = this.GetServiceAgent(); + OrderPlan condition = null; + DataResult pageResult = new DataResult(); + try + { + //获取查询对象 + seachModel = GetModel(); + #region 获取缓存值 + if (callBack != null) + { + TryGetSelectBuffer(out seachModel); + } + else + { + //保存搜索条件 + SetSelectBuffer(seachModel); + } + #endregion + //获取前台分页设置信息 + page = this.GetDataPage(seachModel); + condition = CopyToModel(seachModel); + // + //condition.WWWWWW = ((int)QMAPP.FJC.Entity.EnumGeter.ProductType.biaopi).ToString();//默认查询XXXX + #region wcf服务统一接口 + pageResult = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetList", condition, page); + if (pageResult.IsSuccess == false) + { + SetMessage(pageResult.Msg); + return List(true); + } + DateGridResult result = new DateGridResult(); + result.Total = pageResult.Result.RecordCount; + result.Rows = JsonConvertHelper.GetDeserialize>(pageResult.Result.Result.ToString()); + #endregion + + return Content(result.GetJsonSource()); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 编辑 + /// + /// 编辑载入 + /// + /// 处理结果 + [HandleException] + public ActionResult Edit() + { + DoorPlankPlanModel model = new DoorPlankPlanModel(); + string ID = Request.Params["PID"]; + string TYPE = Request.Params["ORDER_TYPE"]; + OrderPlan Entity = new OrderPlan(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + if (string.IsNullOrEmpty(ID) == false) + { + //修改获取原数据 + Entity.PID = ID; + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_Get", Entity); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("DoorPlankPlanEdit", model); + } + + model = CopyToModel(result.Result); + + if (model.PLANSOURCE == FJC.Entity.EnumGeter.WORKORDERTYPE.FIS.GetHashCode().ToString()) + { + //SetMessage("！"); + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", "无法对FIS计划进行修改编辑！")); + } + } + model.ORDER_TYPE = TYPE; + return View("DoorPlankPlanEdit", model); + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 保存 + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult Save(DoorPlankPlanModel saveModel) + { + OrderPlan Entity = null; + string TYPE = Request.Form["ORDER_TYPE"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + Entity = CopyToModel(saveModel); + if (string.IsNullOrEmpty(Entity.PID) == true) + { + //新增 + Entity.ORDER_TYPE = TYPE; + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_TJInsert", Entity); + if (result.IsSuccess == false) + { + SetMessage("计划单号已存在！"); + return View("DoorPlankPlanEdit", saveModel); + } + } + else + { + //修改 + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_Update", Entity); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("DoorPlankPlanEdit", saveModel); + } + } + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 插单 + /// + /// 处理结果 + [HandleException] + public ActionResult Insert() + { + DoorPlankPlanModel model = new DoorPlankPlanModel(); + string ID = Request.Params["PID"]; + string TYPE = Request.Params["ORDER_TYPE"]; + OrderPlan Entity = new OrderPlan(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + if (string.IsNullOrEmpty(ID) == false) + { + //修改获取原数据 + Entity.PID = ID; + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetFISInsertPos", Entity); + if (result.IsSuccess == false) + { + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", result.Msg)); + } + model = CopyToModel(result.Result); + } + model.PID = ""; + model.MATERIAL_CODE = ""; + model.MATERIAL_NAME = ""; + model.ORDER_TYPE = TYPE; + return View("DoorPlankPlanInsert", model); + } + catch (Exception ex) + { + throw ex; + } + } + /// + /// 保存插单 + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult SaveInsert(DoorPlankPlanModel saveModel) + { + Material condition = new Material(); + OrderPlan Entity = new OrderPlan(); + string TYPE = Request.Form["ORDER_TYPE"]; + + string source = Request.Form["PLANSOURCE"]; + DataResult result = new DataResult(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + + string materialcode = "('" + saveModel.MaterialCodes.Replace(";", "','") + "')"; + + condition.MaterialCodes = materialcode; + List materiallist = wcfAgent.InvokeServiceFunction>("MaterialBLL_GetMaterialInfoList", condition); + + Entity.ORDER_TYPE = TYPE; + Entity.QTY = Convert.ToInt32(saveModel.QTY); + Entity.SHIFT_CODE = saveModel.SHIFT_CODE; + Entity.PLAN_DATE = saveModel.PLAN_DATE; + Entity.PLAN_SEQ = saveModel.PLAN_SEQ; + Entity.PLANSOURCE = source; + var publishrightnow = string.Equals(saveModel.PLAN_STATE, "on"); + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_SaveFISInsert", Entity, materiallist,publishrightnow); + + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + + } + #endregion + + #region 删除 + /// + /// 删除 + /// + /// 结果 + [HttpPost] + [HandleException] + public ActionResult Delete(OrderPlan model) + { + string selectKey = Request.Form["selectKey"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_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 发布 + /// + /// 发布 + /// + /// + [HttpPost] + [HandleException] + public ActionResult PutOut(OrderPlan model) + { + string selectKey = Request.Form["selectKey"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_PutOut", selectKey); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return List(true); + } + SetMessage(AppResource.PutOutMessage); + return List(true); + } + #endregion + + #region 导出excel + /// + /// 导出excel + /// + /// 结果 + [HttpPost] + public ActionResult ExportExcel() + { + DoorPlankPlanModel seachModel = null; + OrderPlan condition = null; + DataTable exportDt = new DataTable(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + try + { + //获取查询对象 + seachModel = GetModel(); + condition = CopyToModel(seachModel); + condition.PIDList = Request.Form["selectKey"]; + //获取数据 + DoorPlankPlanBLL dp = new DoorPlankPlanBLL(); + exportDt = dp.GetExportData(condition); + //exportDt = wcfAgent.InvokeServiceFunction("DoorPlankPlanBLL_GetExportData", condition); + + //导出 + QMFrameWork.WebUI.Util.IEFileTool efTool = new QMFrameWork.WebUI.Util.IEFileTool(); + return efTool.GetExcelFileResult("DoorPlankPlanExp", "门板计划信息.xlsx", exportDt); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 导入excel + /// + /// 导入excel + /// + /// 结果 + [HttpPost] + public ActionResult ImportExcel() + { + DataTable dt = null; + List list = new List(); + DataResult serviceResult = null; + string fileName = Request.Form["fileName"]; + string orderby = Request.Form["ORDER_TYPE"]; + ServiceAgent wcfAgent = this.GetServiceAgent(); + + Materiel materialmodel = new Materiel(); + ProduceShift produceshiftmodel = new ProduceShift(); + MachineInfo machine = new MachineInfo(); + //初始工作中心编号条件 + QMAPP.MD.Entity.WorkCell workcell = new QMAPP.MD.Entity.WorkCell(); + workcell.WORKCELL_CODE = orderby; + + try + { + dt = this.GetTableByExcel("DoorPlankPlanImp", fileName, dt); + //格式转换 + list = QMFrameWork.Common.Util.BindHelper.ConvertToList(dt).ToList(); + serviceResult = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetImportData", list, materialmodel,machine, produceshiftmodel, workcell); + if (serviceResult.Ex != null) + { + throw serviceResult.Ex; + } + if (serviceResult.Result.failureNum != 0) + { + foreach (RowError error in serviceResult.Result.Errors) + { + dt.Rows[error.Key - 1]["InfoError"] = error.Value; + } + ImportMessageModel model = new ImportMessageModel(); + model.InfoName = "DoorPlankPlanImp"; + model.ReturnUrl = "/DoorPlankPlan/List?callBack=true"; + model.Message = serviceResult.Result; + model.ErrorDt = dt; + return new MessageOutputController().OutputImportMessage(model); + } + else + { + SetMessage(serviceResult.Msg + "，如下：
" + + "插入" + serviceResult.Result.insertNum + "条，" + + "更新" + serviceResult.Result.updateNum + "条" + ); + return List(true); + } + } + catch (Exception ex) + { + throw ex; + } + finally + { + System.IO.File.Delete(MvcApplication.TempPath + fileName); + } + } + #endregion + + #region 下载模板 + /// + /// 下载导入模板 + /// + /// 结果 + [HttpPost] + public ActionResult GetTemplate() + { + try + { + string path = AppDomain.CurrentDomain.BaseDirectory + "App_Data/Excel/"; + string fileName = "DoorPlankPlanImp.xlsx"; + return File(path + fileName, "application/vnd.ms-excel", Url.Encode("门板信息导入模板.xlsx")); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 整车添加 + /// + /// 编辑载入 + /// + /// 处理结果 + [HandleException] + public ActionResult AddWholeDoor() + { + DoorPlankPlanModel model = new DoorPlankPlanModel(); + string ID = Request.Params["PID"]; + string TYPE = Request.Params["ORDER_TYPE"]; + OrderPlan Entity = new OrderPlan(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + if (string.IsNullOrEmpty(ID) == false) + { + //修改获取原数据 + Entity.PID = ID; + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_Get", Entity); + if (result.IsSuccess == false) + { + SetMessage(result.Msg); + return View("DoorPlankPlanEdit", model); + } + model = CopyToModel(result.Result); + } + model.ORDER_TYPE = TYPE; + return View("AddWholeDoorEdit", model); + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + #region 保存整车添加 + /// + /// 保存 + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult DoorPlanSave(DoorPlankPlanModel saveModel) + { + + Material condition = new Material(); + OrderPlan Entity = new OrderPlan(); + string TYPE = Request.Form["ORDER_TYPE"]; + string SetCode = Request.Form["AsmSetCode"]; + string source = Request.Form["PLANSOURCE"]; + DataResult result = new DataResult(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + + string materialcode = "('" + saveModel.MaterialCodes.Replace(";", "','") + "')"; + + condition.MaterialCodes = materialcode; + List materiallist = wcfAgent.InvokeServiceFunction>("MaterialBLL_GetMaterialInfoList", condition); + + Entity.ORDER_TYPE = TYPE; + Entity.QTY = Convert.ToInt32(saveModel.QTY); + Entity.SHIFT_CODE = saveModel.SHIFT_CODE; + Entity.PLAN_DATE = saveModel.PLAN_DATE; + Entity.PLANSOURCE = source; + Entity.AsmSetCode = SetCode; + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_InsertWholeDoor", Entity, materiallist); + + + + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + } + #endregion + + //#region 整车添加物料信息 + ///// + ///// 编辑载入 + ///// + ///// 处理结果 + //[HandleException] + //public ActionResult AddMaterial() + //{ + // DoorPlankPlanModel model = new DoorPlankPlanModel(); + // string ID = Request.Params["PID"]; + // string TYPE = Request.Params["ORDER_TYPE"]; + // OrderPlan Entity = new OrderPlan(); + // ServiceAgent wcfAgent = this.GetServiceAgent(); + // DataResult result = new DataResult(); + // try + // { + // model.ORDER_TYPE = TYPE; + // return View("AddMaterialEdit", model); + // } + // catch (Exception ex) + // { + // throw ex; + // } + //} + + ///// + ///// 保存 + ///// + ///// + ///// 处理结果 + //[HttpPost] + //[HandleException] + //[ValidateInput(false)] + //public ActionResult SaveMaterial(DoorPlankPlanModel saveModel) + //{ + + // Material condition = new Material(); + // ServiceAgent wcfAgent = this.GetServiceAgent(); + + // condition.MATERIAL_CODE = saveModel.MATERIAL_CODE; + // Material material = wcfAgent.InvokeServiceFunction("MaterialBLL_GetMaterialInfo", condition); + + // if (!string.IsNullOrEmpty(material.PID)) + // { + // saveModel.MATERIAL_NAME = material.MATERIAL_NAME; + // saveModel.COLOR = material.COLOR; + // saveModel.HBTYPE = material.HBTYPE; + // return View("AddWholeDoorEdit", saveModel); + // } + // return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + //} + //#endregion + + #region 整车添加物料信息 + [HandleException] + public ActionResult AddSendDetail(bool? callBack) + { + //实例化服务 + ServiceAgent wcfAgent = this.GetServiceAgent(); + QMAPP.MD.Web.Models.MaterialModel seachModel = null; + DataResult pageResult = new DataResult(); + DataPage page = new DataPage(); + string Fisid = Request["MATERIAL_CODE"].ToString(); + FISAssembly MaterialAssInfo = wcfAgent.InvokeServiceFunction("DoorPlankPlanBLL_GetFISMaterialInfoCD", Fisid); + string materials = "('" + MaterialAssInfo.MESModulFL + "','" + MaterialAssInfo.MESModulFR + "','" + MaterialAssInfo.MESModulRL + "','" + MaterialAssInfo.MESModulRR + "')"; + //物料发货明细实体 + Material detail = new Material() + { + MaterialCodes = materials, + }; + try + { + //获取查询对象 + seachModel = GetModel(); + #region 获取缓存值 + if (callBack != null) + { + TryGetSelectBuffer(out seachModel); + } + else + { + //保存搜索条件 + SetSelectBuffer(seachModel); + } + #endregion + //获取前台分页设置信息 + page = this.GetDataPage(seachModel); + pageResult = wcfAgent.InvokeServiceFunction>("MaterialBLL_GetList", detail, page); + if (pageResult.IsSuccess == false) + { + SetMessage(pageResult.Msg); + return List(true); + } + DateGridResult result = new DateGridResult(); + result.Total = pageResult.Result.RecordCount; + result.Rows = JsonConvertHelper.GetDeserialize>(pageResult.Result.Result.ToString()); + for (var i = 0; i < result.Total; i++) + { + result.Rows[i].AsmSetCode = MaterialAssInfo.AsmSetCode; + } + return Content(result.GetJsonSource()); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + #region 门板顺序号编辑 + /// + /// 门板顺序号编辑 + /// + /// + public ActionResult DoorPlankEditSeq() + { + DoorPlankPlanModel model = new DoorPlankPlanModel(); + OrderPlan Entity = new OrderPlan(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + try + { + model = GetModel(); + return View("DoorPlankEditSeq", model); + } + catch (Exception ex) + { + throw ex; + } + } + #endregion + + + #region 获取编辑系列号列表 + /// + /// 获取编辑系列号列表 + /// + /// + /// + [HandleException] + public ActionResult GetDoorPlankPlanList(bool? callBack) + { + DoorPlankPlanModel seachModel = null; + DataResult pageResult = new DataResult(); + DataPage page = new DataPage(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + OrderPlan condition = new OrderPlan(); + try + { + //获取查询对象 + seachModel = GetModel(); + + condition.PIDList =seachModel.PIDList; + condition.ORDER_TYPE = seachModel.ORDER_TYPE; + + #region 获取缓存值 + if (callBack != null) + { + TryGetSelectBuffer(out seachModel); + } + else + { + //保存搜索条件 + SetSelectBuffer(seachModel); + } + #endregion + //获取前台分页设置信息 + page = this.GetDataPage(seachModel); + condition = CopyToModel(seachModel); + + #region wcf服务统一接口 + pageResult = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_GetDoorPlankPlanList", condition, page); + if (pageResult.IsSuccess == false) + { + SetMessage(pageResult.Msg); + return List(true); + } + DateGridResult result = new DateGridResult(); + result.Total = pageResult.Result.RecordCount; + result.Rows = JsonConvertHelper.GetDeserialize>(pageResult.Result.Result.ToString()); + #endregion + return Content(result.GetJsonSource()); + } + catch (Exception ex) + { + throw ex; + } + } + + #endregion + + #region 保存顺序号修改 + /// + /// + /// + /// + /// 处理结果 + [HttpPost] + [HandleException] + [ValidateInput(false)] + public ActionResult DoorPlankPlanSeqSave(DoorPlankPlanModel saveModel) + { + OrderPlan entity = new OrderPlan(); + ServiceAgent wcfAgent = this.GetServiceAgent(); + DataResult result = new DataResult(); + + entity.PLAN_SEQ = saveModel.PLAN_SEQ; + entity.PIDList = saveModel.PIDList; + + entity = CopyToModel(saveModel); + + //修改 + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_UpdateDoorPlankPlanSeq", entity); + + return this.GetJsViewResult(string.Format("parent.List(1);parent.showTitle('{0}');parent.closeAppWindow1();", AppResource.SaveMessge)); + } + #endregion + } +} diff --git a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj index 9f2ebbe..e4cf3ab 100644 --- a/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj +++ b/APPQ5/QMAPP.FJC.Web/QMAPP.FJC.Web.csproj @@ -163,6 +163,7 @@ + @@ -915,6 +916,11 @@ + + + + + diff --git a/APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx index a3a05af..400bd73 100644 --- a/APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx +++ b/APPQ5/QMAPP.FJC.Web/Views/DoorPlankPlan/DoorPlankPlanList.aspx @@ -198,7 +198,7 @@ <%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> - <%--<%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%>--%> + <%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/AddWholeDoorEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/AddWholeDoorEdit.aspx new file mode 100644 index 0000000..604f21d --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/AddWholeDoorEdit.aspx @@ -0,0 +1,208 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 整车添加门板编辑 + + + <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + + + + +
+ + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_DATE)%> + + <%=Html.QC(p => p.PLAN_DATE)%> + + <%=Html.QV(p => p.QTY)%> + + <%=Html.QC(p => p.QTY)%> +
+ <%=Html.QV(p => p.SHIFT_CODE)%> + + <%=Html.QC(p => p.SHIFT_CODE)%> + + <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE)%> +
+
+ +
+ <%=Html.HiddenFor(p => p.ORDER_TYPE)%> + <%=Html.HiddenFor(p => p.MaterialCodes)%> + <%=Html.HiddenFor(p => p.AsmSetCode)%> + <%=Html.Hidden("PLANSOURCE",1)%> + <%=Html.QPEnd() %> + + + + + + + +
+ <%=Html.QTButtonSave("DoorPlankPlan", "Save", "return SaveDoorPlan();")%> + <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankEditSeq.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankEditSeq.aspx new file mode 100644 index 0000000..9339305 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankEditSeq.aspx @@ -0,0 +1,130 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 更新门板计划顺序号 + + + + <% + var editable = true; + %> + + + + +
+ + + + + +
+ *顺序号 + + /> +
+
+
+ <%=Html.QPEnd() %> + <%=Html.Hidden("PIDList")%> + <%=Html.Hidden("ORDER_TYPE")%> + + + + + + + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return SaveDoorPlankPlanSeq();")%> + <%=Html.QTButtonBack("close", "List", "parent.List(1);parent.closeAppWindow1();return false;")%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanEdit.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanEdit.aspx new file mode 100644 index 0000000..4204db4 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanEdit.aspx @@ -0,0 +1,160 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 门板订单计划信息编辑 + + + <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + <% + var editable = false; + if (string.IsNullOrEmpty(Model.PLAN_STATE) || string.Equals(Model.PLAN_STATE, "0")) + { + editable = true; + } + %> + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_DATE)%> + + " + style=" width:200px" type="text" class="easyui-datebox" required="required" <%=editable?"":"readonly =\"readonly\"" %> /> +
+ *顺序号 + + /> +
+ <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE, editable ? null : new { Readonly = "readonly" })%> + +
+ <%=Html.QV(p => p.QTY)%> + + <%=Html.QC(p => p.QTY)%> +
+ <%=Html.QV(p => p.SHIFT_CODE)%> + + <%=Html.QC(p => p.SHIFT_CODE)%> +
+ <%=Html.QV(p => p.PRODUCEREQUIRE)%> + + <%=Html.QC(p => p.PRODUCEREQUIRE)%> +
+ <%=Html.QV(p => p.STARTTIME)%> + + <%=Html.QC(p => p.STARTTIME)%> +
+ <%=Html.QV(p => p.ENDTIME)%> + + <%=Html.QC(p => p.ENDTIME)%> +
+ <%=Html.QV(p => p.REMARK)%> + + <%=Html.QC(p => p.REMARK)%> +
+
+ <%=Html.HiddenFor(p=>p.PID) %> + <%=Html.HiddenFor(p=>p.WORKCENTER_CODE) %> + <%=Html.HiddenFor(p=>p.CREATEDATE) %> + <%=Html.HiddenFor(p=>p.CREATEUSER) %> + <%=Html.HiddenFor(p=>p.UPDATEDATE)%> + <%=Html.HiddenFor(p=>p.UPDATEUSER) %> + <%=Html.HiddenFor(p=>p.COMPLETE_QTY) %> + <%=Html.HiddenFor(p => p.PLAN_STATE)%> + <%=Html.HiddenFor(p => p.FACTORY_CODE)%> + <%=Html.HiddenFor(p => p.ORDER_TYPE)%> + <%=Html.HiddenFor(p => p.ROUTE_CODE)%> + <%=Html.HiddenFor(p => p.PBOM_CODE)%> + <%=Html.HiddenFor(p => p.PLAN_NO)%> + <%=Html.HiddenFor(p => p.FACTORY_CODE)%> + <%=Html.Hidden("PLANSOURCE",1)%> + <%=Html.QPEnd() %> + + + + + + +
+ <%=Html.QTButtonSave("User", "Save", "return Save();")%> + <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%> +
+ + diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanInsert.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanInsert.aspx new file mode 100644 index 0000000..10a230e --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanInsert.aspx @@ -0,0 +1,371 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 门板插单计划编辑 + + + <%=Html.QPEdit("信息", string.IsNullOrEmpty(Model.PID) ? QMFrameWork.WebUI.panelType.Add : QMFrameWork.WebUI.panelType.Update)%> + + + + +
+ + + + + + + + + + + + + + <%-- + + + --%> +
+ 插单时间 + + " + type="text" class="easyui-datetimebox" required="required" readonly ="readonly" %/> +
+ 插单位置 + + <%=Html.QC(p => p.PLAN_SEQ, new { Readonly = "readonly" })%> +
+ 插单数量 + + <%=Html.QC(p => p.QTY)%> +
+ 即时发布 + + +
+
+ +
+ <%=Html.HiddenFor(p => p.ORDER_TYPE)%> + <%=Html.HiddenFor(p => p.MaterialCodes)%> + <%=Html.Hidden("PLANSOURCE",2)%> + <%=Html.QPEnd() %> +
+
+
+ + + + + +
+ <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE)%> +
+
+
+ + + + +
+ <%=Html.QTButtonSave("DoorPlankPlan", "TransitSave", "AddMatInfoSave()")%> + <%=Html.QTButtonBack("Home", "Index", "AddMatInfoCancel()")%> +
+
+
+
+ + + + + + + +
+ <%=Html.QTButtonSave("DoorPlankPlan", "SaveInsert", "return SaveDoorPlan();")%> + <%=Html.QTButtonBack("close", "DashBoardPlanList", "parent.closeAppWindow1();return false;")%> +
+ diff --git a/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx new file mode 100644 index 0000000..400bd73 --- /dev/null +++ b/APPQ5/QMAPP.FJC.Web/Views/TJDoorPlankPlanPrint/DoorPlankPlanList.aspx @@ -0,0 +1,215 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Views/Shared/AppMaster.Master" + Inherits="System.Web.Mvc.ViewPage" %> + + + 订单生产计划列表 + + + + <%=Html.QPSeach(110, true)%> + + + + + + + + + + + + + + + + + + + + + +
+ <%=Html.QV(p => p.PLAN_NO)%> + + <%=Html.QC(p => p.PLAN_NO)%> + + <%=Html.QV(p => p.SHIFT_CODE)%> + + <%=Html.QC(p => p.SHIFT_CODE)%> + + <%=Html.QV(p => p.MATERIAL_CODE)%> + + <%=Html.QC(p => p.MATERIAL_CODE)%> + + <%=Html.QV(p => p.FACTORY_CODE)%> + + <%=Html.QC(p => p.FACTORY_CODE)%> +
+ <%=Html.QV(p => p.PLANSOURCE)%> + + <%=Html.QC(p => p.PLANSOURCE)%> + + <%=Html.QV(p => p.PLANTIMESTART)%> + + <%=Html.QC(p => p.PLANTIMESTART)%> + + <%=Html.QV(p => p.PLANTIMEEND)%> + + <%=Html.QC(p => p.PLANTIMEEND)%> +
+ <%=Html.QPEnd()%> + <%=Html.QPList() %> + <%=Html.QDateGrid(Model)%> + <%=Html.QPEnd() %> + <%=Html.Hidden("selectKey")%> + <%=Html.Hidden("fileName")%> + <%=Html.Hidden("ORDER_TYPE")%> + + + + + + + + +
+ <%=Html.QTButtonSearch("DoorPlankPlan", "List", "Search()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonAdd("DoorPlankPlan", "Add", "Add()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("AddWholeDoor", "AddWholeDoor", QMFrameWork.WebUI.IconCls.add, "AddWholeDoor()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonUpdate("DoorPlankPlan", "Edit", "Update()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("EditSeq", "EditDoorPlankPlanSeq", QMFrameWork.WebUI.IconCls.edit, "EditDoorPlankPlanSeq()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("insertorder","Insert",QMFrameWork.WebUI.IconCls.add,"Insert()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButtonDelete("DoorPlankPlan", "Delete", "Delete()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("publish", "PutOut", "detail", "Publish()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("import", "ImportExcel", QMFrameWork.WebUI.IconCls.undo, "Import()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("export", "ExportExcel", QMFrameWork.WebUI.IconCls.redo, "Export()", QMAPP.Common.Web.SystemLimit.isLimt)%> + <%=Html.QTButton("template", "TemplateExcel", QMFrameWork.WebUI.IconCls.template, "getTemplate()", QMAPP.Common.Web.SystemLimit.isLimt)%> +
+ + diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 564b028..585b5c1 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -8,7 +8,7 @@ - @@ -184,13 +184,13 @@ - + - + diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx index b3b9ff9..2214993 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/RerportModel.ttx @@ -5,6 +5,8 @@ VWSEQ String 100 VIN String 100 PRODNO String 100 CARSETDESCCN String 100 +CP5A String 100 PASTECARDNO String 100 SCANDATE String 100 PRODUCTCODE String 100 +LINENO String 100 diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs index fa25853..014af00 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJFrmPlace.cs @@ -16,6 +16,7 @@ using QMAPP.Entity; using QMAPP.MD.Entity; using QMAPP.FJC.Entity.Basic; using QMAPP.FJC.Entity.TianJin; +using QMAPP.ServicesAgent; namespace QMAPP.WinForm.Forms.TianJin { @@ -48,6 +49,8 @@ namespace QMAPP.WinForm.Forms.TianJin private string PlaceFirstPositionType = string.Empty; + private string _TJFYPrintName = string.Empty; //打印机名称 + #endregion #region 变量 @@ -74,6 +77,8 @@ namespace QMAPP.WinForm.Forms.TianJin PlaceFirstPositionType = System.Configuration.ConfigurationManager.AppSettings["PlaceFirstPositionType"].ToString(); _barcodeRules = _agent.InvokeServiceFunction>("BarcodeRulesBLL_GetListForSend"); + + _TJFYPrintName = GetAppConfigValue("FYPrintName"); //查找所有 需要自动填充的工位 } #endregion @@ -1237,7 +1242,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == inputstring) { - SetContainerItem(nfindex, false); + SetContainerItem(nfindex+1, false); Alert("该条码已扫描!"); txtCode.Text = ""; txtCode.Focus(); @@ -1317,7 +1322,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString().ToUpper() == Code) { - SetContainerItem(nfindex, false); + SetContainerItem(nfindex + 1, false); Alert("该条码已扫描!"); txtCode.Text = ""; txtCode.Focus(); @@ -1393,7 +1398,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (dgvNF.Rows[i].Cells[CODE_NF.Name].Value.ToString() == Code) { - SetContainerItem(nfindex, false); + SetContainerItem(nfindex + 1, false); Alert("该条码已扫描!"); txtCode.Text = ""; txtCode.Focus(); @@ -2017,9 +2022,19 @@ namespace QMAPP.WinForm.Forms.TianJin dt.Rows.Add(ncsdr); index++; } - prin.Print(dt); - //MessageBox.Show("打印成功！"); - lberror.Text = "贴车单已打印"; + if (!string.IsNullOrEmpty(_TJFYPrintName)) + { + System.Drawing.Printing.PrintDocument doc = new System.Drawing.Printing.PrintDocument(); + doc.PrinterSettings.PrinterName = _TJFYPrintName; + + prin.Print(dt, _TJFYPrintName); + lberror.Text = "贴车单已打印"; + } + else + { + prin.Print(dt); + lberror.Text = "贴车单已打印"; + } } #endregion @@ -2320,6 +2335,18 @@ namespace QMAPP.WinForm.Forms.TianJin return ""; } + /// + /// 查找配置表 + /// + /// + public string GetAppConfigValue(string pConfigCode) + { + 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/TJOutWarehouseForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs index b7c6724..889d019 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJOutWarehouseForm)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); @@ -45,14 +46,16 @@ this.panelSearchTitle = new System.Windows.Forms.Panel(); this.lblSearchTitle = new System.Windows.Forms.Label(); this.panelSearch = new System.Windows.Forms.Panel(); - this.txtPRODUCTCODE = new System.Windows.Forms.TextBox(); - this.panel1 = new System.Windows.Forms.Panel(); this.dtpCREATEDATEEND = new DateTimePickerA(); this.dtpCREATEDATESTART = new DateTimePickerA(); this.label4 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.comINTTYPE = new System.Windows.Forms.ComboBox(); this.label5 = new System.Windows.Forms.Label(); + this.txtPRODUCTCODE = new System.Windows.Forms.TextBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.pager1 = new QMAPP.WinForm.Controls.Pager(); + this.bindingNavigator1 = new System.Windows.Forms.BindingNavigator(this.components); this.零件号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -65,6 +68,7 @@ this.panelSearchTitle.SuspendLayout(); this.panelSearch.SuspendLayout(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -195,23 +199,6 @@ this.panelSearch.Size = new System.Drawing.Size(984, 60); this.panelSearch.TabIndex = 9; // - // txtPRODUCTCODE - // - this.txtPRODUCTCODE.Font = new System.Drawing.Font("宋体", 11F); - this.txtPRODUCTCODE.Location = new System.Drawing.Point(78, 18); - this.txtPRODUCTCODE.Name = "txtPRODUCTCODE"; - this.txtPRODUCTCODE.Size = new System.Drawing.Size(170, 24); - this.txtPRODUCTCODE.TabIndex = 10; - // - // panel1 - // - this.panel1.Controls.Add(this.DGMendRecorder); - this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel1.Location = new System.Drawing.Point(0, 165); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(984, 477); - this.panel1.TabIndex = 10; - // // dtpCREATEDATEEND // this.dtpCREATEDATEEND.CustomFormat = " "; @@ -281,6 +268,59 @@ this.label5.TabIndex = 18; this.label5.Text = "至"; // + // txtPRODUCTCODE + // + this.txtPRODUCTCODE.Font = new System.Drawing.Font("宋体", 11F); + this.txtPRODUCTCODE.Location = new System.Drawing.Point(78, 18); + this.txtPRODUCTCODE.Name = "txtPRODUCTCODE"; + this.txtPRODUCTCODE.Size = new System.Drawing.Size(170, 24); + this.txtPRODUCTCODE.TabIndex = 10; + // + // panel1 + // + this.panel1.Controls.Add(this.pager1); + this.panel1.Controls.Add(this.DGMendRecorder); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 165); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(984, 477); + this.panel1.TabIndex = 10; + // + // pager1 + // + this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); + this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pager1.Location = new System.Drawing.Point(0, 442); + this.pager1.Name = "pager1"; + this.pager1.OSearch = null; + this.pager1.Size = new System.Drawing.Size(984, 35); + this.pager1.TabIndex = 7; + this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); + // + // bindingNavigator1 + // + this.bindingNavigator1.AddNewItem = null; + this.bindingNavigator1.AutoSize = false; + this.bindingNavigator1.CanOverflow = false; + this.bindingNavigator1.CountItem = null; + this.bindingNavigator1.CountItemFormat = ""; + this.bindingNavigator1.DeleteItem = null; + this.bindingNavigator1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.bindingNavigator1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.Flow; + this.bindingNavigator1.Location = new System.Drawing.Point(0, 0); + this.bindingNavigator1.Margin = new System.Windows.Forms.Padding(0, 0, 33, 0); + this.bindingNavigator1.MoveFirstItem = null; + this.bindingNavigator1.MoveLastItem = null; + this.bindingNavigator1.MoveNextItem = null; + this.bindingNavigator1.MovePreviousItem = null; + this.bindingNavigator1.Name = "bindingNavigator1"; + this.bindingNavigator1.PositionItem = null; + this.bindingNavigator1.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional; + this.bindingNavigator1.RightToLeft = System.Windows.Forms.RightToLeft.No; + this.bindingNavigator1.Size = new System.Drawing.Size(984, 35); + this.bindingNavigator1.TabIndex = 3; + this.bindingNavigator1.Text = "bindingNavigator1"; + // // 零件号 // this.零件号.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; @@ -335,7 +375,7 @@ // CreateUser // this.CreateUser.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.CreateUser.DataPropertyName = "CREATEUSERNAME"; + this.CreateUser.DataPropertyName = "UPDATEUSER"; dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F); this.CreateUser.DefaultCellStyle = dataGridViewCellStyle6; @@ -347,7 +387,7 @@ // CREATEDATE // this.CREATEDATE.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.CREATEDATE.DataPropertyName = "CREATEDATE"; + this.CREATEDATE.DataPropertyName = "UPDATEDATE"; dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); this.CREATEDATE.DefaultCellStyle = dataGridViewCellStyle7; @@ -387,6 +427,7 @@ this.panelSearch.ResumeLayout(false); this.panelSearch.PerformLayout(); this.panel1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.bindingNavigator1)).EndInit(); this.ResumeLayout(false); } @@ -409,6 +450,8 @@ private System.Windows.Forms.Label label7; private System.Windows.Forms.ComboBox comINTTYPE; private System.Windows.Forms.Label label5; + private Controls.Pager pager1; + private System.Windows.Forms.BindingNavigator bindingNavigator1; private System.Windows.Forms.DataGridViewTextBoxColumn 零件号; private System.Windows.Forms.DataGridViewTextBoxColumn 物料号; private System.Windows.Forms.DataGridViewTextBoxColumn 物料名称; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs index a46109a..c14b1d6 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.cs @@ -27,7 +27,7 @@ namespace QMAPP.WinForm.Forms.TianJin Storage searchModel = new Storage();//查询条件 Storage product = new Storage(); Main main = new Main(); - int isValidate = 0;//0:未校验 1：已校验 + //int isValidate = 0;//0:未校验 1：已校验 public TJOutWarehouseForm() { @@ -39,12 +39,20 @@ namespace QMAPP.WinForm.Forms.TianJin private void Form_Load(object sender, EventArgs e) { //初始化控件属性 - this.DGMendRecorder.AutoGenerateColumns = false; + this.DGMendRecorder.AutoGenerateColumns = false; + + //出库原因下拉 + BasicData basicData = new BasicData(); + //comINTTYPE + this.comINTTYPE.DataSource = basicData.GetOutReasonList(true); + this.comINTTYPE.DisplayMember = "OUTREASON_NAME"; + this.comINTTYPE.ValueMember = "OUTREASON_CODE"; //初始化分页 - //this.pager1.Init(); - //加载默认查询条件 - SetSearchModel(); + this.pager1.Init(); + //加载默认查询条件 + SetSearchModel(); + BindGirdData(); } #endregion @@ -63,37 +71,14 @@ namespace QMAPP.WinForm.Forms.TianJin List
listMain = new List
(); DataPage dataPage = new DataPage(); //获取前台分页设置信息 - //dataPage = pager1.DataPage; + dataPage = pager1.DataPage; try { + searchModel.State = "2"; //获取零件信息 var result = agent.InvokeServiceFunction>("StorageBLL_GetList", searchModel, dataPage); - - //本体 - //if (resultProduct.Result.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && resultProduct.Result.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString()) - //{ - // Main mainModel = new Main(); - // mainModel.EPIDERMISCODE = resultProduct.Result.PRODUCTCODE; - // //获取本体信息 - // resultMain = agent.InvokeServiceFunction>(B9IPCService.OutWarehouseBLL_GetMainInfo.ToString(), mainModel); - // if (!resultMain.IsSuccess) - // { - // MessageBox.Show(resultMain.Msg, resultMain.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning); - // } - // else - // { - // mainModel = resultMain.Result; - // //绑定本体信息到列表中 - // listMain.Add(resultMain.Result); - // this.DGMendRecorder.DataSource = listMain; - // } - //} - //else - //{ - // //绑定零件信息到列表中 - // listProduct.Add(resultProduct.Result); - // this.DGMendRecorder.DataSource = listProduct; - //} + this.DGMendRecorder.DataSource = JsonConvertHelper.GetDeserialize>(result.Result.Result.ToString()); + this.pager1.DataPage = dataPage; } catch (Exception ex) { @@ -124,61 +109,7 @@ namespace QMAPP.WinForm.Forms.TianJin /// private void tsbSearch_Click(object sender, EventArgs e) { - isValidate = 0; - //设置查询条件 - SetSearchModel(); - //查询条件校验 - bool issuccess = ExistSearchModel(); - - DataResult resultProduct = new DataResult(); - DataResult
resultMain = new DataResult
(); - //获取前台分页设置信息 - //DataPage dataPage = pager1.DataPage; - QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - List listProduct = new List(); - List
listMain = new List
(); - if (issuccess) - { - //this.pager1.Init(); - //获取零件信息 - resultProduct = agent.InvokeServiceFunction>(B9IPCService.OutWarehouseBLL_GetProductInfo.ToString(), searchModel); - if (!resultProduct.IsSuccess) - { - MessageBox.Show(resultProduct.Msg, resultProduct.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning); - isValidate = 0; - } - else - { - //product = resultProduct.Result; - ////本体 - //if (product.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && product.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString()) - //{ - // main.EPIDERMISCODE = product.PRODUCTCODE; - // //获取本体信息 - // resultMain = agent.InvokeServiceFunction>(B9IPCService.OutWarehouseBLL_GetMainInfo.ToString(), main); - // if (!resultMain.IsSuccess) - // { - // MessageBox.Show(resultMain.Msg, resultMain.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning); - // isValidate = 0; - // } - // else - // { - // main = resultMain.Result; - // //绑定本体信息到列表中 - // listMain.Add(resultMain.Result); - // this.DGMendRecorder.DataSource = listMain; - // isValidate = 1; - // } - //} - //else - //{ - // //绑定零件信息到列表中 - // listProduct.Add(resultProduct.Result); - // this.DGMendRecorder.DataSource = listProduct; - // isValidate = 1; - //} - } - } + BindGirdData(); } /// @@ -188,28 +119,12 @@ namespace QMAPP.WinForm.Forms.TianJin /// private void tsbOutWarehouse_Click(object sender, EventArgs e) { - QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - //出库校验 - bool issuccess = ExistOutWarehouse(); - DataResult result = new DataResult(); - if (issuccess) - { - - //if (product.PRODUCTTYPE == EnumGeter.ProductType.biaopi.GetHashCode().ToString() && product.USINGSTATE == EnumGeter.USINGSTATE.USING.GetHashCode().ToString()) - //{ - // //本体 - // result = agent.InvokeServiceFunction(B9IPCService.OutWarehouseBLL_MainOutWarehouse.ToString(), main); - //} - //else - //{ - // //零件 - // result = agent.InvokeServiceFunction(B9IPCService.OutWarehouseBLL_ProductOutWarehouse.ToString(), product); - //} - MessageBox.Show(result.Msg, result.Msg, MessageBoxButtons.OK, MessageBoxIcon.Warning); - BindGirdData(); - isValidate = 0; - this.txtPRODUCTCODE.Text = ""; - } + var form = new TJSendCodeForm(); + //form.StartPosition = FormStartPosition.CenterScreen; + form.ShowDialog(); + this.pager1.Init(); + BindGirdData(); + } #endregion @@ -256,43 +171,6 @@ namespace QMAPP.WinForm.Forms.TianJin Rectangle rectangle = new Rectangle(e.RowBounds.Location.X, e.RowBounds.Location.Y, this.DGMendRecorder.RowHeadersWidth - 4, e.RowBounds.Height); TextRenderer.DrawText(e.Graphics, (e.RowIndex + 1).ToString(), new Font("宋体", 12, FontStyle.Bold), rectangle, this.DGMendRecorder.RowHeadersDefaultCellStyle.ForeColor, TextFormatFlags.VerticalCenter | TextFormatFlags.Right); } - - #region 查询条件校验 - /// - /// 查询条件校验 - /// - private bool ExistSearchModel() - { - //条码 - if (string.IsNullOrEmpty(this.txtPRODUCTCODE.Text.Trim())) - { - MessageBox.Show(Resource1.ProductCodeNullValidate, Resource1.ProductCodeNullValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning); - return false; - } - return true; - } - #endregion - - #region 出库校验 - /// - /// 出库校验 - /// - private bool ExistOutWarehouse() - { - //条码 - if (string.IsNullOrEmpty(this.txtPRODUCTCODE.Text.Trim())) - { - MessageBox.Show(Resource1.ProductCodeNullValidate, Resource1.ProductCodeNullValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning); - return false; - } - //条码是否已验证 - if (isValidate==0) - { - MessageBox.Show(Resource1.ProductCodeValidate, Resource1.ProductCodeValidate, MessageBoxButtons.OK, MessageBoxIcon.Warning); - return false; - } - return true; - } - #endregion + } } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx index 1fc593b..0edf7b5 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJOutWarehouseForm.resx @@ -124,90 +124,90 @@ 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 - rkJggg== + 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 + RK5CYII= @@ -301,6 +301,21 @@ True + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFJRTUZyYW1lV29yay5EYXRhLkF0dHJpYnV0ZXMsIFZlcnNpb249 + MS4zLjMuMCwgQ3VsdHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1udWxsBQEAAAAZUU1GcmFtZVdv + cmsuRGF0YS5EYXRhUGFnZQoAAAAaPFBhZ2VJbmRleD5rX19CYWNraW5nRmllbGQZPFBhZ2VTaXplPmtf + X0JhY2tpbmdGaWVsZBo8UGFnZUNvdW50PmtfX0JhY2tpbmdGaWVsZBw8UmVjb3JkQ291bnQ+a19fQmFj + a2luZ0ZpZWxkGDxLZXlOYW1lPmtfX0JhY2tpbmdGaWVsZB88U29ydEV4cHJlc3Npb24+a19fQmFja2lu + Z0ZpZWxkFzxSZXN1bHQ+a19fQmFja2luZ0ZpZWxkGTxDb3VudFNxbD5rX19CYWNraW5nRmllbGQbPElz + UGFyYWxsZWw+a19fQmFja2luZ0ZpZWxkIjxBY2N1cmF0ZVBhcnRpdGlvbj5rX19CYWNraW5nRmllbGQA + AAAAAQECAQAACAgICAEBAgAAAAEAAAAyAAAAAAAAAAAAAAAKCgoKAAAL + + + + 127, 17 + 25 diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt index 9ec0d1c..a0bab9d 100644 Binary files a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt and b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPastCard.rpt differ diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs index 10bbfbd..37d43ca 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPasteCard.cs @@ -100,6 +100,38 @@ namespace DCS.Place cr = new TJPastCard(); // printdt.TableName = "text"; + cr.PrintOptions.PrinterName = ""; + cr.SetDataSource(printdt); //为报表的数据表填充记录 + cr.PrintToPrinter(1, false, 0, 1); + } + catch (Exception ex) + { + QMAPP.WinForm.WriteLog.WriteError(ex.Message); + } + finally + { + if (cr != null) + { + cr.Close(); + cr.Dispose(); + } + } + } + + /// + /// 本地打印--通过名称-选择打印机 + /// + /// + /// + public void Print(DataTable printdt,string PrinterName) + { + TJPastCard cr = null; + try + { + cr = new TJPastCard(); + + // printdt.TableName = "text"; + cr.PrintOptions.PrinterName = PrinterName; cr.SetDataSource(printdt); //为报表的数据表填充记录 cr.PrintToPrinter(1, false, 0, 1); } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs index c31f116..0df743c 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.Designer.cs @@ -29,16 +29,16 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(TJPrintPlanLabel)); this.dgvPlan = new System.Windows.Forms.DataGridView(); this.dgcOrderNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -70,6 +70,8 @@ this.label8 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.comboBox1 = new System.Windows.Forms.ComboBox(); + this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.dgvPlan)).BeginInit(); this.tpContent.SuspendLayout(); this.tpPlanList.SuspendLayout(); @@ -85,14 +87,14 @@ | System.Windows.Forms.AnchorStyles.Right))); this.dgvPlan.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; this.dgvPlan.BackgroundColor = System.Drawing.SystemColors.ButtonFace; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvPlan.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvPlan.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dgcOrderNo, @@ -109,19 +111,19 @@ this.dgvPlan.Location = new System.Drawing.Point(6, 6); this.dgvPlan.Name = "dgvPlan"; this.dgvPlan.ReadOnly = true; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; - dataGridViewCellStyle10.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); - this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle19.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle19.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle19.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle19.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle19.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle19.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlan.RowHeadersDefaultCellStyle = dataGridViewCellStyle19; + dataGridViewCellStyle20.Padding = new System.Windows.Forms.Padding(0, 0, 8, 0); + this.dgvPlan.RowsDefaultCellStyle = dataGridViewCellStyle20; this.dgvPlan.RowTemplate.Height = 23; this.dgvPlan.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dgvPlan.Size = new System.Drawing.Size(852, 183); + this.dgvPlan.Size = new System.Drawing.Size(1350, 183); this.dgvPlan.TabIndex = 7; this.dgvPlan.RowPrePaint += new System.Windows.Forms.DataGridViewRowPrePaintEventHandler(this.dgvPlan_RowPrePaint); this.dgvPlan.SelectionChanged += new System.EventHandler(this.dgvPlan_SelectionChanged); @@ -129,8 +131,8 @@ // dgcOrderNo // this.dgcOrderNo.DataPropertyName = "ORDERPLAN_NO"; - dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle12.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcOrderNo.DefaultCellStyle = dataGridViewCellStyle12; this.dgcOrderNo.HeaderText = "订单号"; this.dgcOrderNo.Name = "dgcOrderNo"; this.dgcOrderNo.ReadOnly = true; @@ -139,8 +141,8 @@ // dgcSeq // this.dgcSeq.DataPropertyName = "SEQ"; - dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle13.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcSeq.DefaultCellStyle = dataGridViewCellStyle13; this.dgcSeq.HeaderText = "顺序号"; this.dgcSeq.Name = "dgcSeq"; this.dgcSeq.ReadOnly = true; @@ -149,8 +151,8 @@ // dgcMaterialCode // this.dgcMaterialCode.DataPropertyName = "MATERIAL_CODE"; - dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle14.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialCode.DefaultCellStyle = dataGridViewCellStyle14; this.dgcMaterialCode.HeaderText = "零件号"; this.dgcMaterialCode.Name = "dgcMaterialCode"; this.dgcMaterialCode.ReadOnly = true; @@ -159,8 +161,8 @@ // dgcMaterialName // this.dgcMaterialName.DataPropertyName = "MATERIAL_NAME"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle15.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcMaterialName.DefaultCellStyle = dataGridViewCellStyle15; this.dgcMaterialName.HeaderText = "零件描述"; this.dgcMaterialName.Name = "dgcMaterialName"; this.dgcMaterialName.ReadOnly = true; @@ -168,8 +170,8 @@ // // dgcState // - dataGridViewCellStyle6.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.dgcState.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle16.Font = new System.Drawing.Font("宋体", 15.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.dgcState.DefaultCellStyle = dataGridViewCellStyle16; this.dgcState.HeaderText = "工单状态"; this.dgcState.MinimumWidth = 80; this.dgcState.Name = "dgcState"; @@ -179,8 +181,8 @@ // dgcPlanDate // this.dgcPlanDate.DataPropertyName = "PLAN_DATE"; - dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle17.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcPlanDate.DefaultCellStyle = dataGridViewCellStyle17; this.dgcPlanDate.HeaderText = "计划日期"; this.dgcPlanDate.Name = "dgcPlanDate"; this.dgcPlanDate.ReadOnly = true; @@ -189,8 +191,8 @@ // dgcShift // this.dgcShift.DataPropertyName = "SHIFT_CODE"; - dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15.75F); - this.dgcShift.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle18.Font = new System.Drawing.Font("宋体", 15.75F); + this.dgcShift.DefaultCellStyle = dataGridViewCellStyle18; this.dgcShift.HeaderText = "计划类型"; this.dgcShift.Name = "dgcShift"; this.dgcShift.ReadOnly = true; @@ -243,7 +245,7 @@ this.tpContent.Location = new System.Drawing.Point(5, 55); this.tpContent.Name = "tpContent"; this.tpContent.SelectedIndex = 0; - this.tpContent.Size = new System.Drawing.Size(872, 323); + this.tpContent.Size = new System.Drawing.Size(1370, 323); this.tpContent.TabIndex = 0; // // tpPlanList @@ -254,7 +256,7 @@ this.tpPlanList.Location = new System.Drawing.Point(4, 49); this.tpPlanList.Name = "tpPlanList"; this.tpPlanList.Padding = new System.Windows.Forms.Padding(3); - this.tpPlanList.Size = new System.Drawing.Size(864, 270); + this.tpPlanList.Size = new System.Drawing.Size(1362, 270); this.tpPlanList.TabIndex = 0; this.tpPlanList.Text = "计划列表"; this.tpPlanList.UseVisualStyleBackColor = true; @@ -270,7 +272,7 @@ this.tslblOrderCount}); this.toolStrip1.Location = new System.Drawing.Point(3, 197); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(858, 70); + this.toolStrip1.Size = new System.Drawing.Size(1356, 70); this.toolStrip1.Stretch = true; this.toolStrip1.TabIndex = 0; this.toolStrip1.Text = "toolStrip1"; @@ -366,7 +368,7 @@ "显示全部工单", "隐藏挂起工单", "只看挂起工单"}); - this.cbPlanFilter.Location = new System.Drawing.Point(351, 66); + this.cbPlanFilter.Location = new System.Drawing.Point(849, 66); this.cbPlanFilter.Name = "cbPlanFilter"; this.cbPlanFilter.Size = new System.Drawing.Size(175, 33); this.cbPlanFilter.TabIndex = 2; @@ -376,7 +378,7 @@ this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label10.AutoSize = true; this.label10.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label10.Location = new System.Drawing.Point(283, 72); + this.label10.Location = new System.Drawing.Point(781, 72); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(65, 20); this.label10.TabIndex = 16; @@ -394,7 +396,7 @@ "40", "50", "100"}); - this.cbListRowcount.Location = new System.Drawing.Point(625, 66); + this.cbListRowcount.Location = new System.Drawing.Point(1123, 66); this.cbListRowcount.Name = "cbListRowcount"; this.cbListRowcount.Size = new System.Drawing.Size(78, 33); this.cbListRowcount.TabIndex = 3; @@ -412,7 +414,7 @@ "10s", "15s", "20s"}); - this.cbRefreshRate.Location = new System.Drawing.Point(802, 66); + this.cbRefreshRate.Location = new System.Drawing.Point(1300, 66); this.cbRefreshRate.Name = "cbRefreshRate"; this.cbRefreshRate.Size = new System.Drawing.Size(66, 33); this.cbRefreshRate.TabIndex = 4; @@ -422,7 +424,7 @@ this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; this.label8.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.Location = new System.Drawing.Point(529, 72); + this.label8.Location = new System.Drawing.Point(1027, 72); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(93, 20); this.label8.TabIndex = 12; @@ -433,7 +435,7 @@ this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label6.Location = new System.Drawing.Point(706, 72); + this.label6.Location = new System.Drawing.Point(1204, 72); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(93, 20); this.label6.TabIndex = 13; @@ -445,11 +447,39 @@ this.timer1.Interval = 1000; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // - // PrintPlanLabel + // comboBox1 + // + this.comboBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Items.AddRange(new object[] { + "显示全部工单", + "隐藏挂起工单", + "只看挂起工单"}); + this.comboBox1.Location = new System.Drawing.Point(595, 64); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(175, 33); + this.comboBox1.TabIndex = 17; + // + // label2 + // + this.label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(524, 72); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(65, 20); + this.label2.TabIndex = 18; + this.label2.Text = "门板位置"; + // + // TJPrintPlanLabel // this.AutoScaleDimensions = new System.Drawing.SizeF(11F, 25F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(880, 382); + this.ClientSize = new System.Drawing.Size(1378, 382); + this.Controls.Add(this.label2); + this.Controls.Add(this.comboBox1); this.Controls.Add(this.cbPlanFilter); this.Controls.Add(this.label10); this.Controls.Add(this.cbListRowcount); @@ -461,7 +491,7 @@ this.Controls.Add(this.tpContent); this.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(5, 6, 5, 6); - this.Name = "PrintPlanLabel"; + this.Name = "TJPrintPlanLabel"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "门板计划标签打印"; this.Load += new System.EventHandler(this.PrintPlanLabel_Load); @@ -507,6 +537,7 @@ private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label6; private System.Windows.Forms.Timer timer1; - + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.Label label2; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index fd9a51d..036dbf2 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -429,52 +429,44 @@ namespace QMAPP.WinForm.Forms.TianJin } tsbPrint.Enabled = false; var order1 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[0].DataBoundItem; - var order2 = (FJC.Entity.ProductionPlan.WorkOrder)dgvPlan.Rows[1].DataBoundItem; var orders = new List(); orders.Add(order1); - //if (string.Equals(order1.SEQ, order2.SEQ)) - //{ - // orders.Add(order2); - //} - + List labels = new List(); - foreach (var order in orders) - { - var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); - //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); - string positioncode = GetNameCode(order.MATERIAL_NAME); - var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", order.MATERIAL_CODE + "", positioncode); + var data = DateTime.Now.ToString("yyyyMMddHHmmssfff"); + data = data.Substring(2, data.Length - 2); + //var codematch = System.Text.RegularExpressions.Regex.Match(order.PBOM_CODE, "_[LR][FR]_"); + string positioncode = GetNameCode(orders[0].MATERIAL_NAME); + var book = _agent.InvokeServiceFunction("FISPhraseBLL_GetFisPhraseBook", orders[0].MATERIAL_CODE + "", positioncode); - LabelData labeldata = new LabelData(); + LabelData labeldata = new LabelData(); - labeldata.MATERIALCODE = order.MATERIAL_CODE; + labeldata.MATERIALCODE = orders[0].MATERIAL_CODE; - labeldata.PlanDate = order.PLAN_DATE; - if (book != null) - { - labeldata.Class = " " + book.Class.Substring(0, 2); - labeldata.Description = book.Text; - labeldata.OrderNo = book.CarModel+ positioncode+ data; - } - var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = order.MATERIAL_CODE }); - var material = mcresult.IsSuccess ? mcresult.Result : null; - if (material != null) - { - labeldata.MaterialName = material.MATERIAL_SHORT; - labeldata.CarModel = material.PROJECTCODE; - } - labels.Add(labeldata); + labeldata.PlanDate = orders[0].PLAN_DATE; + if (book != null) + { + labeldata.Class = " " + book.Class.Substring(0, 2); + labeldata.Description = book.Text; + labeldata.OrderNo = book.CarModel + positioncode + data; } + var mcresult = _agent.InvokeServiceFunction>("MaterialBLL_Get", new Material { MATERIAL_CODE = orders[0].MATERIAL_CODE }); + var material = mcresult.IsSuccess ? mcresult.Result : null; + if (material != null) + { + labeldata.MaterialName = material.MATERIAL_SHORT; + labeldata.CarModel = material.PROJECTCODE; + } + labels.Add(labeldata); + PrintLabel(labels); //变更打印状态 0=>1 - foreach (var order in orders) - { - //agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", order.PID); - } + _agent.InvokeServiceFunction("WorkOrderBLL_SetOrderPrinted", orders[0].PID); + BindPlanView(); tsbPrint.Enabled = true; } diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx index 5cb6633..f09aad3 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.resx @@ -153,76 +153,78 @@ 17, 17 + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAA8SSURBVGhDzZlJcJvnecfppm3SptMm05l4Jqf2oFvdprn0 - 0lOnPTTuTC89dKbLxGkST2xXlpTYY8exKzlyRYkECVILF3EFAYKLSHDfSYn7vgAiiJXYSRALd4IgiOXf - //sBoEhJlOiacayZVwCxfc/vef7P8r5fRsaX9A9IILli0uOXdNnzuwwQpeE7R4YfB0mQ6/yudM6/BMQl - 45CYo81/QefLjkASfC+RiB0Z/5UEEZ6WACI/BMIZwOErfOnPCFKAKVcIddoIDP59xOLRr14Ujrwf0wFb - X6eCaHzoaxJIIpKBzb3XMOksRdXcGkEOYSTIYfzwq5MjR97fpvf99P4Gjd/i487vJEEIgXgGQuHvY9p1 - H6VTPow5k5IT0vqtJLtUa8R/ae1HZoCVbwKrNNbHCAQECBdBEgRJ7BEmwtcTGdgOfQ+uzWJ+d12qV18q - gDBaXDRdA44A/D8Clmmwix738FEC4ToB8jWCEEKAxPhe7M/5Y3n8tc1k/vwmy65k+LEyuLEfg2U9jEic - 1z+YB0y/D5hpwzKNswsQrlNBREREjvCzhwLkAn/EmYJISuvc/j1jeCiKMccO1NogFPM+NFvi2LL8B6Cj - VJZolJEGWQQI10tAsPt7wB4/F/lbAhyebxSertXBvQgeWdahmFrF/fFVKGa8qJzbQcvsIKLT9P4cDdHS - o4/5uMR1JhB+XiR7tDVl/JNe8f+OQDo50z/goEy69X6UjTpx55EN9wbtKB3zoHzcieLJbVgn/hUYp/cn - 6f0ZGiOBcL0MxMukXhNJ/vfnJ5n0FCOMD+wdossQRNGwC3ce2lFEw0uGnXxtHQtr+1AvxdAy+RDRR38A - DNGQUXqTIJjkSoMsnAbCz7q4RI6E28/H++nKEo7GMe3eo0R8KKFUKiZX6G0PSkZcaNf5YFzdgWUzgm4/ - rz/5Q6CL3h/4XeARjZFAuF4KwmiJPPH+3fnoPm28j17vMG+jWreBGt061AsBVM36UDnlJQi1P+KErF2H - 6/XTKG4fwH77t4FuAnS/gngPK0s/vXomEH7WwO/ttqf6wBfUfpwZawqE0b4cQot1D63mXTQatlG/uIka - 7Tqq5wkys4bKaS8U02soGnLgRsMUciorMFr9j4i0sYEdA8GLQObpfZEnzn840n488QVKZyyegN4fxiPP - IR6tHKLPdYBO+z7arCE0m06CqOb9EoiAqKLECke8uN5skkDGqn+AcOsfSiBinR4RRms6A6oHn6Fn1oX9 - yMGTKTW1kzhzBYrTePv6AQxbcSxuJjDtj2HUGyVMBL3OA3Q9FyQI1ZxfghAltWp6hSBr+HWTCblSRF5H - pPUbyYh0nZRWfIiVZyIDi53fx9tZSlzOVyO3YRDjRjfCkeSUmq6Cx7v9qUCB3QjWD+LY4GDoDjGvdhLQ - bTCJJRBGRAIJo8uWjsgOGpe2UP94U2pkT0BWJJCCYUakyciIVBLkB09Ji9IR0hp8BfJ7P8ebmdX48F4N - flnSgquqfpQNGrDo3UMkdsZd3G74EKbVbayzQe0eJrDDjVQgkgLZTkC7LkCiGF+LYICy6nWkQfYorR00 - EKTu8QYT/SmQqTRIUlqj6tcprW9K0UBfBh7Xv4YfXS3E5VwFrlZ2I69jgRXOgXIWivIZPzT6DeiZj+HY - KXmRDo3WuYEB/RoWHBuw+3clkL00yAFnsTBg2ARGPJwStoCxtUOChNFDkE5bCK2WPTQZj4EcRYQdmhBV - XJK0NAKkEiPV/4TD1q+jojoTdwfdqNMFUM7KVj4hSrX4DvNqzgcFq96dARf6tL7TG5xI3NY5D+on2Zi0 - qxg2+iUQR2AXG6EIQuwFLPXoHO1AWf01KHjBUTejspWQQPopq1NBGBGlMIQVq5I9REjr3vAaPms24nqp - CopxG/pWwI0Nm+SgjRWNDXLMhdJxN4ofOnGvzYostR4dk55nAdLzTXD3ABWDy6gYskE95kDjtEsCGTH5 - ISLjWd+FMxjF1HQJ/I+/i+nxCyhvyySIE8NuERGCeCPof15E9JQW+4joIcpUD1EQRCR8wZAbhRxH7tPo - u/1Wdnl2eD6/12NFnsaM3BoD8uqNuFWrRyfBn0neNMDa5j4KevjhNh1KHlqh5JyjHrNDM+1Gty4Jsuja - gIt5YPa44Xb+CgHXdzE5QpCGG4S3Y4Re1ErSimHAfZCMCPvIkbQkkGQzTIOIiJSNuXGf1yvhKhpw4rbG - itxqyqzGCHmdEfkNZwYw4lJeI97KUiOrcZpVYBlVI3YpIpoZAeLFqMkHw8oeljk2mN0r8Nh+Cd8sQZou - oEz1a6iH9JTWHiZ9MQytMtmfAdnGA/0magkimqEAqZpd42C4grstduSqzMhRGel5lmAaL6f38wRAHSMw - 89IIGHHldhP+7aMCrkK8V9iO3Jb5FIgDNeMONBGkR7eCcfMaZ6A92AIstW4PVnTvw9r2l7iSmY+GCRvs - LMFzgSgm1qIYZjMUVavHHkaH6Oyiqy9to8GwJYHc7/VArrJApqDR9LxkfBrgAQEajcgiQNdZAC4T4Kef - KfBf1xV443oVfnarFh8Wdz0LMkuQx6uYsBDEuw8nq9OCLYgZkwfb0QQCrFquPY4jbIjzwZgEMrQicoTN - kD2ky7GPBu0m7jY6ICunXBTC89R8GqA2KR+5ANAYkFVPgNkzREAA/Ph6Bd7KrsXF/Bb8t1yDN29Ws0uq - 8VFJF/JaF1DOSqEcdaB2wolmgvRKID5YfbsIcvjbi8TA3SVBeCDB0itAjAIkEMM4m+GYLwrN7CbkymVk - l9HwKi6lAKDn1ce8T/nIG5iXAuCBHt2fF+C94l58UDqA94u6cClfg7duVeNidg0+PhXEi3FLgDmyjbWt - 8BMQdnUB4txNgApCx/wWskstkvG5CssRgOR9AXDM+wIgn50868Eiuuc+ZwTeK+7Bx1Wj+EQ5gv9RPMKv - Snvw89savJNVjXdlanxS2oV8ERGWXlG1RERa2Ev62QwnrUHmyDZ822GEDmPsI8A+B7MZNrusEjONp+GV - XEI6ae8fl0/K+/LGFEDD5wD4yfVKvJ1dhysFnfjPa+WUUiuu1Uwgs24cN2uG8WllH96/q8FFglwmyNUy - grQJEDuUY07UsRmKpihAppaD0niyETrASjCM21U2CSCnQgDwMQWQ9r68Rk/tGyTtC+/LKZ/8ZkqokQDz - Z4lAfhPeuFaGd2T1EsDrF7Pxz+98in/5hQyX7vbg01odcjSzkDeO4Yayn8NXE97lFHlFVo2rpZ24TZAK - gqieApl1rEPZ5kJmUdJ4mQAQxgv9p5I3p9qI7DoPcuqtBKDx9L7Qfxqg50UAXqmRGfGLO8344G4TS9c4 - SvoWUT1Fj+q28WH5MH78wRVk5v2MEejELY0eBR06FLZOIbvmIT4q0OCSAMlW4hpB7hwDaZhxoY776OwS - K2RlXOUp+aSSV3hfpjShpNeBMWMBilsfQvbAQuOXkNdEgBZGQLOInoUXRCBArd7p1COvZQGNk8vcqPvQ - vczt5DJ3hGYtVpyXEFn8I6wNZKBH8R3kF76FTFUPbrebUdG3hMruWbb8QXxcKEAUKZAO3GnXonLEhgIN - K05x0njJ+5VMVsUS9W+CnImbWWXEyHw3R98LaNBcw40Hq8in0XnNS8yzFwCkZwvOctC6NtG55MeA/RC9 - 9gRGrAtwWH+KQ8uf8JSNuyozx18rNyDGV+AfzECf8lUUlLyN3Pp+es+G2mEzah5qca9xCFeLmnDxRhk+ - KWpBYb8F8mozZCICEgCfVy7jZrUfMhVnHrWBHvegXfUTuPmbd2v7kMtxIo9RTgPImhfRq31OBARAiI3H - HDzApOcAjDSmHHp4nG8i6vpj1j5xmsYNt42bDx4RJnhUmBAgy0mQAEEGVK+ipPwdFDQNQcXhrmXSBs2I - HsX8+6ayD/mdBknvMpbOHBqfVWZj1OYwZXgf+fXDyCZEeYcdVZ06FDRMUvPMgca0fJYYRQP321p0LySn - 0RM7M6H9FibHqCOEBe8qfN43EPfSWC8NX6HhHj5302AB4kgdDfKIMGE9BmIiCI9PBmu+g8qqd1HWPoLG - CS/6FtxoGGU1addLySpj6cxl5flfRsG0KOcMcgEl6gLmkBt3mLTVfS6UEETe8ET7siY9hPfrOViu0tZn - AKLUjnmV0iFEp87GuUaGSPA1IEijxSkZT8sSq6nTZTf/Fge0aRBbCsTCaNi4CBIcycBw/atQqS+jpm8a - tWNe5LUvSgCi9stF6azjnkPx75ir+BtkqWYgr7Uip5Yyql1C7gNqXsMtKCOQxdqvfLRM+7ZPHCI/dz8c - 5XbNtLKD1nkeoTDbl1zFOFj/q+RROM/2ExIIjVzh3+L0TICkoyJApKgQWkiNEgvwMGui4VuobXgP8g4a - yCQV+s+mhNSdbii6WSLZXW/X25JjMxtXfiMTm7VfTJ6l3RYs2NdxmNpGPn2gfALi+Pm+uF8liFvneUg7 - 74beWYRQ8K953yEFskYQcYaZBhFRESBcCTtPHKw8708dp0fN30DfwyvIaVtGrpJeFfWfEbittkLdxd0W - K1OOmsNaPQ0nwE3uuu61mjDGQhLmPJW8W3PyCP+FxyvHT59jsSgsBGnhaXMzQXSO+9gPfo8g9LK4ZSSB - 0NvipoWHEXKncoWRObD9KZYMF9FuMEG1sM9N0uPknC/Kp8gFrqwqJjaNz6014aaKsuHM3z/n5Z2a5JF6 - 2vgznwcd/+CJiBBEisjcNjQcD7T2YkaEIOJWUYCGi1tHa8l8iXi+BYP1XXQsMemMQO3jPZQOsSExByQA - oX8aL57nqc24paTuKZ82nmz7NsMnDD/TGdDL6J6WVjIi22jkCL1gL8KukNYmDfd/G2bHRXQYaLgBUGl3 - ub+lNFpmcL9rAfkdTE4xKrOUCuNvKbjDYgTqedLg8oVOGv6buPH9PGk1z3JXNevAtE2JQds8eFKCBn0I - ZcNW3O/RopBnO7mtWhRxn53fwQGNHs+qYMetMKKKpdLk2oE4BfzcOn+Z11/0/rMREXdjNlE3y/3t+DJK - e3UY0jmwy8lT/M4yNzi1Yzbkti0iU2HA/UYbFsybEBXvSzX8aajjIPE4b+ytbmBU78ZOyvDjN0XEd0UO - jS8GWVl+y4Y/D+TZ1xJHTSdB0rN854uo4ly+KyIi7iecVjnS75/LxY79yP8B7rHGaeJC7ocAAAAASUVO - RK5CYII= + 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 + Ae6xxmll7eSUAAAAAElFTkSuQmCC diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs index 8443805..c74add6 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.Designer.cs @@ -53,7 +53,6 @@ this.label5 = new System.Windows.Forms.Label(); this.panel1 = new System.Windows.Forms.Panel(); this.DGView = new System.Windows.Forms.DataGridView(); - this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.条码 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料号 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.物料名称 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -61,6 +60,7 @@ this.操作人 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.入库时间 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Pid = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pager1 = new QMAPP.WinForm.Controls.Pager(); this.toolStrip1.SuspendLayout(); this.panelSearchTitle.SuspendLayout(); this.panelSearch.SuspendLayout(); @@ -282,17 +282,6 @@ this.DGView.TabIndex = 4; this.DGView.RowPostPaint += new System.Windows.Forms.DataGridViewRowPostPaintEventHandler(this.DGView_RowPostPaint); // - // pager1 - // - this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); - this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.pager1.Location = new System.Drawing.Point(0, 607); - this.pager1.Name = "pager1"; - this.pager1.OSearch = null; - this.pager1.Size = new System.Drawing.Size(998, 35); - this.pager1.TabIndex = 7; - this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); - // // 条码 // this.条码.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; @@ -375,7 +364,17 @@ this.Pid.Name = "Pid"; this.Pid.ReadOnly = true; this.Pid.Visible = false; - this.Pid.Width = 60; + // + // pager1 + // + this.pager1.DataPage = ((QMFrameWork.Data.DataPage)(resources.GetObject("pager1.DataPage"))); + this.pager1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.pager1.Location = new System.Drawing.Point(0, 607); + this.pager1.Name = "pager1"; + this.pager1.OSearch = null; + this.pager1.Size = new System.Drawing.Size(998, 35); + this.pager1.TabIndex = 7; + this.pager1.EventPaging += new QMAPP.WinForm.Controls.EventPagingHandler(this.pager1_EventPaging); // // TJProductInForm // @@ -409,7 +408,6 @@ private System.Windows.Forms.ToolStripButton tsbSearch; private System.Windows.Forms.TextBox txtProductCode; private System.Windows.Forms.Label label3; - private Controls.Pager pager1; private System.Windows.Forms.Panel panelSearchTitle; private System.Windows.Forms.Label lblSearchTitle; private System.Windows.Forms.Panel panelSearch; @@ -429,5 +427,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn 操作人; private System.Windows.Forms.DataGridViewTextBoxColumn 入库时间; private System.Windows.Forms.DataGridViewTextBoxColumn Pid; + private Controls.Pager pager1; } } \ No newline at end of file diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs index 64112a5..1c6f552 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.cs @@ -139,18 +139,18 @@ namespace QMAPP.WinForm.Forms.TianJin /// private void tsbAdd_Click(object sender, EventArgs e) { - //ProductInSendCodeForm editForm = new ProductInSendCodeForm(); - //DialogResult result = editForm.ShowDialog(); - //if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作 - //{ - // this.pager1.Init(); - // BindGirdData(); - //} - var form = new TJProductInSendCodeForm(); - form.StartPosition = FormStartPosition.CenterScreen; - form.ShowDialog(); - this.pager1.Init(); - BindGirdData(); + TJProductInSendCodeForm editForm = new TJProductInSendCodeForm(); + DialogResult result = editForm.ShowDialog(); + if (result == System.Windows.Forms.DialogResult.OK)//判断是否投料窗口已做操作 + { + this.pager1.Init(); + BindGirdData(); + } + //var form = new TJProductInSendCodeForm(); + //form.StartPosition = FormStartPosition.CenterScreen; + //form.Show(); + //this.pager1.Init(); + //BindGirdData(); } // 行序号 diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx index 0a66379..e793511 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJProductInForm.resx @@ -124,90 +124,90 @@ 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 - suR/AIh+8Buz+f8AAAAAAElFTkSuQmCC + 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 + y+7D8eQU3AAAAABJRU5ErkJggg== diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs index 9eed93c..994f683 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.Designer.cs @@ -30,7 +30,6 @@ { this.txtCode = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.tsb_close = new System.Windows.Forms.Button(); this.labelError = new System.Windows.Forms.Label(); this.labelOutReason = new System.Windows.Forms.Label(); this.comboBoxOutReason = new System.Windows.Forms.ComboBox(); @@ -57,16 +56,6 @@ this.label1.TabIndex = 6; this.label1.Text = "条码"; // - // tsb_close - // - this.tsb_close.Location = new System.Drawing.Point(270, 133); - this.tsb_close.Name = "tsb_close"; - this.tsb_close.Size = new System.Drawing.Size(75, 23); - this.tsb_close.TabIndex = 8; - this.tsb_close.Text = "关闭"; - this.tsb_close.UseVisualStyleBackColor = true; - this.tsb_close.Click += new System.EventHandler(this.tsb_close_Click); - // // labelError // this.labelError.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); @@ -111,13 +100,13 @@ // this.tsb_submit.Location = new System.Drawing.Point(119, 133); this.tsb_submit.Name = "tsb_submit"; - this.tsb_submit.Size = new System.Drawing.Size(75, 23); + this.tsb_submit.Size = new System.Drawing.Size(226, 23); this.tsb_submit.TabIndex = 14; this.tsb_submit.Text = "提交"; this.tsb_submit.UseVisualStyleBackColor = true; this.tsb_submit.Click += new System.EventHandler(this.submit_Click); // - // SendCodeForm + // TJSendCodeForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -127,13 +116,11 @@ this.Controls.Add(this.comboBoxOutReason); this.Controls.Add(this.labelOutReason); this.Controls.Add(this.labelError); - this.Controls.Add(this.tsb_close); this.Controls.Add(this.txtCode); this.Controls.Add(this.label1); - this.Name = "SendCodeForm"; + this.Name = "TJSendCodeForm"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "出库"; - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.SendCodeForm_FormClosing); this.Load += new System.EventHandler(this.Form_Load); this.ResumeLayout(false); this.PerformLayout(); @@ -144,7 +131,6 @@ private System.Windows.Forms.TextBox txtCode; private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button tsb_close; private System.Windows.Forms.Label labelError; private System.Windows.Forms.Label labelOutReason; private System.Windows.Forms.ComboBox comboBoxOutReason; diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs index 5b8ea8a..1af9e97 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJSendCodeForm.cs @@ -13,6 +13,7 @@ using QMAPP.Entity; using QMAPP.WinForm.Common; using QM.Common; using QMAPP.MD.Entity; +using QMAPP.MD.Entity.TianJin; namespace QMAPP.WinForm.Forms.TianJin { @@ -23,8 +24,6 @@ namespace QMAPP.WinForm.Forms.TianJin /// public partial class TJSendCodeForm : Form { - List productList = new List(); - TJOutWarehouseForm sendmain = new TJOutWarehouseForm(); public TJSendCodeForm() { InitializeComponent(); @@ -37,12 +36,7 @@ namespace QMAPP.WinForm.Forms.TianJin new KeyEvent().SetKeyToTxt(this); //出库原因下拉 BasicData basicData = new BasicData(); - //初始化控件属性 - //this.comboBoxOutReason.DataSource = basicData.GetDictionaryList(EnumGeter.DictKind.OutReason.ToString()); - //this.comboBoxOutReason.DisplayMember = "VALUE"; - //this.comboBoxOutReason.ValueMember = "KEY"; - //this.comboBoxOutReason.SelectedValue = ""; - + //加载物料类型分类 OutReason searchModelType = new OutReason(); this.comboBoxOutReason.DataSource = basicData.GetOutReasonList(true); @@ -64,41 +58,7 @@ namespace QMAPP.WinForm.Forms.TianJin this.ActiveControl = this.txtCode; this.txtCode.Focus();//落入光标 } - - - #region 保存出库信息到ProductOut表 - /// - /// 保存出库信息到ProductOut表 - /// - public void SaveInfo(List productList) - { - ProductOut outInfo = new ProductOut(); - outInfo.PID=Guid.NewGuid().ToString();//PID - outInfo.productList = productList; - if (ClientContext.produceShift != null) - { - outInfo.SHIFT_CODE = ClientContext.produceShift.PRODUCESHIFTTCODE; - } - outInfo.CREATEUSER = ClientContext.LoginInfo.UserID; - outInfo.CREATEDATE = DateTime.Now; - foreach (var model in productList) - { - outInfo.PRODUCT_CODE = model.PRODUCTCODE; - outInfo.MATERIAL_CODE = model.MATERIAL_CODE; - outInfo.WORKCENTER_CODE = model.WORKCENTER_CODE; - outInfo.WORKCELL_CODE = model.WORKCELL_CODE; - outInfo.OUTREASON = model.OUTREASON; - } - QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - DataResult result = agent.InvokeServiceFunction>("ProductOutBLL_InsertProductOut", outInfo); - //MessageBox.Show(result.Msg); - //this.DialogResult = DialogResult.OK; - productList.Clear(); - this.comboBoxOutReason.SelectedItem = null; - this.txtCode.Text = ""; - } - #endregion - + # region 扫码枪 /// /// 扫码枪 @@ -107,93 +67,35 @@ namespace QMAPP.WinForm.Forms.TianJin /// private bool ValidateAndAddCode(string proCode) { - + QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); if (!string.IsNullOrEmpty(proCode)) { - if (System.Text.RegularExpressions.Regex.IsMatch(proCode, "^DP\\w+(-\\w+)?-DF[LR][FR]\\w+$"))//扫描输入为门板计划标签 - { - //从计划标签中截取产品码 - proCode = proCode.Substring(proCode.LastIndexOf('-') + 1); - } //出库原因 if (this.comboBoxOutReason.Text.ToString() == "") { this.labelError.Text ="出库原因不能为空！"; return false; } - #region 获取零件信息 - QMAPP.ServicesAgent.ServiceAgent agent = ClientContext.GetServiceAgent(); - Product searchModel = new Product(); - Main mainModel = new Main(); - //去Main表查询数据 - - if (proCode.Substring(0, 3) == "052") - { - //从计划标签中截取产品码 - mainModel.MAINCODE = proCode; - Main mainInfo = agent.InvokeServiceFunction
("MainBLL_GetByCondition", mainModel); - if (mainInfo != null) - { - searchModel.PRODUCTCODE = mainInfo.EPIDERMISCODE; - } - } - else - { - searchModel.PRODUCTCODE = proCode; - } - - this.labelError.ForeColor = System.Drawing.Color.Red; - List list = agent.InvokeServiceFunction>("ProductBLL_GetAllList", searchModel); - - if (list.Count <= 0)//是否存在该零件 - { - this.labelError.Text =this.txtCode.Text +"\r\n"+ Resource1.SendInfoNotFoundCode; - this.txtCode.Text = ""; - return false; - } - list[0].OUTREASON = this.comboBoxOutReason.SelectedValue.ToString(); - Product model = list[0]; - #endregion - - - - #region 判断零件状态 - - //合格返修报废 - if (!model.STATUS.Equals(EnumGeter.PRODUCTSTAUTS.QUALIFIED.GetHashCode().ToString()))//合格 + var count = agent.InvokeServiceFunction>("StorageBLL_SelectCount", proCode); + if (count.Result > 0) { - if (model.STATUS.Equals(EnumGeter.PRODUCTSTAUTS.REPAIR.GetHashCode().ToString()))//合格 - { - this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoRepaired; - this.txtCode.Text = ""; - return false; - } + var storage = new Storage(); + storage.ProductCode = proCode; + storage.OutStorageType = this.comboBoxOutReason.Text.ToString(); + var result = agent.InvokeServiceFunction("StorageBLL_Update", storage); + if (result.IsSuccess) + return true; else { - this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoWadBad; - this.txtCode.Text = ""; + this.labelError.Text = result.Msg; return false; } } - //是否已出库 - if (EnumGeter.OUTFLAG.INWAREHOUSE.GetHashCode().ToString().Equals(model.OUTFLAG) == false) - { - this.labelError.Text = this.txtCode.Text + "\r\n" + Resource1.SendInfoNotOk; - this.txtCode.Text = ""; - return false; - } - //是否已经完成 - if (EnumGeter.Finish.ENDOFLINE.GetHashCode().ToString().Equals(model.ENDOFLINE) == false) + else { - this.labelError.Text = this.txtCode.Text + "\r\n" + "该本体正在加工中，未完成"; - this.txtCode.Text = ""; + this.labelError.Text = "条码未进行入库操作！"; return false; } - #endregion - - //添加到零件列表 - productList.Add(model); - return true; } this.labelError.Text = "请选择相应信息！"; @@ -213,7 +115,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (ValidateAndAddCode(this.txtCode.Text.Trim())) { - SaveInfo(productList); + //SaveInfo(productList); this.txtCode.Text = ""; this.labelError.ForeColor = System.Drawing.Color.Green; this.labelError.Text = "操作成功"; @@ -228,22 +130,20 @@ namespace QMAPP.WinForm.Forms.TianJin ///
/// /// - private void tsb_close_Click(object sender, EventArgs e) - { - this.DialogResult = DialogResult.OK; - this.Close(); - } + //private void tsb_close_Click(object sender, EventArgs e) + //{ + // this.Close(); + //} /// /// 点击右上角X关闭窗口 /// /// /// - private void SendCodeForm_FormClosing(object sender, FormClosingEventArgs e) - { - this.DialogResult = DialogResult.OK; - e.Cancel = false; - } + //private void SendCodeForm_FormClosing(object sender, EventArgs e) + //{ + // this.Close(); + //} #endregion @@ -253,7 +153,7 @@ namespace QMAPP.WinForm.Forms.TianJin { if (ValidateAndAddCode(this.txtCode.Text.Trim().ToUpper())) { - SaveInfo(productList); + //SaveInfo(productList); this.txtCode.Text = ""; this.labelError.ForeColor = System.Drawing.Color.Green; this.labelError.Text = "操作成功"; diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index 4640a80..19eb21a 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("2021.09.08.01")] -[assembly: AssemblyFileVersion("2021.09.08.01")] +[assembly: AssemblyVersion("2022.03.28.02")] +[assembly: AssemblyFileVersion("2022.03.28.02")]