From 7e3cefd5934f9a711241d584670c238156f26189 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Thu, 7 Jul 2022 10:10:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A9=E6=B4=A5=E6=9D=A1?= =?UTF-8?q?=E7=A0=81=E6=89=93=E5=8D=B0=E8=AE=A1=E5=88=92=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/Web.config | 3 + APPMD/QMAPP.MD.DAL/PbomDAL.cs | 52 ++ APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs | 453 +++++++++++++++--- APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs | 6 +- .../TJDoorPlankPlanPrintController.cs | 2 +- APPQ5/QMAPP.WinForm/App.config | 12 +- .../Forms/TianJin/TJPrintPlanLabel.cs | 2 +- .../WCF/QMFrameWork.WebServiceHost/Web.config | 6 +- 8 files changed, 453 insertions(+), 83 deletions(-) diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index 43c1720..7acb39c 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -55,6 +55,9 @@ + + diff --git a/APPMD/QMAPP.MD.DAL/PbomDAL.cs b/APPMD/QMAPP.MD.DAL/PbomDAL.cs index 58f3464..da36e5a 100644 --- a/APPMD/QMAPP.MD.DAL/PbomDAL.cs +++ b/APPMD/QMAPP.MD.DAL/PbomDAL.cs @@ -71,6 +71,58 @@ namespace QMAPP.MD.DAL throw ex; } } + + /// + /// 获取信息 + /// + /// 条件 + /// 信息 + public Pbom TJGet(Pbom model) + { + StringBuilder sqlBuilder = new StringBuilder(); + List parameters = new List(); + sqlBuilder.Append(" SELECT * "); + sqlBuilder.Append(" FROM T_MD_PBOM "); + sqlBuilder.Append(" WHERE FLGDEL = '0'"); + if (string.IsNullOrEmpty(model.PBOM_CODE) == false) + { + sqlBuilder.Append(" AND PBOM_CODE = @PBOM_CODE "); + parameters.Add(new DataParameter { ParameterName = "PBOM_CODE", DataType = DbType.String, Value = model.PBOM_CODE }); + } + if (string.IsNullOrEmpty(model.MATERIAL_CODE) == false) + { + sqlBuilder.Append(" AND MATERIAL_CODE LIKE @MATERIAL_CODE "); + parameters.Add(new DataParameter { ParameterName = "MATERIAL_CODE", DataType = DbType.String, Value = "%" + model.MATERIAL_CODE + "%" }); + } + if (string.IsNullOrEmpty(model.PID) == false) + { + sqlBuilder.Append(" AND PID= @PID "); + parameters.Add(new DataParameter { ParameterName = "PID", DataType = DbType.String, Value = model.PID }); + } + try + { + if (null != BaseSession) + { + string sqlChange = ChangeSqlByDB(sqlBuilder.ToString(), BaseSession); + model = BaseSession.Get(sqlChange, parameters.ToArray()); + } + else + { + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + string sqlChange = ChangeSqlByDB(sqlBuilder.ToString(), session); + //获取信息 + model = session.Get(sqlChange, parameters.ToArray()); + } + } + return model; + } + catch (Exception ex) + { + RecordExceptionLog(ex, "Bom信息维护数据层-获取信息"); + throw ex; + } + } #endregion #region 获取列表 diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs index cb51b96..627b2b6 100644 --- a/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/FIS/DoorPlankPlanBLL.cs @@ -235,81 +235,88 @@ namespace QMAPP.FJC.BLL.FIS { DataResult result = new DataResult(); //基本信息 - + try { - if (model.MATERIAL_CODE.Length <= 10) + model.PID = Guid.NewGuid().ToString(); + model.PLAN_STATE = "0"; + model.PLANSOURCE = model.PLANSOURCE; + //var materialcode = ""; + //if (model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "L" || model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1) == "R") + // materialcode = model.MATERIAL_CODE.Substring(model.MATERIAL_CODE.Length - 1, 1); + //else + // materialcode = model.MATERIAL_CODE; + //Pbom pbomcode = new PbomDAL().TJGet(new Pbom { MATERIAL_CODE = materialcode }); + //model.PBOM_CODE = pbomcode.PBOM_CODE; + string workcentercode = new WorkCellDAL().GetWorkcenter(model.ORDER_TYPE); + model.WORKCENTER_CODE = workcentercode; + if (model.WORKCENTER_CODE != "") { - 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); + 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 = "DP_ASSEMBLY_770B"; + 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); + + //if (model.MATERIAL_CODE.Length <= 10) + //{ + // //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 + //{ + + //} } catch (Exception ex) { @@ -785,6 +792,310 @@ namespace QMAPP.FJC.BLL.FIS } #endregion + #region 发布 + /// + /// 发布信息 + /// + /// + /// 发布个数 + public DataResult TJPutOut(string strs) + { + string[] list = strs.Split(":".ToCharArray()); + DataResult result = new DataResult(); + try + { + OrderPlanDAL orderPlandal = new OrderPlanDAL(); + + List validorderPlanList = new List(); + List putOutPlanList = new List(); + + foreach (string str in list) + { + OrderPlan op = orderPlandal.Get(new OrderPlan { PID = str }); + + if (op.PLAN_STATE != EnumGeter.PLANSTATE.INIT.GetHashCode().ToString()) + { + validorderPlanList.Add(op); + } + + putOutPlanList.Add(op); + + } + + if (validorderPlanList.Count > 0) + { + result.IsSuccess = false; + result.Msg = "只有初始状态下的订单能够进行发布!"; + + return result; + } + + DataTable totalDt = GetWorkOrderTable(); + foreach (var op in putOutPlanList) + { + op.PLAN_STATE = EnumGeter.PLANSTATE.COMMIT.GetHashCode().ToString(); + op.UPDATEUSER = this.LoginUser.UserID; + totalDt = this.TJPutOutOrderPlan(op, totalDt); + } + + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + IDbConnection dbConn = DbManager.MainConnectionInfo.Connection; + if (dbConn.State == ConnectionState.Closed) + { + dbConn.Open(); + } + IDbTransaction ids = dbConn.BeginTransaction(); + + orderPlandal.BaseSession = session; + foreach (var op in putOutPlanList) + { + orderPlandal.Update(op); + } + + session.DbHelper.BulkCopyData(totalDt, "T_PP_WORKORDER", dbConn, ids); + ids.Commit(); + } + + result.IsSuccess = true; + return result; + } + catch (Exception ex) + { + throw ex; + } + } + + /// + /// 发布信息 + /// + /// 信息 + /// 发布个数 + public DataTable TJPutOutOrderPlan(OrderPlan info, DataTable workOrderDt) + { + WorkCellDAL workCelldal = new WorkCellDAL(); + + var dicPRI = new DictManageBLL(Dict.DictKind.ORDERPRI); + + //if (list.Count <= 0) + //{ + // return null; + //} + + if ((info.MATERIAL_CODE.Substring(0,4) == "018D"&& info.MATERIAL_CODE.Length > 10)|| (info.MATERIAL_CODE.Substring(0, 3) == "770" && info.MATERIAL_CODE.Length > 7)|| info.MATERIAL_CODE.Length>=14) + { + string pbomcode = info.MATERIAL_CODE; + List list = workCelldal.GetFirstWorkCell(pbomcode); + //左前、右前、左后、右后 + for (int i = 0; i < info.QTY; i++) + { + DataRow workOrder = workOrderDt.NewRow(); + + workOrder["PID"] = Guid.NewGuid().ToString(); + workOrder["ORDERPLANID"] = info.PID; + workOrder["ORDERPLAN_NO"] = (info.PLAN_NO.ToString() + (i + 1).ToString().PadLeft(4, '0')); + workOrder["ORDER_TYPE"] = info.PLANSOURCE; + workOrder["SEQ"] = (i + 1).ToString().PadLeft(6, '0'); + if (info.PLANSOURCE == EnumGeter.WORKORDERTYPE.INSERT.GetHashCode().ToString()) + { + workOrder["SEQ"] = info.PLAN_SEQ + (i + 1).ToString().PadLeft(3, '0'); + } + workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE; + workOrder["PBOM_CODE"] = info.MATERIAL_CODE; + workOrder["QTY"] = 1; + workOrder["COMPLETE_QTY"] = 0; + workOrder["PLAN_DATE"] = info.PLAN_DATE; + workOrder["SHIFT_CODE"] = info.SHIFT_CODE; + workOrder["WORKCENTER_CODE"] = info.WORKCENTER_CODE; + workOrder["WORKCELL_CODE"] = "PREPARE1"; + workOrder["WORKLOC_CODE"] = ""; + workOrder["REMARK"] = ""; + workOrder["EQPT_NAME"] = ""; + workOrder["EQPT_CODE"] = ""; + workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString(); + workOrder["PRI"] = dicPRI.GetDictValue(info.PLANSOURCE); + + workOrderDt.Rows.Add(workOrder); + } + + } + else + { + //左侧、右侧 或 四个门一起打印 + var list2 = "".Split(','); + var dal = new TJDoorPlankPlanDAL(); + var MachineList = dal.GetListMachine(info.MATERIAL_CODE); + if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "L") + { + list2 = "FL,RL".Split(','); + } + else if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "R") + { + list2 = "FR,RR".Split(','); + } + else if ((info.MATERIAL_CODE.Length == 6 && info.MATERIAL_CODE.Substring(0,3) == "770")|| (info.MATERIAL_CODE.Length == 8 && info.MATERIAL_CODE.Substring(0, 4) == "018D")) + { + list2 = "FL,RL,FR,RR".Split(','); + } + + for (int i = 0; i < info.QTY; i++) + { + foreach (var seq in list2) + { + DataRow workOrder = workOrderDt.NewRow(); + + workOrder["PID"] = Guid.NewGuid().ToString(); + workOrder["ORDERPLANID"] = info.PID; + workOrder["ORDERPLAN_NO"] = (info.PLAN_NO.ToString() + (i + 1).ToString().PadLeft(4, '0')); + workOrder["ORDER_TYPE"] = info.PLANSOURCE; + workOrder["SEQ"] = (i + 1).ToString().PadLeft(6, '0'); + if (info.PLANSOURCE == EnumGeter.WORKORDERTYPE.INSERT.GetHashCode().ToString()) + { + workOrder["SEQ"] = info.PLAN_SEQ + (i + 1).ToString().PadLeft(3, '0'); + } + //var BOMCODE = ""; + + //if (info.MATERIAL_CODE.Substring(0, 4) == "018D") + //{ + // if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "L" || info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "R") + // { + // workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE.Substring(0, info.MATERIAL_CODE.Length - 1) + seq; + // BOMCODE = info.MATERIAL_CODE.Substring(0, info.MATERIAL_CODE.Length - 1) + seq; + // } + // else + // { + // workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE + "-" + seq; + // BOMCODE = info.MATERIAL_CODE + "-" + seq; + // } + //} + //else if (info.MATERIAL_CODE.Substring(0, 3) == "770") + //{ + // if (info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "L" || info.MATERIAL_CODE.Substring(info.MATERIAL_CODE.Length - 1, 1) == "R") + // { + // workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE.Substring(0, info.MATERIAL_CODE.Length - 1) + seq; + // BOMCODE = info.MATERIAL_CODE.Substring(0, info.MATERIAL_CODE.Length - 1) + seq; + // } + // else + // { + // workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE + seq; + // BOMCODE = info.MATERIAL_CODE + seq; + // } + //} + //else + //{ + // workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE; + // BOMCODE = info.MATERIAL_CODE; + //} + + var WEIZHI = ""; + switch (seq) + { + case "LF": + WEIZHI = "左前"; + break; + case "FL": + WEIZHI = "左前"; + break; + case "LR": + WEIZHI = "左后"; + break; + case "RL": + WEIZHI = "左后"; + break; + case "RF": + WEIZHI = "右前"; + break; + case "FR": + WEIZHI = "右前"; + break; + case "RR": + WEIZHI = "右后"; + break; + } + + var Machine = MachineList.Where(p => p.MATERIALNAME.Contains(WEIZHI)).ToList(); + if (Machine != null && Machine.Count > 0) + { + workOrder["MATERIAL_CODE"] = Machine[0].MATERIALNO; + workOrder["PBOM_CODE"] = Machine[0].MATERIALNO; + } + else + { + workOrder["PBOM_CODE"] = ""; + workOrder["MATERIAL_CODE"] = ""; + } + + + + + workOrder["QTY"] = 1; + workOrder["COMPLETE_QTY"] = 0; + workOrder["PLAN_DATE"] = info.PLAN_DATE; + workOrder["SHIFT_CODE"] = info.SHIFT_CODE; + workOrder["WORKCENTER_CODE"] = info.WORKCENTER_CODE; + workOrder["WORKCELL_CODE"] = "PREPARE1"; + workOrder["WORKLOC_CODE"] = ""; + workOrder["REMARK"] = ""; + workOrder["EQPT_NAME"] = ""; + workOrder["EQPT_CODE"] = ""; + workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString(); + workOrder["PRI"] = dicPRI.GetDictValue(info.PLANSOURCE); + + workOrderDt.Rows.Add(workOrder); + } + + } + } + + //注入派工单信息 + + + return workOrderDt; + } + + public List TJPutOutOrderPlan(OrderPlan info, int number, int lastIndex) + { + List wolist = new List(); + WorkCellDAL workCelldal = new WorkCellDAL(); + string pbomcode = info.PBOM_CODE; + List list = workCelldal.GetFirstWorkCell(pbomcode); + var dicPRI = new DictManageBLL(Dict.DictKind.ORDERPRI); + + //注入派工单信息 + for (int i = 0; i < number; i++) + { + foreach (var seq in list) + { + WorkOrder wo = new WorkOrder(); + wo.PID = Guid.NewGuid().ToString(); + wo.ORDERPLANID = info.PID; + wo.ORDERPLAN_NO = (info.PLAN_NO.ToString() + (i + 1 + lastIndex).ToString().PadLeft(4, '0')); + wo.ORDER_TYPE = info.PLANSOURCE; + wo.SEQ = (i + 1 + lastIndex).ToString().PadLeft(6, '0'); + wo.MATERIAL_CODE = info.MATERIAL_CODE; + wo.PBOM_CODE = info.PBOM_CODE; + wo.QTY = 1; + wo.COMPLETE_QTY = 0; + wo.PLAN_DATE = info.PLAN_DATE; + wo.SHIFT_CODE = info.SHIFT_CODE; + wo.WORKCENTER_CODE = info.WORKCENTER_CODE; + wo.WORKCELL_CODE = seq.WORKCELL_CODE; + wo.WORKLOC_CODE = ""; + wo.REMARK = ""; + wo.EQPT_NAME = ""; + wo.EQPT_CODE = ""; + wo.STATE = Convert.ToInt32(EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString()); + wo.PRI = Convert.ToInt32(dicPRI.GetDictValue(info.PLANSOURCE)); + wo.PRINTED = "0"; + wolist.Add(wo); + } + + } + + return wolist; + } + #endregion + #region 导出数据 /// /// 获取导出的数据 diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs index c56cbb5..4702024 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/StorageBLL.cs @@ -192,7 +192,7 @@ namespace QMAPP.FJC.BLL.TianJin if (!string.IsNullOrEmpty(model.PID)) { - info = new StorageDAL().GetPID(model.ProductCode); + info = new StorageDAL().GetPID(model.PID); } //条码涉及到返迁入库，条码会有重复的可能 @@ -209,6 +209,8 @@ namespace QMAPP.FJC.BLL.TianJin { info.UPDATEDATE = DateTime.Now.ToString(); info.UPDATEUSER = this.LoginUser.UserName; + info.State = model.State; + temp = new StorageDAL().Update(info); var storageLog2 = new StorageLog(); @@ -217,7 +219,7 @@ namespace QMAPP.FJC.BLL.TianJin storageLog2.CREATEDATE = DateTime.Now.ToString(); storageLog2.UPDATEUSER = info.CREATEUSER; storageLog2.UPDATEDATE = info.CREATEDATE; - storageLog2.State = "2"; + storageLog2.State = model.State; storageLog2.ProductCode = info.ProductCode; storageLog2.MATERIALCODE = info.MATERIALCODE; storageLog2.MATERIALNAME = info.MATERIALNAME; diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs index d5279d3..e1ed9c3 100644 --- a/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs +++ b/APPQ5/QMAPP.FJC.Web/Controllers/TJDoorPlankPlanPrintController.cs @@ -309,7 +309,7 @@ namespace QMAPP.FJC.Web.Controllers string selectKey = Request.Form["selectKey"]; ServiceAgent wcfAgent = this.GetServiceAgent(); DataResult result = new DataResult(); - result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_PutOut", selectKey); + result = wcfAgent.InvokeServiceFunction>("DoorPlankPlanBLL_TJPutOut", selectKey); if (result.IsSuccess == false) { SetMessage(result.Msg); diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 2d1f1b4..ca6f96e 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -7,6 +7,9 @@ + + @@ -203,15 +206,10 @@ - - - - + + - diff --git a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs index f346320..65cf662 100644 --- a/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs +++ b/APPQ5/QMAPP.WinForm/Forms/TianJin/TJPrintPlanLabel.cs @@ -156,7 +156,7 @@ namespace QMAPP.WinForm.Forms.TianJin var setting = new { ListRowcount = int.Parse(cbListRowcount.Text), - //RefreshRate = int.Parse(cbRefreshRate.Text.Trim('s')), + RefreshRate = int.Parse("20"), //PlanFilter = cbPlanFilter.SelectedIndex }; string settingstring = Newtonsoft.Json.JsonConvert.SerializeObject(setting); diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 4064681..e6ef3b3 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -64,8 +64,12 @@ - + + + +