1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if

yl

2023-03-04 85feb93b944f52051b5908452938cef4fe909fe8

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -188,6 +188,23 @@
        }
        #endregion

        #region[工单派发选择工艺路线或选择生产车间时判断绑定条件]
        /// <summary>
        /// 工单派发选择工艺路线或选择生产车间时判断绑定条件
        /// </summary>
        /// <param name="partcode">产品编码</param>
        /// <param name="routecode">工艺路线编码</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "SelectRouteOrWkshop")]
        [HttpGet]
        public HttpResponseMessage SelectRouteOrWkshop(string partcode, string routecode, string wkshopcode)
        {
            mes = ProductionManagementBLL.SelectRouteOrWkshop(partcode, routecode, wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单新增、编辑提交]
        /// <summary>
        /// MES工单新增、编辑提交
@@ -821,5 +838,78 @@
            return TJson.toJson(mes);
        }
        #endregion


        #region[自动排程工单查询]
        /// <summary>
        /// 自动排程工单查询
        /// </summary>
        /// <param name="page">页码</param>
        /// <param name="rows">每页条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <param name="workshop">车间编码</param>
        /// <param name="wocode">生产工单号</param>
        /// <param name="partcode">物料编码</param>
        /// <param name="partname">物料名称</param>
        /// <returns></returns>
        [Route(template: "AdvancedSchedulingSearch")]
        [HttpGet]
        public HttpResponseMessage AdvancedSchedulingSearch(int page, int rows, string prop, string order, string workshop = null, string wocode = null, string partcode = null,string partname=null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.AdvancedSchedulingSearch(workshop, wocode, partcode, partname, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[高级排程点击工单任务带出瓶颈工序设备、已排程任务数据]
        /// <summary>
        /// 高级排程点击工单任务带出瓶颈工序设备、已排程任务数据
        /// </summary>
        /// <param name="wocode">工单编号</param>
        /// <param name="wkshpcode">车间编码</param>
        /// <param name="partcode">物料编码</param>
        /// <param name="botproccode">瓶颈工序编码(首道工序)</param>
        /// <param name="startdate">开始日期</param>
        /// <param name="enddate">结束日期</param>
        /// <returns></returns>
        [Route(template: "OnclickAdvancedSchedulingDevice")]
        [HttpGet]
        public HttpResponseMessage OnclickAdvancedSchedulingDevice(string wocode,string wkshpcode,string partcode,string botproccode,string startdate,string enddate)
        {
            List<AdvancedSchedulingDevice> list = new List<AdvancedSchedulingDevice>();
            List<AdvancedSchedAlready> list1 = new List<AdvancedSchedAlready>();
            list = ProductionManagementBLL.OnclickAdvancedSchedulingDevice(wocode, wkshpcode, partcode, startdate, enddate, ref mes); //排产设备信息
            DataTable dt = ProductionManagementBLL.AlreadyScheduling(wocode, wkshpcode, partcode, botproccode, startdate, enddate);   //设备已排程信息

            Dictionary<object, object> dList = new Dictionary<object, object>();
            dList.Add("rus", mes);
            dList.Add("rows", list);
            dList.Add("Cont", dt);
            return TJson.toJson(dList);
        }
        #endregion

        #region[排程数据提交]
        /// <summary>
        /// 排程数据提交
        /// </summary>
        /// <returns></returns>
        [Route(template: "SubmitAlreadyScheduling")]
        [HttpPost]
        public HttpResponseMessage SubmitAlreadyScheduling()
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            string wocode = HttpContext.Current.Request["wocode"].ToString();//工单编号
            string botprocecode = HttpContext.Current.Request["botprocecode"].ToString(); //瓶颈工序编码
            string json = HttpContext.Current.Request["json"].ToString(); //排程提交数据
            JavaScriptSerializer Serializer = new JavaScriptSerializer();
            List<AlreadyScheduling> objs = Serializer.Deserialize<List<AlreadyScheduling>>(json);
            mes = ProductionManagementBLL.SubmitAlreadyScheduling(username, wocode, botprocecode, objs);
            return TJson.toJson(mes);
        }
        #endregion
    }
}