1.新增基本资料功能接口(erp车间/部门、erp仓库、erp用户信息) 2.报工接口添加字段入库条码 3.增加末道工序报工后提交入库接口(对接erp...

yl

2023-09-19 770c681572301c938d7b9adcc60d9aad9d1dd604

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -2,11 +2,13 @@
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Web;
using System.Web.Http;
using System.Web.Script.Serialization;
using VueWebApi.DLL.BLL;
using VueWebApi.Models;
using VueWebApi.Tools;
@@ -15,7 +17,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -186,6 +188,20 @@
        }
        #endregion

        #region[MES工单新增、获取工单号]
        /// <summary>
        /// MES工单新增、获取工单号
        /// </summary>
        /// <returns></returns>
        [Route(template: "AddMesOrderCodeSearch")]
        [HttpPost]
        public HttpResponseMessage AddMesOrderCodeSearch()
        {
            mes = ProductionManagementBLL.AddMesOrderCodeSearch();
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单新增、编辑提交]
        /// <summary>
        /// MES工单新增、编辑提交
@@ -218,15 +234,16 @@
        /// <summary>
        /// MES工单删除
        /// </summary>
        /// <param name="souceid">源单工单</param>
        /// <param name="wocode">工单编号</param>
        /// <param name="m_po">订单编号</param>
        /// <param name="orderqty">工单数量</param>
        /// <returns></returns>
        [Route(template: "DeleteMesOrder")]
        [HttpPost]
        public HttpResponseMessage DeleteMesOrder(string wocode, string m_po, string orderqty)
        public HttpResponseMessage DeleteMesOrder(string souceid, string wocode, string m_po, string orderqty)
        {
            mes = ProductionManagementBLL.DeleteMesOrder(wocode, m_po, orderqty);
            mes = ProductionManagementBLL.DeleteMesOrder(souceid, wocode, m_po, orderqty);
            return TJson.toJson(mes);
        }
        #endregion
@@ -242,7 +259,8 @@
        [HttpPost]
        public HttpResponseMessage ClosedMesOrder(string wocode, string m_po)
        {
            mes = ProductionManagementBLL.ClosedMesOrder(wocode, m_po);
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.ClosedMesOrder(username,wocode, m_po);
            return TJson.toJson(mes);
        }
        #endregion
@@ -486,6 +504,7 @@
            string stepseq = obj["stepseq"].ToString(); //工序序号
            string stepcode = obj["stepcode"].ToString(); //工序编码
            string eqpcode = obj["eqpcode"].ToString(); //设备编码
            string inbarcode = obj["inbarcode"].ToString(); //入库条码
            string usergroupcode = obj["usergroupcode"].ToString(); //班组编码
            string reportuser = obj["reportuser"].ToString();  //报工人员
            string taskqty = obj["taskqty"].ToString(); //任务数量
@@ -495,7 +514,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, inbarcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -538,6 +557,7 @@
            string partcode = obj["partcode"].ToString(); //产品编码
            string stepseq = obj["stepseq"].ToString(); //工序序号
            string stepcode = obj["stepcode"].ToString(); //工序编码
            string inbarcode = obj["inbarcode"].ToString(); //入库条码
            string wxcode = obj["wxcode"].ToString(); //外协供应商编码
            string inuser = obj["inuser"].ToString();  //收料人员
            string taskqty = obj["taskqty"].ToString(); //任务数量
@@ -546,7 +566,7 @@
            string badcode = obj["badcode"].ToString(); //不良原因编码
            string remarks = obj["remarks"].ToString(); //备注
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -638,5 +658,348 @@
        }
        #endregion


        #region[MES工单批量关闭查询]
        /// <summary>
        /// MES工单查询
        /// </summary>
        /// <param name="mesorderstus">工单状态码</param>
        /// <param name="mesordercode">工单编号</param>
        /// <param name="sourceorder">源单单号</param>
        /// <param name="ordertype">单据类型</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">产品规格</param>
        /// <param name="creatuser">创建人员</param>
        /// <param name="createdate">创建时间</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "MesOrderBitchClosedSearch")]
        [HttpGet]
        public HttpResponseMessage MesOrderBitchClosedSearch(string mesorderstus = null, string mesordercode = null, string sourceorder = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderBitchClosedSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单批量关闭提交]
        /// <summary>
        /// MES工单批量关闭提交
        /// </summary>
        /// <param name="dt">工单号数组对象</param>
        /// <returns></returns>
        [Route(template: "MesOrderBitchClosedSeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderBitchClosedSeave(DataTable dt)
        {
            
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderBitchClosedSeave(username, dt);
            return TJson.toJson(mes);
        }
        #endregion

        #region[MES工单批量反关闭]
        /// <summary>
        /// MES工单批量反关闭
        /// </summary>
        /// <param name="dt">工单号数组对象</param>
        /// <returns></returns>
        [Route(template: "MesOrderBitchAntiClosedSeave")]
        [HttpPost]
        public HttpResponseMessage MesOrderBitchAntiClosedSeave(DataTable dt)
        {

            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MesOrderBitchAntiClosedSeave(username, dt);
            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="devicetype">生产单元</param>
        /// <param name="stustype">有效状态</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanningSearch")]
        [HttpGet]
        public HttpResponseMessage CapacityPlanningSearch(int page, int rows, string prop, string order,string workshop = null, string devicetype = null, string stustype = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.CapacityPlanningSearch(workshop, devicetype, stustype, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划默认方案保存提交]
        /// <summary>
        /// 产能规划默认方案保存提交
        /// </summary>
        /// <param name="captplanid">产能规划(生产资源)id</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="capunitcode">生产单元编码</param>
        /// <param name="capsetupcode">默认方案编码</param>
        /// <param name="captplantype">资源类型</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanSubmit")]
        [HttpPost]
        public HttpResponseMessage CapacityPlanSubmit(string wkshopcode, string capunitcode,string captplanid=null,string capsetupcode=null,string captplantype=null)
        {
            string type = ""; //提交类型
            if (captplanid == "" || captplanid == null)
            {
                type = "Add";
            }
            else
            {
                type = "Update";
            }
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.CapacityPlanSubmit(type,captplanid,wkshopcode,capunitcode,capsetupcode, captplantype,username);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划点击日历组件查找已关联的日期方案]
        /// <summary>
        /// 产能规划点击日历组件查找已关联的日期方案
        /// </summary>
        /// <param name="captplanid">产能规划(生产资源)id</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanningCalendar")]
        [HttpGet]
        public HttpResponseMessage CapacityPlanningCalendar(string captplanid)
        {
            mes = ProductionManagementBLL.CapacityPlanningCalendar(captplanid);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划日历双击时带出对应的方案]
        /// <summary>
        /// 产能规划日历双击时带出对应的方案
        /// </summary>
        /// <param name="captplanid">产能规划(生产资源)id</param>
        /// <param name="datetime">双击选中的日期</param>
        /// <returns></returns>
        [Route(template: "CapacityPlanningOnclickSelect")]
        [HttpGet]
        public HttpResponseMessage CapacityPlanningOnclickSelect(string captplanid,string datetime)
        {
            mes = ProductionManagementBLL.CapacityPlanningOnclickSelect(captplanid, datetime);
            return TJson.toJson(mes);
        }
        #endregion

        #region[产能规划工作日历选择提交]
        /// <summary>
        /// 产能规划工作日历选择提交
        /// </summary>
        /// <returns></returns>
        [Route(template: "CapacityPlanningGivePlanSubmit")]
        [HttpPost]
        public HttpResponseMessage CapacityPlanningGivePlanSubmit()
        {
            string wkshopcode = HttpContext.Current.Request["wkshopcode"].ToString();//车间编码
            string capunitcode = HttpContext.Current.Request["capunitcode"].ToString();//生产单元编码
            string captplanid = HttpContext.Current.Request["captplanid"].ToString(); //产能规划(生产资源)列表id
            string capsetupcode = HttpContext.Current.Request["capsetupcode"].ToString(); //默认方案编码
            string captplantype = HttpContext.Current.Request["captplantype"].ToString(); //资源类型
            string worklist = HttpContext.Current.Request["worklist"].ToString();  //工作日历数据集
            JavaScriptSerializer Serializer = new JavaScriptSerializer();
            List<CapaPlan> objs = Serializer.Deserialize<List<CapaPlan>>(worklist);
            string type = ""; //提交类型
            if (captplanid == "" || captplanid == null)
            {
                type = "Add";
            }
            else
            {
                type = "Update";
            }
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.CapacityPlanningGivePlanSubmit(captplanid, wkshopcode, capunitcode, capsetupcode, captplantype, objs,type, username);
            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


        #region[生产入库条码补打]
        /// <summary>
        /// 生产入库条码补打
        /// </summary>
        /// <param name="ordercode">工单编号</param>
        /// <returns></returns>
        [Route(template: "ProductInHouseLabCode")]
        [HttpGet]
        public HttpResponseMessage ProductInHouseLabCode(string ordercode)
        {
            mes = ProductionManagementBLL.ProductInHouseLabCode(ordercode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产入库通过车间查找生产订单]
        /// <summary>
        /// 生产入库通过车间查找生产订单
        /// </summary>
        /// <param name="ordertype">单据类型</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "ProductInHouseWkshopOrder")]
        [HttpGet]
        public HttpResponseMessage ProductInHouseWkshopOrder(string ordertype, string wkshopcode)
        {
            mes = ProductionManagementBLL.ProductInHouseWkshopOrder(ordertype, wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产入库信息查询]
        /// <summary>
        /// 生产入库信息查询
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="erpordercode">订单编号</param>
        /// <param name="mesordercode">工单编号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">规格型号</param>
        /// <param name="orderdate">工单日期</param>
        /// <returns></returns>
        [Route(template: "ProductInHouseOrderSearch")]
        [HttpGet]
        public HttpResponseMessage ProductInHouseOrderSearch(string wkshopcode, string erpordercode = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string orderdate = null)
        {
            string startorderdate = "";  //工单开始时间
            string endorderdate = "";    //工单结束时间
            if (orderdate != "" && orderdate != null)
            {
                startorderdate = orderdate.Split('~')[0].ToString();
                endorderdate = orderdate.Split('~')[1].ToString();
            }
            mes = ProductionManagementBLL.ProductInHouseOrderSearch(wkshopcode, erpordercode, mesordercode, partcode, partname, partspec, startorderdate, endorderdate);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产入库获取单据号]
        /// <summary>
        /// 生产入库获取单据号
        /// </summary>
        /// <param name="rightcode">功能编码</param>
        /// <returns></returns>
        [Route(template: "ProductInHouseOrderCodeSearch")]
        [HttpPost]
        public HttpResponseMessage ProductInHouseOrderCodeSearch(string rightcode)
        {
            mes = ProductionManagementBLL.ProductInHouseOrderCodeSearch(rightcode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[生产入库提交]
        /// <summary>
        /// 生产入库提交
        /// </summary>
        /// <param name="obj">明细数据</param>
        /// <returns></returns>
        [Route(template: "ProductInHouseOrderSeave")]
        [HttpPost]
        public HttpResponseMessage ProductInHouseOrderSeave([FromBody] JObject obj)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.ProductInHouseOrderSeave(username, obj);
            return TJson.toJson(mes);
        }
        #endregion
    }
}