报工人员、班组合并

yl

2023-02-16 883bc24b2af63f2b5cadf7576e7892720c7ed9b7

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -17,7 +17,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -87,8 +87,9 @@
            string markqty = obj["markqty"].ToString(); //下单数量
            string ordernum = obj["ordernum"].ToString(); //下单单数
            string relse_qty = obj["relse_qty"].ToString(); //已下单数量
            string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //交付时间
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -188,6 +189,21 @@
        }
        #endregion

        #region【生产管理、工单新增、编辑时,选择排程是时获取物料清单版本号】
        /// <summary>
        /// 生产管理、工单新增、编辑时,选择排程是时获取物料清单版本号
        /// </summary>
        /// <param name="partnumber">产品编码</param>
        /// <returns></returns>
        [Route(template: "JobCreationSonAddVison")]
        [HttpGet]
        public HttpResponseMessage JobCreationSonAddVison(string partnumber)
        {
            mes = ProductionManagementBLL.JobCreationSonAddVison(partnumber);
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单新增、编辑提交]
        /// <summary>
        /// MES工单新增、编辑提交
@@ -210,9 +226,10 @@
            string planenddate = obj["planenddate"].ToString();     //计划完成时间
            string orderlev = obj["orderlev"].ToString(); //工单等级
            string is_aps = obj["is_aps"].ToString(); //是否排产
            string bom_id = obj["bom_id"].ToString(); //物料清单id
            string opertype = obj["OperType"].ToString();  //操作类型
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype, is_aps);
            mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype, is_aps, bom_id);
            return TJson.toJson(mes);
        }
        #endregion
@@ -491,6 +508,7 @@
            string stepseq = obj["stepseq"].ToString(); //工序序号
            string stepcode = obj["stepcode"].ToString(); //工序编码
            string eqpcode = obj["eqpcode"].ToString(); //设备编码
            string reckway = obj["reckway"].ToString(); //计件方式(班组:group、个人:person)
            string usergroupcode = obj["usergroupcode"].ToString(); //班组编码
            string reportuser = obj["reportuser"].ToString();  //报工人员
            string taskqty = obj["taskqty"].ToString(); //任务数量
@@ -500,7 +518,7 @@
            string badcode = obj["badcode"].ToString(); //不良原因编码
            string remarks = obj["remarks"].ToString(); //备注
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -708,6 +726,56 @@
        #endregion



        #region[产能规划方案设置查询]
        /// <summary>
        /// 产能规划方案设置查询
        /// </summary>
        /// <returns></returns>
        [Route(template: "CapacityPlanningSetupSearch")]
        [HttpGet]
        public HttpResponseMessage CapacityPlanningSetupSearch()
        {
            mes = ProductionManagementBLL.CapacityPlanningSetupSearch();
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划方案设置新增]
        /// <summary>
        /// 产能规划方案设置新增
        /// </summary>
        /// <param name="obj">提交数据</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanningSetupAddUpdate")]
        [HttpPost]
        public HttpResponseMessage CapacityPlanningSetupAddUpdate([FromBody] JObject obj)
        {
            string capacitylist = obj["capacitylist"].ToString(); //提交数据
            string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            JavaScriptSerializer Serializer = new JavaScriptSerializer();
            List<CapacityPlanningSetup> objs = Serializer.Deserialize<List<CapacityPlanningSetup>>(capacitylist);
            mes = ProductionManagementBLL.CapacityPlanningSetupAddUpdate(username, objs);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划方案设置删除]
        /// <summary>
        /// 产能规划方案设置删除
        /// </summary>
        /// <param name="CapSetupCode">方案编码</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanningSetupDelete")]
        [HttpPost]
        public HttpResponseMessage CapacityPlanningSetupDelete(string capsetupcode)
        {
            string username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.CapacityPlanningSetupDelete(username, capsetupcode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划查询]
        /// <summary>
        /// 产能规划查询
@@ -824,6 +892,8 @@
        #endregion




        #region[自动排程工单查询]
        /// <summary>
        /// 自动排程工单查询