diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config
index dc08633..cd2b3d9 100644
--- a/APP/QMAPP.Web/Web.config
+++ b/APP/QMAPP.Web/Web.config
@@ -61,10 +61,10 @@
-
+
-
+
+
diff --git a/APPMD/QMAPP.MD.Web/Web.config b/APPMD/QMAPP.MD.Web/Web.config
index be7b1b2..91e81e3 100644
--- a/APPMD/QMAPP.MD.Web/Web.config
+++ b/APPMD/QMAPP.MD.Web/Web.config
@@ -34,12 +34,12 @@
+
+
-
+ -->
diff --git a/APPQ5/QMAPP.FJC.BLL/FIS/DashBoardPlanBLL.cs b/APPQ5/QMAPP.FJC.BLL/FIS/DashBoardPlanBLL.cs
index 1287eb2..aa8bb16 100644
--- a/APPQ5/QMAPP.FJC.BLL/FIS/DashBoardPlanBLL.cs
+++ b/APPQ5/QMAPP.FJC.BLL/FIS/DashBoardPlanBLL.cs
@@ -663,6 +663,75 @@ namespace QMAPP.FJC.BLL.FIS
}
}
+ ///
+ /// 发布信息--直接发布到帽檐
+ ///
+ ///
+ /// 发布个数
+ public DataResult PublishEndWorkloc(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.PutOutOrderPlanEndWorkP1(op, totalDt);
+ }
+
+ using (IDataSession session = AppDataFactory.CreateMainSession())
+ {
+ IDbConnection dbConn = DbManager.MainConnectionInfo.Connection;
+ 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;
+ }
+ }
+
///
/// 发布信息--直接发布到最后一个工位
///
@@ -695,7 +764,7 @@ namespace QMAPP.FJC.BLL.FIS
workOrder["COMPLETE_QTY"] = 0;
workOrder["PLAN_DATE"] = info.PLAN_DATE;
workOrder["SHIFT_CODE"] = info.SHIFT_CODE;
- workOrder["WORKCENTER_CODE"] = info.WORKCENTER_CODE;
+ workOrder["WORKCENTER_CODE"] = "BC316_ASSLINE";
workOrder["WORKCELL_CODE"] = seq.WORKCELL_CODE;
workOrder["WORKLOC_CODE"] = "";
workOrder["REMARK"] = "";
@@ -712,6 +781,52 @@ namespace QMAPP.FJC.BLL.FIS
return workOrderDt;
}
+ ///
+ /// 发布信息--直接发布到帽檐工位
+ ///
+ /// 信息
+ /// 发布个数
+ public DataTable PutOutOrderPlanEndWorkP1(OrderPlan info, DataTable workOrderDt)
+ {
+
+ WorkCellDAL workCelldal = new WorkCellDAL();
+ string pbomcode = info.PBOM_CODE;
+ //List list = workCelldal.GetEndWorkCell(pbomcode);
+
+ //var dicPRI = new DictManageBLL(Dict.DictKind.ORDERPRI);
+
+ //注入派工单信息
+ 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');
+ workOrder["MATERIAL_CODE"] = info.MATERIAL_CODE;
+ workOrder["PBOM_CODE"] = info.PBOM_CODE;
+ workOrder["QTY"] = 1;
+ workOrder["COMPLETE_QTY"] = 0;
+ workOrder["PLAN_DATE"] = info.PLAN_DATE;
+ workOrder["SHIFT_CODE"] = info.SHIFT_CODE;
+ workOrder["WORKCENTER_CODE"] = "BC316_ASSLINE";
+ workOrder["WORKCELL_CODE"] = "BRIM_WELDING_BC316";
+ workOrder["WORKLOC_CODE"] = "";
+ workOrder["REMARK"] = "";
+ workOrder["EQPT_NAME"] = "";
+ workOrder["EQPT_CODE"] = "";
+ workOrder["STATE"] = EnumGeter.WORKPLANSTATE.INIT.GetHashCode().ToString();
+ workOrder["PRI"] = "2";
+
+ workOrderDt.Rows.Add(workOrder);
+
+ }
+
+ return workOrderDt;
+ }
+
public List PutOutOrderPlan(OrderPlan info,int number,int lastIndex)
{
List wolist = new List();
diff --git a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml
index 7001eda..05476f1 100644
--- a/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml
+++ b/APPQ5/QMAPP.FJC.Web/Content/Xml/Dictionary.xml
@@ -569,5 +569,6 @@
+
diff --git a/APPQ5/QMAPP.FJC.Web/Controllers/DashBoardPlanController.cs b/APPQ5/QMAPP.FJC.Web/Controllers/DashBoardPlanController.cs
index eec7c25..f3acb7f 100644
--- a/APPQ5/QMAPP.FJC.Web/Controllers/DashBoardPlanController.cs
+++ b/APPQ5/QMAPP.FJC.Web/Controllers/DashBoardPlanController.cs
@@ -266,6 +266,28 @@ namespace QMAPP.FJC.Web.Controllers
SetMessage(AppResource.PutOutMessage);
return List(true);
}
+
+ ///
+ /// 发布
+ ///
+ ///
+ [HttpPost]
+ [HandleException]
+ public ActionResult PublishEndWorkloc(OrderPlan model)
+ {
+ string selectKey = Request.Form["selectKey"];
+ ServiceAgent wcfAgent = this.GetServiceAgent();
+ DataResult result = new DataResult();
+ result = wcfAgent.InvokeServiceFunction>("DashBoardPlanBLL_PublishEndWorkloc", selectKey);
+ if (result.IsSuccess == false)
+ {
+ SetMessage(result.Msg);
+ return List(true);
+ }
+ SetMessage(AppResource.PutOutMessage);
+ return List(true);
+ }
+
#endregion
#region 导出excel
diff --git a/APPQ5/QMAPP.FJC.Web/Views/DashBoardPlan/DashBoardPlanList.aspx b/APPQ5/QMAPP.FJC.Web/Views/DashBoardPlan/DashBoardPlanList.aspx
index 2b81cad..e0f2dc6 100644
--- a/APPQ5/QMAPP.FJC.Web/Views/DashBoardPlan/DashBoardPlanList.aspx
+++ b/APPQ5/QMAPP.FJC.Web/Views/DashBoardPlan/DashBoardPlanList.aspx
@@ -156,6 +156,20 @@
}
}
+ //发布
+ function PublishEndWorkloc() {
+ var ids = getSelectKey();
+ if (ids == "") {
+ MSI("错误", "至少选择一条记录");
+ }
+ else {
+ document.getElementById("selectKey").value = ids;
+ MSQ("提示", "确定要发布选中的记录吗？", function () {
+ submitByButton("PublishEndWorkloc");
+ })
+ }
+ }
+
//修改计划顺序
function EditDashBoardPlanSeq() {
var ids = getSelectKey();
@@ -192,6 +206,7 @@
<%=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)%>
+ <%=Html.QTButton("PublishEndWorkloc", "PutOut", "detail", "PublishEndWorkloc()", QMAPP.Common.Web.SystemLimit.isLimt)%>
diff --git a/APPQ5/QMAPP.FJC.Web/Web.config b/APPQ5/QMAPP.FJC.Web/Web.config
index f94af36..d0e42d0 100644
--- a/APPQ5/QMAPP.FJC.Web/Web.config
+++ b/APPQ5/QMAPP.FJC.Web/Web.config
@@ -31,7 +31,7 @@
-
+
--->
+
+
diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config
index 8349214..25c28b4 100644
--- a/APPQ5/QMAPP.WinForm/App.config
+++ b/APPQ5/QMAPP.WinForm/App.config
@@ -7,8 +7,8 @@
-
+
+
@@ -29,8 +29,8 @@
-
-
+
diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
index a00c2ef..c9ff77c 100644
--- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
+++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config
@@ -63,10 +63,10 @@
-
-
@@ -93,14 +93,18 @@
+
+
+
-
-
+