1.ERP订单查看子件信息接口 2.订单下达、批量下达、订单列表、工单列表、报工列表等增加字段(总量、总料) 3.增加订单导出功能、修改工单导出接口

yl

2024-11-21 807f6688a99d9958fedf3e9be2bba8c9afd78969

 VueWebCoreApi/Controllers/WorkOrderController.cs

@@ -72,6 +72,29 @@
        }
        #endregion

        #region[ERP订单子件信息查询]
        /// <summary>
        /// ERP订单子件信息查询
        /// </summary>
        /// <param name="MoDID">生产订单明细ID</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
        /// <param name="order">排序规则</param>
        /// <returns></returns>
        [Route(template: "ErpOrderSubItemSearch")]
        [HttpGet]
        public JsonResult ErpOrderSubItemSearch(string MoDID = null, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = WorkOrderBLL.ErpOrderSubItemSearch(MoDID,startNum, endNum, prop, order);
            return Json(mes);
        }
        #endregion

        #region[ERP订单下达]
        /// <summary>
        /// ERP订单下达
@@ -101,7 +124,9 @@
            string customercode = obj["customercode"].ToString(); //客户编码
            string customername = obj["customername"].ToString(); //客户名称
            string colour = obj["colour"].ToString(); //颜色
            mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, injectnumber,customercode,customername,colour, us);
            string weight = obj["weight"].ToString(); //重量
            string totalnumber = obj["totalnumber"].ToString(); //总料
            mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, injectnumber,customercode,customername,colour,weight,totalnumber,us);
            return Json(mes);
        }
        #endregion
@@ -153,6 +178,47 @@
            return Json(mes);
        }
        #endregion

        #region[ERP订单导出]
        /// <summary>
        /// ERP订单导出
        /// </summary>
        /// <param name="erporderstus">订单状态码</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="erpordercode">订单编号</param>
        /// <param name="saleordercode">销售单号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">产品规格</param>
        /// <param name="paystartdate">预计开工时间</param>
        /// <param name="payenddate">预计完工时间</param>
        /// <param name="creatuser">创建人员</param>
        /// <returns></returns>
        [Route(template: "ErpOrderExcelSearch")]
        [HttpGet]
        public JsonResult ErpOrderExcelSearch(string erporderstus = null, string wkshopcode = null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            string paydatestartdate = "";  //预计开工开始时间
            string paydateenddate = "";    //预计开工结束时间
            string paydatestartdate1 = "";  //预计完工开始时间
            string paydateenddate2 = "";    //预计完工结束时间
            if (paystartdate != "" && paystartdate != null)
            {
                paydatestartdate = paystartdate.Split('~')[0].ToString();
                paydateenddate = paystartdate.Split('~')[1].ToString();
            }
            if (payenddate != "" && payenddate != null)
            {
                paydatestartdate1 = payenddate.Split('~')[0].ToString();
                paydateenddate2 = payenddate.Split('~')[1].ToString();
            }
            mes = WorkOrderBLL.ErpOrderExcelSearch(erporderstus, wkshopcode, erpordercode, saleordercode, partcode, partname, partspec, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser);
            return Json(mes);
        }
        #endregion



        #region[MES工单查询]
@@ -305,6 +371,33 @@
        }
        #endregion

        #region[MES工单导出]
        /// <summary>
        /// MES工单导出
        /// </summary>
        /// <param name="mesorderstus">工单状态码</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <param name="mesordercode">工单编号</param>
        /// <param name="sourceorder">源单单号</param>
        /// <param name="saleordercode">销售单号</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>
        /// <returns></returns>
        [Route(template: "MesOrderExcelSearch")]
        [HttpGet]
        public JsonResult MesOrderExcelSearch(string mesorderstus = null, string wkshopcode = null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
        {
            var token = HttpContext.Request.Headers["Token"].ToString();
            User us = JwtTools.Denocode(token.ToString());
            mes = WorkOrderBLL.MesOrderExcelSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, creatuser, createdate);
            return Json(mes);
        }
        #endregion


        #region[MES工单派发提交]
        /// <summary>