1.生产开报工、报表增加销售订单号查询字段及列表字段

yl

2023-11-02 3e9b79b84905b1cf7a282d1bf03e6de3e85b91bb

 VueWebApi/Controllers/AppProductionManagementController.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,13 +8,14 @@
using System.Web;
using System.Web.Http;
using VueWebApi.DLL.BLL;
using VueWebApi.Models;
using VueWebApi.Tools;

namespace VueWebApi.Controllers
{
    [RoutePrefix(prefix: "api/AppProductionManagement")]
    [ControllerGroup("App生产管理", "在线接口")]
    //[ChannelActionFilterAttributeApp]
    [ChannelActionFilterAttributeApp]
    public class AppProductionManagementController : ApiController
    {
        //定义全局信息返回变量
@@ -25,15 +27,16 @@
        /// <summary>
        /// 生产开报工：开工(开始/报工)/外协(发料/收料)时条件判断及数据返回接口
        /// </summary>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="OperType">操作类型：自制(ZZ)/外协(WX)</param>
        /// <param name="SelectType">操作类型：外协发料标识(OUT)/外协收料标识(IN)</param>
        /// <param name="orderstepqrcode">扫描二维码信息</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepStart")]
        [HttpGet]
        public HttpResponseMessage MesOrderStepStart(string OperType, string orderstepqrcode, string SelectType = null)
        public HttpResponseMessage MesOrderStepStart(string stu_torgcode, string OperType, string orderstepqrcode, string SelectType = null)
        {
            mes = ProductionManagementBLL.MesOrderStepStart(OperType, SelectType, orderstepqrcode);
            mes = ProductionManagementBLL.MesOrderStepStart(OperType, stu_torgcode, SelectType, orderstepqrcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -57,12 +60,15 @@
        /// <summary>
        /// 生产开报工：报工时获取生产班组下拉框
        /// </summary>
        /// <param name="stu_torgcode">组织编码</param>
        /// <param name="stu_torgtypecode">组织类型</param>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "MesOrderStepReportSelectUserGroup")]
        [HttpGet]
        public HttpResponseMessage MesOrderStepReportSelectUserGroup()
        public HttpResponseMessage MesOrderStepReportSelectUserGroup(string stu_torgcode,string stu_torgtypecode, string wkshopcode)
        {
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup();
            mes = ProductionManagementBLL.MesOrderStepReportSelectUserGroup(stu_torgcode, stu_torgtypecode,wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -71,13 +77,14 @@
        /// <summary>
        /// 生产开报工：根据生产班组查找人员列表
        /// </summary>
        /// <param name="stu_torgcode">组织编码</param>
        /// <param name="usergroupcode">班组编码</param>
        /// <returns></returns>
        [Route(template: "MesOrderGroupSelectUser")]
        [HttpGet]
        public HttpResponseMessage MesOrderGroupSelectUser(string usergroupcode)
        public HttpResponseMessage MesOrderGroupSelectUser(string stu_torgcode, string usergroupcode)
        {
            mes = ProductionManagementBLL.MesOrderGroupSelectUser(usergroupcode);
            mes = ProductionManagementBLL.MesOrderGroupSelectUser(stu_torgcode,usergroupcode);
            return TJson.toJson(mes);
        }
        #endregion
@@ -172,11 +179,11 @@
            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//任务数量
            string startqty = HttpContext.Current.Request["startqty"].ToString();//开工数量
            string reportqty = HttpContext.Current.Request["reportqty"].ToString();//报工工数量
            string ngqty = HttpContext.Current.Request["ngqty"].ToString();//不良数量
            string badcode = HttpContext.Current.Request["badcode"].ToString();//不良原因编码
            string defectlist = HttpContext.Current.Request["defectlist"].ToString();//不良汇总
            string remarks = HttpContext.Current.Request["remarks"].ToString();//备注
            string username = HttpContext.Current.Request["admin"].ToString();//操作人员
            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
            List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
            mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, inbarcode, reckway,usergroupcode, reportuser, taskqty, startqty, reportqty, defectobjs, remarks, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -224,11 +231,11 @@
            string inuser = HttpContext.Current.Request["inuser"].ToString();//收料人员
            string taskqty = HttpContext.Current.Request["taskqty"].ToString();//任务数量
            string sqty = HttpContext.Current.Request["sqty"].ToString();//收料数量
            string ngqty = HttpContext.Current.Request["ngqty"].ToString();//不良数量
            string badcode = HttpContext.Current.Request["badcode"].ToString();//不良原因编码
            string defectlist = HttpContext.Current.Request["defectlist"].ToString();//不良汇总
            string remarks = HttpContext.Current.Request["remarks"].ToString();//备注
            string username = HttpContext.Current.Request["admin"].ToString();//操作人员
            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
            List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
            mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, defectobjs, remarks, username);
            return TJson.toJson(mes);
        }
        #endregion