yl
2024-10-11 8aaabf94d4472e5aa85de2617b60ec40885bd1fe
VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -97,7 +97,11 @@
            string relse_qty = obj["relse_qty"].ToString(); //已下单数量
            string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //交付时间
            string clerkuser = obj["clerkuser"].ToString(); //销售订单业务员
            mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, us);
            string injectnumber = obj["injectnumber"].ToString(); //注塑机号
            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);
            return Json(mes);
        }
        #endregion
@@ -301,6 +305,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>