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

yl

2023-09-19 770c681572301c938d7b9adcc60d9aad9d1dd604

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -17,7 +17,7 @@
{
    [RoutePrefix(prefix: "api/ProductionManagement")]
    [ControllerGroup("生产管理", "在线接口")]
    //[ChannelActionFilter]
    [ChannelActionFilter]
    public class ProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -188,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工单新增、编辑提交
@@ -209,10 +223,9 @@
            string planstartdate = obj["planstartdate"].ToString(); //计划开始时间
            string planenddate = obj["planenddate"].ToString();     //计划完成时间
            string orderlev = obj["orderlev"].ToString(); //工单等级
            string is_aps = obj["is_aps"].ToString(); //是否排产
            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);
            return TJson.toJson(mes);
        }
        #endregion
@@ -491,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(); //任务数量
@@ -500,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
@@ -543,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(); //任务数量
@@ -551,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
@@ -895,5 +910,96 @@
            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
    }
}