1.移出班组功能，单独关联人员 2.用户清单取消指定班组 3.生产开报工增加扫码后选择设备 4.用户清单导入取消班组 5.erp订单查询、订单下达 ...

yl

2023-08-07 48aa43a04f8d8a0964d9d8a206e329f400fd5b89

1.移出班组功能，单独关联人员
2.用户清单取消指定班组
3.生产开报工增加扫码后选择设备
4.用户清单导入取消班组
5.erp订单查询、订单下达   mes工单查询、报废补单增加销售订单号

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/BasicSettingController.cs

@@ -314,6 +314,10 @@
        /// <summary>
        /// ç”¨æˆ·ç»„列表查询
        /// </summary>
        /// <param name="groupcode">班组编码</param>
        /// <param name="groupname">班组名称</param>
        /// <param name="stu_torgcode">所属组织</param>
        /// <param name="description">所属组织类型</param>
        /// <param name="page">页码</param>
        /// <param name="rows">每页显示条数</param>
        /// <param name="prop">排序字段</param>
@@ -321,29 +325,28 @@
        /// <returns></returns>
        [Route(template: "UserGroupSearch")]
        [HttpGet]
        public HttpResponseMessage UserGroupSearch(int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode=null,string description=null,  int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var description = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = BasicSettingBLL.UserGroupSearch(stu_torgcode, description, startNum, endNum, prop, order);
            mes = BasicSettingBLL.UserGroupSearch(groupcode, groupname, stu_torgcode, description, startNum, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion

        #region[用户组新增]
        #region[用户组新增、修改]
        /// <summary>
        /// ç”¨æˆ·ç»„新增
        /// </summary>
        ///  <param name="type">提交类型(Add/Update)</param>
        /// <param name="json">用户组新增提交数据</param>
        /// <returns></returns>
        [Route(template: "UserGroupAdd")]
        [HttpPost]
        public HttpResponseMessage UserGroupAdd(List<StepDefect> json)
        public HttpResponseMessage UserGroupAdd(string type,List<GroupUser> json)
        {
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
            mes = BasicSettingBLL.UserGroupAdd(json, username);
            mes = BasicSettingBLL.UserGroupAdd(type,json, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -363,6 +366,21 @@
        }
        #endregion

        #region[用户组查看关联人员]
        /// <summary>
        /// ç”¨æˆ·ç»„查看关联人员
        /// </summary>
        /// <param name="groupcode">班组编码</param>
        /// <returns></returns>
        [Route(template: "GroupUserProject")]
        [HttpGet]
        public HttpResponseMessage GroupUserProject(string groupcode)
        {
            mes = BasicSettingBLL.GroupUserProject(groupcode);
            return TJson.toJson(mes);
        }
        #endregion



        #region[角色类型列表查询]

 VueWebApi/Controllers/ProductionManagementController.cs

@@ -32,6 +32,7 @@
        /// </summary>
        /// <param name="erporderstus">订单状态码</param>
        /// <param name="erpordercode">订单编号</param>
        /// <param name="saleordercode">销售单号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">产品规格</param>
@@ -45,7 +46,7 @@
        /// <returns></returns>
        [Route(template: "ErpOrderSearch")]
        [HttpGet]
        public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
        public HttpResponseMessage ErpOrderSearch(string erporderstus = 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, int page = 0, int rows = 0, string prop = null, string order = null)
        {
            var stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
@@ -65,7 +66,7 @@
            }
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            mes = ProductionManagementBLL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -82,6 +83,7 @@
        {
            string erporderid = obj["erporderid"].ToString(); //订单id
            string erpordercode = obj["erpordercode"].ToString(); //订单编号
            string saleordercode = obj["saleordercode"].ToString(); //销售订单号
            string partcode = obj["partcode"].ToString(); //产品编码
            string wkshopcode = obj["wkshopcode"].ToString(); //车间编码
            string warehousecode = obj["warehousecode"].ToString(); //仓库编码
@@ -91,7 +93,7 @@
            string relse_qty = obj["relse_qty"].ToString(); //已下单数量
            string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //交付时间
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
            mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, username);
            return TJson.toJson(mes);
        }
        #endregion
@@ -122,6 +124,7 @@
        /// <param name="mesorderstus">工单状态码</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>
@@ -135,13 +138,13 @@
        /// <returns></returns>
        [Route(template: "MesOrderSearch")]
        [HttpGet]
        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, 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)
        public HttpResponseMessage MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = 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 stu_torgcode = HttpContext.Current.Request.Cookies["stu_torgcode"].Value.ToString(); //所属组织
            var stu_torgtypecode = HttpContext.Current.Request.Cookies["description"].Value.ToString(); //所属组织类型
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            mes = ProductionManagementBLL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -152,6 +155,7 @@
        /// </summary>
        /// <param name="mesordercode">工单编号</param>
        /// <param name="sourceorder">源单单号</param>
        /// <param name="saleordercode">销售单号</param>
        /// <param name="partcode">产品编码</param>
        /// <param name="partname">产品名称</param>
        /// <param name="partspec">产品规格</param>
@@ -164,11 +168,11 @@
        /// <returns></returns>
        [Route(template: "MesBadOrderSearch")]
        [HttpGet]
        public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
        public HttpResponseMessage MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null,string saleordercode=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
        {
            int startNum = rows * (page - 1) + 1;  //起始记录rowNum
            int endNum = rows * page;   //结束记录 rowNum
            mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            mes = ProductionManagementBLL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return TJson.toJson(mes);
        }
        #endregion
@@ -467,7 +471,7 @@
        /// ç”Ÿäº§å¼€æŠ¥å·¥ï¼šå¼€å·¥(开始/报工)/外协(发料/收料)时条件判断及数据返回接口
        /// </summary>
        /// <param name="OperType">操作类型：自制(ZZ)/外协(WX)</param>
        /// <param name="SelectType">操作类型：外协发料标识(OUT)/外协收料标识(IN)</param>
        /// <param name="SelectType">操作类型：自制(设备编码)/外协(发料标识(OUT)/收料标识(IN))</param>
        /// <param name="orderstepqrcode">扫描二维码信息</param>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <returns></returns>

 VueWebApi/DLL/BLL/BasicSettingBLL.cs

@@ -100,16 +100,16 @@


        #region[用户组列表查询]
        public static ToMessage UserGroupSearch(string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
        public static ToMessage UserGroupSearch(string groupcode, string groupname,string stu_torgcode,string description,int startNum, int endNum, string prop, string order)
        {
            return BasicSettingDAL.UserGroupSearch(stu_torgcode, description,startNum, endNum, prop, order);
            return BasicSettingDAL.UserGroupSearch(groupcode, groupname,stu_torgcode, description,startNum, endNum, prop, order);
        }
        #endregion

        #region[用户组新增]
        public static ToMessage UserGroupAdd(List<StepDefect> json,string username)
        public static ToMessage UserGroupAdd(string type, List<GroupUser> json,string username)
        {
            return BasicSettingDAL.UserGroupAdd(json,username);
            return BasicSettingDAL.UserGroupAdd(type,json, username);
        }
        #endregion

@@ -120,6 +120,13 @@
        }
        #endregion

        #region[用户组查看关联人员]
        public static ToMessage GroupUserProject(string groupcode)
        {
            return BasicSettingDAL.GroupUserProject(groupcode);
        }
        #endregion


        #region[角色类型查询]
        public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)

 VueWebApi/DLL/BLL/ProductionManagementBLL.cs

@@ -13,16 +13,16 @@
    public class ProductionManagementBLL
    {
        #region[ERP订单查询]
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode, string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode, string erporderstus, string erpordercode,string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
            return ProductionManagementDAL.ErpOrderSearch(stu_torgcode, stu_torgtypecode,erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
        }
        #endregion

        #region[ERP订单下达]
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty,string saleOrderDeliveryDate, string username)
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty,string saleOrderDeliveryDate, string username)
        {
            return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,username);
            return ProductionManagementDAL.MarkSaveErpOrder(erporderid,erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,username);
        }
        #endregion

@@ -36,16 +36,16 @@


        #region[MES工单查询]
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode,string sourceorder,string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode,string saleordercode, string sourceorder,string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return ProductionManagementDAL.MesOrderSearch(stu_torgcode, stu_torgtypecode,mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
        }
        #endregion

        #region[MES报废补单工单查询]
        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            return ProductionManagementDAL.MesBadOrderSearch(mesordercode, sourceorder, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
            return ProductionManagementDAL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
        }
        #endregion


 VueWebApi/DLL/DAL/BasicSettingDAL.cs

@@ -242,7 +242,7 @@
        #endregion

        #region [组织架构删除]
        public static ToMessage DeleteOrganization(int orgid,string orgcode)
        public static ToMessage DeleteOrganization(int orgid, string orgcode)
        {
            var sql = "";
            var cont = 0;
@@ -270,23 +270,23 @@
                    return mes;
                }
                sql = @"delete TOrganization   where id=@orgid";
                    dynamicParams.Add(@"orgid", orgid);
                    cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "删除操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "删除操作失败!";
                        mes.data = null;
                    }
                
                dynamicParams.Add(@"orgid", orgid);
                cont = DapperHelper.SQL(sql, dynamicParams);
                if (cont > 0)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "删除操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "删除操作失败!";
                    mes.data = null;
                }

            }
            catch (Exception e)
            {
@@ -302,7 +302,7 @@


        #region[用户清单数据查询]
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg,string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        public static ToMessage UserSearch(string UserCode, string UserName, string StuOrg, string description, string wagetype, string Enable, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -466,7 +466,7 @@
        #endregion

        #region[用户所属班组]
        public static ToMessage UserGroup(string stu_torgcode,string description)
        public static ToMessage UserGroup(string stu_torgcode, string description)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -673,7 +673,7 @@
        #endregion

        #region[用户清单关联角色查询]
        public static ToMessage UserAssociationRole(string usercode,string stu_torgcode,string description)
        public static ToMessage UserAssociationRole(string usercode, string stu_torgcode, string description)
        {
            string sql = "";
            string search = "";
@@ -707,7 +707,7 @@
                        where C.user_code=@usercode
                        ) B
                        on A.roletype_code=B.roletype_code 
                        where  A.is_delete='0' "+search;
                        where  A.is_delete='0' " + search;
                dynamicParams.Add("@usercode", usercode);
                var data = DapperHelper.select<TreeObejct>(sql, dynamicParams);
                for (int i = 0; i < data.Count; i++)
@@ -737,7 +737,7 @@
        #endregion

        #region[用户清单关联角色保存]
        public static ToMessage SaveUserAssoctRole(string usercode,string stu_torgcode,string description, List<RoleUserSubmit> json)
        public static ToMessage SaveUserAssoctRole(string usercode, string stu_torgcode, string description, List<RoleUserSubmit> json)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -804,7 +804,7 @@
                        for (int j = 0; j < json[i].Data.Count; j++)
                        {
                            sql = @"insert into TUserRoleRelation(user_code,role_code,torg_code) values(@usercode,@role_code,@stu_torgcode)";
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode= stu_torgcode, role_code = json[i].Data[j] } });
                            list.Add(new { str = sql, parm = new { usercode = usercode, stu_torgcode = stu_torgcode, role_code = json[i].Data[j] } });

                        }
                    }
@@ -914,7 +914,7 @@


        #region[用户组列表查询]
        public static ToMessage UserGroupSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
        public static ToMessage UserGroupSearch(string groupcode, string groupname, string stu_torgcode, string description, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -937,11 +937,21 @@
                    default:
                        break;
                }
                if (groupcode != "" && groupcode != null)
                {
                    search += " and G.group_code like '%'+@groupcode+'%' ";
                    dynamicParams.Add("@groupcode", groupcode);
                }
                if (groupname != "" && groupname != null)
                {
                    search += " and G.group_name like '%'+@groupname+'%' ";
                    dynamicParams.Add("@groupname", groupname);
                }
                var sql = @"select torg_code,parent.org_name,group_code,group_name,G.description
                            from TGroup G
                            left join TOrganization parent on G.torg_code=parent.org_code 
                            left join TOrganization as child on parent.parent_id=child.id 
                            where  G.is_delete<>'1' "+search;
                            where  G.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
                mes.code = "200";
                mes.Message = "查询成功!";
@@ -960,7 +970,7 @@
        #endregion

        #region[用户组新增]
        public static ToMessage UserGroupAdd(List<StepDefect> json, string username)
        public static ToMessage UserGroupAdd(string type, List<GroupUser> json, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -968,50 +978,125 @@
            try
            {
                list.Clear();
                //循环写入用户组表
                for (int i = 0; i < json.Count; i++)
                if (type == "Add")
                {
                    var sql0 = @"select *  from TGroup where group_code=@group_code and torg_code=@torg_code";
                    dynamicParams.Add("@group_code", json[i].code);
                    dynamicParams.Add("@torg_code", json[i].storg_code);
                    var data = DapperHelper.selectdata(sql0, dynamicParams);
                    //判断用户组编码是否唯一
                    sql = @"select *  from TGroup where group_code=@group_code and torg_code=@torg_code";
                    dynamicParams.Add("@group_code", json[0].code);
                    dynamicParams.Add("@torg_code", json[0].storg_code);
                    var data = DapperHelper.selectdata(sql, dynamicParams);
                    if (data.Rows.Count > 0)
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败,编码重复!";
                        mes.Message = "操作失败,用户组编码重复!";
                        mes.data = null;
                        return mes;
                    }
                    sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
                    else
                    {
                        //写入用户组表
                        sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) values(@groupcode,@groupename,@description,@lm_user,@lm_date,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                groupcode = json[0].code,
                                groupename = json[0].name,
                                description = json[0].flag,
                                lm_user = username,
                                lm_date = DateTime.Now.ToString(),
                                torg_code = json[0].storg_code
                            }
                        });
                        //写入用户组关系表
                        for (int i = 0; i < json[0].children.Count; i++)
                        {
                            sql = @"insert into TGroup(group_code,user_code) values(@groupcode,@usercode)";
                            list.Add(new
                            {
                                str = sql,
                                parm = new
                                {
                                    groupcode = json[0].code,
                                    groupename = json[0].children[i].usercode
                                }
                            });
                        }
                    }
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败!";
                        mes.data = null;
                    }
                }
                else
                {
                    //修改用户组表
                    sql = @"update TGroup see group_name=@,lm_user=@lm_user,lm_date=@lm_date,description=@description,torg_code=@torg_code where group_code=@groupcode";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            groupcode = json[i].code,
                            groupename = json[i].name,
                            description = json[i].flag,
                            groupcode = json[0].code,
                            groupename = json[0].name,
                            description = json[0].flag,
                            lm_user = username,
                            lm_date = DateTime.Now.ToString(),
                            torg_code = json[i].storg_code
                            torg_code = json[0].storg_code
                        }
                    });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "操作成功!";
                    mes.data = null;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "操作失败!";
                    mes.data = null;
                    //删除用户组关系表
                    sql = @"delete TGroupUser where group_code=@groupcode";
                    list.Add(new
                    {
                        str = sql,
                        parm = new
                        {
                            groupcode = json[0].code
                        }
                    });
                    //修改用户组关系表
                    for (int i = 0; i < json[0].children.Count; i++)
                    {
                        sql = @"insert into TGroupUser(group_code,user_code) values(@groupcode,@usercode)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                groupcode = json[0].code,
                                groupename = json[0].children[i].usercode
                            }
                        });
                    }
                    bool aa = DapperHelper.DoTransaction(list);
                    if (aa)
                    {
                        mes.code = "200";
                        mes.count = 0;
                        mes.Message = "操作成功!";
                        mes.data = null;
                    }
                    else
                    {
                        mes.code = "300";
                        mes.count = 0;
                        mes.Message = "操作失败!";
                        mes.data = null;
                    }
                }
            }
            catch (Exception e)
@@ -1034,14 +1119,15 @@
            try
            {
                list.Clear();
                sql = @"select *  from TUser where is_delete<>'1' and usergroup_code=@UserGrupCode";
                //判断当前用户组是否存在开报工记录
                sql = @"select *  from TK_Wrk_RecordSub where  usergroup_code=@UserGrupCode";
                dynamicParams.Add("@UserGrupCode", UserGrupCode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "该用户组下有关联的用户,不允许删除!";
                    mes.Message = "该用户组已经有报工,不允许删除!";
                    mes.data = null;
                    return mes;
                }
@@ -1075,12 +1161,49 @@
        }
        #endregion

        #region[用户组查看关联人员]
        public static ToMessage GroupUserProject(string groupcode)
        {
            var sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select *  from TGroupUser where  group_code=@groupcode";
                dynamicParams.Add("@groupcode", groupcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "200";
                    mes.count = 0;
                    mes.Message = "查询成功!";
                    mes.data = data;
                    return mes;
                }
                else
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "该班组下无指定用户!";
                    mes.data = null;
                    return mes;
                }
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion




        #region[角色类型查询]
        public static ToMessage RoleTypeSearch(string stu_torgcode, string description,int startNum, int endNum, string prop, string order)
        public static ToMessage RoleTypeSearch(string stu_torgcode, string description, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -1157,7 +1280,7 @@
                        {
                            roletypecode = json[i].code,
                            roletypename = json[i].name,
                            torg_code= json[i].flag
                            torg_code = json[i].flag
                        }
                    });
                }
@@ -1238,7 +1361,7 @@
        #endregion

        #region[角色类型下拉接口]
        public static ToMessage RoleTypeSelect(string stu_torgcode,string description)
        public static ToMessage RoleTypeSelect(string stu_torgcode, string description)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -1282,7 +1405,7 @@
        #endregion

        #region[角色清单查询]
        public static ToMessage RoleSearch(string stu_torgcode,string description,string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        public static ToMessage RoleSearch(string stu_torgcode, string description, string RoleCode, string RoleName, string RoleTypeCode, string CreateUser, int startNum, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -1355,7 +1478,7 @@
        #endregion

        #region[角色清单新增编辑]
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName,string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
        public static ToMessage AddUpdateRole(string RoleId, string RoleCode, string RoleName, string stu_torgcode, string RoleTypeCode, string description, string Usercode, string OperType)
        {
            var dynamicParams = new DynamicParameters();
            try

 VueWebApi/DLL/DAL/ProductionManagementDAL.cs

@@ -22,7 +22,7 @@


        #region[ERP订单查询]
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        public static ToMessage ErpOrderSearch(string stu_torgcode,string stu_torgtypecode,string erporderstus, string erpordercode,string saleordercode, string partcode, string partname, string partspec, int startNum, string paydatestartdate, string paydateenddate, string paydatestartdate1, string paydateenddate2, string creatuser, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -52,6 +52,11 @@
                {
                    search += "and A.wo like '%'+@erpordercode+'%' ";
                    dynamicParams.Add("@erpordercode", erpordercode);
                }
                if (saleordercode != "" && saleordercode != null)
                {
                    search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
                    dynamicParams.Add("@saleordercode", saleordercode);
                }
                if (partcode != "" && partcode != null)
                {
@@ -93,7 +98,7 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wo,A.materiel_code as partcode,B.partname,B.partspec,A.qty,A.relse_qty,A.wkshp_code,C.org_name as wkshp_name,
                            A.stck_code,D.name as stck_name,saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate 
                            A.stck_code,D.name as stck_name,A.saleOrderCode,A.saleOrderDeliveryDate,A.planstartdate,A.planenddate,U.username as createuser,A.createdate 
                            from TKimp_Ewo A
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.org_code
@@ -119,7 +124,7 @@
        #endregion

        #region[ERP订单下达]
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
        public static ToMessage MarkSaveErpOrder(string erporderid, string erpordercode,string saleordercode, string partcode, string wkshopcode, string warehousecode, string erpqty, string markqty, string ordernum, string relse_qty, string saleOrderDeliveryDate, string username)
        {
            var sql = "";
            List<object> list = new List<object>();
@@ -157,7 +162,7 @@
                    }
                    if (i == Convert.ToInt32(ordernum))  //最后一单时
                    {
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
                        list.Add(new
                        {
                            str = sql,
@@ -174,6 +179,7 @@
                                m_po = erpordercode,
                                username = username,
                                CreateDate = DateTime.Now.ToString(),
                                saleOrderCode=saleordercode,
                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
                            }
                        });
@@ -182,7 +188,7 @@
                    else
                    {

                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderDeliveryDate)";
                        sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,stck_code,materiel_code,sourceid,m_po,lm_user,lm_date,saleOrderCode,saleOrderDeliveryDate) values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@stck_code,@materiel_code,@sourceid,@m_po,@username,@CreateDate,@saleOrderCode,@saleOrderDeliveryDate)";
                        list.Add(new
                        {
                            str = sql,
@@ -199,6 +205,7 @@
                                m_po = erpordercode,
                                username = username,
                                CreateDate = DateTime.Now.ToString(),
                                saleOrderCode=saleordercode,
                                saleOrderDeliveryDate = Convert.ToDateTime(saleOrderDeliveryDate)
                            }
                        });
@@ -323,7 +330,7 @@


        #region[MES工单查询]
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesOrderSearch(string stu_torgcode,string stu_torgtypecode,string mesorderstus, string mesordercode, string sourceorder,string saleordercode, string ordertype, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -358,6 +365,11 @@
                {
                    search += "and A.m_po like '%'+@sourceorder+'%' ";
                    dynamicParams.Add("@sourceorder", sourceorder);
                }
                if (saleordercode != "" && saleordercode != null)
                {
                    search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
                    dynamicParams.Add("@saleordercode", saleordercode);
                }
                if (ordertype != "" && ordertype != null)
                {
@@ -397,8 +409,9 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date
                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date
                            from TK_Wrk_Man A
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.org_code
                            left join T_Sec_Stck D on A.stck_code=D.code 
@@ -425,7 +438,7 @@
        #endregion

        #region[MES报废补单工单查询]
        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        public static ToMessage MesBadOrderSearch(string mesordercode, string sourceorder,string saleordercode, string partcode, string partname, string partspec, int startNum, string creatuser, string createdate, int endNum, string prop, string order)
        {
            var dynamicParams = new DynamicParameters();
            string search = "";
@@ -440,6 +453,11 @@
                {
                    search += "and A.m_po like '%'+@sourceorder+'%' ";
                    dynamicParams.Add("@sourceorder", sourceorder);
                }
                if (saleordercode != "" && saleordercode != null)
                {
                    search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
                    dynamicParams.Add("@saleordercode", saleordercode);
                }
                if (partcode != "" && partcode != null)
                {
@@ -474,8 +492,9 @@
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.plan_qty,A.wkshp_code,C.org_name as wkshp_name,
                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,U.username as lm_user,A.lm_date,S.bad_qty
                            A.route_code,E.name as route_name,A.stck_code,F.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,W.saleOrderCode,U.username as lm_user,A.lm_date,S.bad_qty
                            from TK_Wrk_Man A
                            left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code
                            left join (select wo_code,sum(bad_qty) as bad_qty from  TK_Wrk_Step where bad_qty>0 group by wo_code) S on A.wo_code=S.wo_code
                            left join TMateriel_Info B on A.materiel_code=B.partcode
                            left join TOrganization C on A.wkshp_code=C.org_code
@@ -1848,7 +1867,7 @@
                    switch (OperType)
                    {
                        case "ZZ":
                            mes = ScanStartReport.ZZEncodingSeach(stu_torgcode,ordercode, stepcode);
                            mes = ScanStartReport.ZZEncodingSeach(stu_torgcode, SelectType,ordercode, stepcode);
                            break;
                        case "WX":
                            mes = ScanStartReport.WXEncodingSeach(stu_torgcode,SelectType, ordercode, stepcode);
@@ -1988,7 +2007,11 @@
            try
            {
                //班组获取人员列表
                sql = @"select usercode,username  from TUser where stu_torgcode=@stu_torgcode and usergroup_code=@usergroupcode and is_delete<>'1'";
                sql = @"select U.username,U.username   
                        from TGroup G
                        inner join TGroupUser T on G.group_code=T.group_code
                        left join  TUser U on T.user_code=U.usercode
                        where G.torg_code=@stu_torgcode and G.group_code=@usergroupcode";
                dynamicParams.Add("@stu_torgcode", stu_torgcode);
                dynamicParams.Add("@usergroupcode", usergroupcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -2152,15 +2175,16 @@
                string date = DateTime.Now.ToString(); //获取系统时间
                list.Clear();
                //判断是否有开工记录
                sql = @"select *  from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code  and style='S'";
                sql = @"select *  from TK_Wrk_Record where wo_code=@wo_code and step_code=@step_code  and eqp_code=@eqpcode and style='S'";
                dynamicParams.Add("@wo_code", mesordercode);
                dynamicParams.Add("@step_code", stepcode);
                dynamicParams.Add("@eqpcode", eqpcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                if (data.Rows.Count > 0)
                {
                    mes.code = "300";
                    mes.count = 0;
                    mes.Message = "当前工序任务已开工!";
                    mes.Message = "当前工序任务设备已开工!";
                    mes.data = null;
                    return mes;
                }
@@ -2235,9 +2259,10 @@
                //获取开工记录的默认选中的设备(产线)与报工时的设备产线做对比判断
                sql = @"select A.eqp_code,B.name  from TK_Wrk_Record A
                        inner join TEqpInfo B on A.eqp_code=B.code
                        where A.wo_code=@wo_code and A.step_code=@step_code and A.style='S'";
                        where A.wo_code=@wo_code and A.step_code=@step_code and eqp_code=@eqpcode  and A.style='S'";
                dynamicParams.Add("@wo_code", mesordercode);
                dynamicParams.Add("@step_code", stepcode);
                dynamicParams.Add("@eqpcode", eqpcode);
                var da = DapperHelper.selectdata(sql, dynamicParams);
                if (da.Rows[0]["EQP_CODE"].ToString() != eqpcode)
                {

 VueWebApi/Excel/Óû§Çåµ¥.xls

Binary files differ

 VueWebApi/Models/GroupUser.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace VueWebApi.Models
{
    public class GroupUser
    {
        public string storg_code { get; set; }
        public string code { get; set; }
        public string name { get; set; }
        public string flag { get; set; }
        public List<GroupUserCont> children { get; set; }
    }
    public class GroupUserCont
    {
        public string usercode { get; set; }
        public string username { get; set; }
    }
}

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\网站发布\MES正清河</_PublishTargetUrl>
    <History>True|2023-07-31T03:18:06.9546379Z;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
    <History>True|2023-08-07T02:34:44.0844087Z;True|2023-08-07T10:28:56.2230477+08:00;True|2023-07-31T11:18:06.9546379+08:00;True|2023-07-03T10:38:22.8080444+08:00;True|2023-06-26T08:15:27.3611577+08:00;True|2023-06-25T15:36:41.8736654+08:00;True|2023-06-25T14:33:49.5287543+08:00;True|2023-06-13T10:24:59.6876648+08:00;</History>
  </PropertyGroup>
  <ItemGroup>
    <File Include="Areas/HelpPage/HelpPage.css">
@@ -750,13 +750,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>07/31/2023 11:18:01</publishTime>
      <publishTime>08/07/2023 18:03:18</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>07/31/2023 11:18:01</publishTime>
      <publishTime>08/07/2023 18:03:18</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>07/31/2023 11:18:01</publishTime>
      <publishTime>08/07/2023 18:03:18</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>
@@ -837,7 +837,7 @@
      <publishTime>11/07/2022 17:57:07</publishTime>
    </File>
    <File Include="Excel/用户清单.xls">
      <publishTime>06/18/2023 07:56:48</publishTime>
      <publishTime>08/07/2023 17:47:13</publishTime>
    </File>
    <File Include="Excel/缺陷定义.xls">
      <publishTime>08/12/2022 10:41:48</publishTime>
@@ -1161,7 +1161,7 @@
      <publishTime>06/16/2022 13:39:23</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>07/31/2023 11:18:05</publishTime>
      <publishTime>08/07/2023 17:29:33</publishTime>
    </File>
  </ItemGroup>
</Project>

 VueWebApi/Tools/ImportExcelData.cs

@@ -20,20 +20,14 @@
            code = "";
            List<DataTable> excelTable = new List<DataTable>();
            excelTable = ImportExcel.ExcelToTableList(FileCode);
            if (excelTable.Count != 4)
            if (excelTable.Count != 2)
            {
                code = "300";
                Message = "导入模板不符合规范,请检查sheet数";
                return Message;

            }
            else if (excelTable[0].Columns.Count != 5)
            {
                code = "300";
                Message = "用户班组模板不符合规范,请检查列名字段数";
                return Message;
            }
            else if (excelTable[1].Columns.Count != 10)
            else if (excelTable[0].Columns.Count != 9)
            {
                code = "300";
                Message = "用户清单模板不符合规范,请检查列名字段数";
@@ -42,91 +36,55 @@
            else if (excelTable[0].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "用户班组模板：表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[0].Columns[1].ColumnName != "组织编码")
            {
                code = "300";
                Message = "用户班组模板：表头信息不符合规范,第2列应为{组织编码}";
                return Message;
            }
            else if (excelTable[0].Columns[2].ColumnName != "班组编号(唯一)")
            {
                code = "300";
                Message = "用户班组模板：表头信息不符合规范,第2列应为{班组编号(唯一)}";
                return Message;
            }
            else if (excelTable[0].Columns[3].ColumnName != "班组名称")
            {
                code = "300";
                Message = "用户班组模板：表头信息不符合规范,第3列应为{班组名称}";
                return Message;
            }
            else if (excelTable[0].Columns[4].ColumnName != "班组描述")
            {
                code = "300";
                Message = "用户班组模板：表头信息不符合规范,第4列应为{班组描述}";
                return Message;
            }
            else if (excelTable[1].Columns[0].ColumnName != "序号")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第1列应为{序号}";
                return Message;
            }
            else if (excelTable[1].Columns[1].ColumnName != "用户编号(唯一)")
            else if (excelTable[0].Columns[1].ColumnName != "用户编号(唯一)")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第2列应为{用户编号(唯一)}";
                return Message;
            }
            else if (excelTable[1].Columns[2].ColumnName != "用户姓名")
            else if (excelTable[0].Columns[2].ColumnName != "用户姓名")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第3列应为{用户姓名}";
                return Message;
            }
            else if (excelTable[1].Columns[3].ColumnName != "在职状态")
            else if (excelTable[0].Columns[3].ColumnName != "在职状态")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第4列应为{在职状态}";
                return Message;
            }
            else if (excelTable[1].Columns[4].ColumnName != "密码")
            else if (excelTable[0].Columns[4].ColumnName != "密码")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第5列应为{密码}";
                return Message;
            }
            else if (excelTable[1].Columns[5].ColumnName != "手机号")
            else if (excelTable[0].Columns[5].ColumnName != "手机号")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第6列应为{手机号}";
                return Message;
            }
            else if (excelTable[1].Columns[6].ColumnName != "邮箱")
            else if (excelTable[0].Columns[6].ColumnName != "邮箱")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第7列应为{邮箱}";
                return Message;
            }
            else if (excelTable[1].Columns[7].ColumnName != "组织编码")
            else if (excelTable[0].Columns[7].ColumnName != "组织编码")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第8列应为{组织编码}";
                return Message;
            }
            else if (excelTable[1].Columns[8].ColumnName != "工资类型")
            else if (excelTable[0].Columns[8].ColumnName != "工资类型")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第9列应为{工资类型}";
                return Message;
            }
            else if (excelTable[1].Columns[9].ColumnName != "用户组编码")
            {
                code = "300";
                Message = "用户清单模板：表头信息不符合规范,第10列应为{用户组编码}";
                return Message;
            }
            else
@@ -1864,106 +1822,39 @@
            var dynamicParams = new DynamicParameters();
            DataTable dt;
            List<ExcelErro> list = new List<ExcelErro>();
            List<DataTable> excelTable = new List<DataTable>();
            list = ImportExcel.ExcelToTableListErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTableList(FileCode);  //获取Excel数据
            //主表
            for (int j = 0; j < excelTable[0].Rows.Count; j++)
            DataTable excelTable = new DataTable();
            list = ImportExcel.ExcelToTableErro(FileCode);    //验证Excel数据必填字段是否为空、唯一字段是否重复
            excelTable = ImportExcel.ExcelToTable(FileCode);  //获取Excel数据
            for (int k = 0; k < excelTable.Rows.Count; k++)
            {
                if (excelTable[0].Rows[j][2].ToString().Trim() != null && excelTable[0].Rows[j][2].ToString().Trim() != "")
                {
                    sql = @"select *  from TGroup where group_code=@group_code";
                    dynamicParams.Add("@group_code", excelTable[0].Rows[j][2].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{班组编码(唯一)}";
                        erro.ErrorCont = "班组表:{班组编码(唯一)}字段" + excelTable[0].Rows[j][2].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
            }
            //子表
            for (int k = 0; k < excelTable[1].Rows.Count; k++)
            {
                if (excelTable[1].Rows[k][1].ToString().Trim() != null && excelTable[1].Rows[k][1].ToString().Trim() != "")
                if (excelTable.Rows[k][1].ToString().Trim() != null && excelTable.Rows[k][1].ToString().Trim() != "")
                {
                    sql = @"select *  from TUser where usercode=@usercode";
                    dynamicParams.Add("@usercode", excelTable[1].Rows[k][1].ToString().Trim());
                    dynamicParams.Add("@usercode", excelTable.Rows[k][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{用户编码(唯一)}";
                        erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable[1].Rows[k][1].ToString().Trim() + "已存在";
                        erro.ErrorCont = "用户表:{用户编码(唯一)}字段" + excelTable.Rows[k][1].ToString().Trim() + "已存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[1].Rows[k][7].ToString().Trim() != null && excelTable[1].Rows[k][7].ToString().Trim() != "")
                if (excelTable.Rows[k][7].ToString().Trim() != null && excelTable.Rows[k][7].ToString().Trim() != "")
                {
                    sql = @"select *  from TOrganization where org_code=@org_code";
                    dynamicParams.Add("@org_code", excelTable[1].Rows[k][7].ToString().Trim());
                    dynamicParams.Add("@org_code", excelTable.Rows[k][7].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt == null || dt.Rows.Count <= 0)
                    {
                        ExcelErro erro = new ExcelErro();
                        erro.RoeNumber = "/";
                        erro.ErrorField = "{组织编码}";
                        erro.ErrorCont = "用户表:{组织编码}字段" + excelTable[1].Rows[k][7].ToString().Trim() + "不存在";
                        erro.ErrorCont = "用户表:{组织编码}字段" + excelTable.Rows[k][7].ToString().Trim() + "不存在";
                        list.Add(erro);
                    }
                }
                if (excelTable[1].Rows[k][9].ToString().Trim() != null && excelTable[1].Rows[k][9].ToString().Trim() != "")
                {
                    sql = @"select torg_code  from TGroup where group_code=@group_code";
                    dynamicParams.Add("@group_code", excelTable[1].Rows[k][9].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt != null && dt.Rows.Count>0)
                    {
                        if (dt.Rows[0]["torg_code"].ToString()!= excelTable[1].Rows[k][7].ToString().Trim()) 
                        {
                            ExcelErro erro = new ExcelErro();
                            erro.RoeNumber = "/";
                            erro.ErrorField = "{用户组编码}";
                            erro.ErrorCont = "用户表:{用户组编码}字段" + excelTable[1].Rows[k][9].ToString().Trim() + " ä¸æ˜¯ç»„织编码:" + excelTable[1].Rows[k][7].ToString().Trim() + "下的用户组";
                            list.Add(erro);
                        }                    }
                }
            }
            //判断子表组织编码不存在于主表组织编码中的数据
            var dt2 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("组织编码")
                      ).Contains(r.Field<string>("组织编码"))
                      select r;
            List<DataRow> listRow2 = dt2.ToList();
            if (listRow2.Count > 0)
            {
                ExcelErro erro = new ExcelErro();
                erro.RoeNumber = "/";
                erro.ErrorField = "{组织编码}";
                erro.ErrorCont = "用户表:{组织编码}字段中有值在班组表:{组织编码}中不存在";
                list.Add(erro);
            }
            //判断子表外键不存在于主表主键中的数据
            var dt3 = from r in excelTable[1].AsEnumerable()
                      where !(
                          from rr in excelTable[0].AsEnumerable()
                          select rr.Field<string>("班组编号(唯一)")
                      ).Contains(r.Field<string>("用户组编码"))
                      select r;
            List<DataRow> listRow = dt3.ToList();
            if (listRow.Count > 0)
            {
                ExcelErro erro = new ExcelErro();
                erro.RoeNumber = "/";
                erro.ErrorField = "{用户组编码}";
                erro.ErrorCont = "用户表:{用户组编码}字段中有值在班组表:{班组编号(唯一)}中不存在";
                list.Add(erro);
            }
            if (list.Count > 0)
            {
@@ -1980,7 +1871,7 @@
            {
                StuCode = "200";
                message = "数据验证成功";
                count = excelTable[0].Rows.Count + excelTable[1].Rows.Count;
                count = excelTable.Rows.Count;
            }
            return list;
        }
@@ -3233,41 +3124,12 @@
            try
            {
                list.Clear();
                List<DataTable> excelTable = new List<DataTable>();
                excelTable = ImportExcel.ExcelToTableList(FileCode);
                //导入班组
                for (int k = 0; k < excelTable[0].Rows.Count; k++)
                {
                    sql = @"select *   from TGroup where group_code=@group_code";
                    dynamicParams.Add("@group_code", excelTable[0].Rows[k][2].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
                        continue;
                    }
                    else 
                    {
                        sql = @"insert into TGroup(group_code,group_name,description,lm_user,lm_date,torg_code) 
                            values(@group_code,@group_name,@description,@Operator,@CreateDate,@torg_code)";
                        list.Add(new
                        {
                            str = sql,
                            parm = new
                            {
                                group_code = excelTable[0].Rows[k][2].ToString().Trim(),
                                group_name = excelTable[0].Rows[k][3].ToString().Trim(),
                                description = excelTable[0].Rows[k][4].ToString().Trim(),
                                CreateDate = DateTime.Now.ToString(),
                                Operator = User,
                                torg_code= excelTable[0].Rows[k][1].ToString().Trim()
                            }
                        });
                    }
                }
                DataTable excelTable = new DataTable();
                excelTable = ImportExcel.ExcelToTable(FileCode);
                //导入用户
                for (int i = 0; i < excelTable[1].Rows.Count; i++)
                for (int i = 0; i < excelTable.Rows.Count; i++)
                {
                    if (excelTable[1].Rows[i][3].ToString().Trim() == "在职")
                    if (excelTable.Rows[i][3].ToString().Trim() == "在职")
                    {
                        Enable = "Y";
                    }
@@ -3276,7 +3138,7 @@
                        Enable = "N";
                    }
                    //工资类型
                    switch (excelTable[1].Rows[i][8].ToString().Trim())
                    switch (excelTable.Rows[i][8].ToString().Trim())
                    {
                        case "计件制":
                            WageType = "2";
@@ -3288,7 +3150,7 @@
                            break;
                    }
                    sql = @"select *   from TUser where usercode=@usercode";
                    dynamicParams.Add("@usercode", excelTable[1].Rows[i][1].ToString().Trim());
                    dynamicParams.Add("@usercode", excelTable.Rows[i][1].ToString().Trim());
                    dt = DapperHelper.selectdata(sql, dynamicParams);
                    if (dt.Rows.Count > 0)
                    {
@@ -3301,17 +3163,17 @@
                        str = sql,
                        parm = new
                        {
                            UserCode = excelTable[1].Rows[i][1].ToString().Trim(),
                            UserName = excelTable[1].Rows[i][2].ToString().Trim(),
                            password = excelTable[1].Rows[i][4].ToString().Trim(),
                            UserCode = excelTable.Rows[i][1].ToString().Trim(),
                            UserName = excelTable.Rows[i][2].ToString().Trim(),
                            password = excelTable.Rows[i][4].ToString().Trim(),
                            Enable = Enable,
                            Mobile = excelTable[1].Rows[i][5].ToString().Trim(),
                            Mobile = excelTable.Rows[i][5].ToString().Trim(),
                            CreateDate = DateTime.Now.ToString(),
                            Email = excelTable[1].Rows[i][6].ToString().Trim(),
                            Email = excelTable.Rows[i][6].ToString().Trim(),
                            Operator = User,
                            StuOrg = excelTable[1].Rows[i][7].ToString().Trim(),
                            StuOrg = excelTable.Rows[i][7].ToString().Trim(),
                            wagetype = WageType,
                            usergroup_code = excelTable[1].Rows[i][9].ToString().Trim()
                            usergroup_code = excelTable.Rows[i][9].ToString().Trim()
                        }
                    });
                }

 VueWebApi/Tools/ScanStartReport.cs

@@ -18,10 +18,11 @@
        /// æ‰«ç ä¿¡æ¯ä¸ºå·¥å•+工序条码
        /// </summary>
        /// <param name="stu_torgcode">所属组织编码</param>
        /// <param name="SelectType">设备编码</param>
        /// <param name="ordercode">工单编号</param>
        /// <param name="stepcode">工序编码</param>
        /// <returns></returns>
        public static ToMessage ZZEncodingSeach(string stu_torgcode, string ordercode, string stepcode)
        public static ToMessage ZZEncodingSeach(string stu_torgcode, string SelectType, string ordercode, string stepcode)
        {
            var sql = "";
            string flwtype = ""; //工序属性
@@ -116,6 +117,7 @@
                    mes.data = null;
                    return mes;
                }

                switch (flwtype)
                {
                    case "Z":  //自制工序
@@ -124,9 +126,10 @@
                            //1.首道工序时，判断是否有开工记录
                            sql = @"select *   from TK_Wrk_Record R
                                    left join TEqpInfo E on R.eqp_code=E.code
                                    where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                                    where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code and R.style='S'";
                            dynamicParams.Add("@ordercode", ordercode);
                            dynamicParams.Add("@stepcode", stepcode);
                            dynamicParams.Add("@eqp_code", SelectType);
                            var data0 = DapperHelper.selectdata(sql, dynamicParams);
                            if (data0.Rows.Count > 0)  //有开工记录
                            {
@@ -205,9 +208,10 @@
                                //1.非首道工序时，判断本道是否有开工记录
                                sql = @"select *   from TK_Wrk_Record R
                                        left join TEqpInfo E on R.eqp_code=E.code
                                        where R.wo_code=@ordercode and R.step_code=@stepcode and R.style='S'";
                                        where R.wo_code=@ordercode and R.step_code=@stepcode and eqp_code=@eqp_code  and R.style='S'";
                                dynamicParams.Add("@ordercode", ordercode);
                                dynamicParams.Add("@stepcode", stepcode);
                                dynamicParams.Add("@eqp_code", SelectType);
                                var data1 = DapperHelper.selectdata(sql, dynamicParams);
                                if (data1.Rows.Count > 0)//本道有开工记录
                                {

 VueWebApi/VueWebApi.csproj

@@ -453,6 +453,7 @@
    <Compile Include="Models\DeviceRepair.cs" />
    <Compile Include="Models\EqpRepair.cs" />
    <Compile Include="Models\ExcelErro.cs" />
    <Compile Include="Models\GroupUser.cs" />
    <Compile Include="Models\MaterialRout.cs" />
    <Compile Include="Models\ObjectData.cs" />
    <Compile Include="Models\ObjectDataCont.cs" />

 VueWebApi/Web.config

@@ -27,7 +27,7 @@
    <!--redis数据库链接配置端口号-->
    <add key="RedisConnPort" value="6379" />
    <!--key失效时间30秒-->
    <add key="RedisKeyTimeCont" value="120" />
    <add key="RedisKeyTimeCont" value="7200" />
    <!--Excel导出模板配置IP-->
    <add key="FileIP" value="http://121.196.36.24:8001/" />
    <add key="webpages:Version" value="3.0.0.0" />

 VueWebApi/bin/VueWebApi.dll.config

@@ -27,7 +27,7 @@
    <!--redis数据库链接配置端口号-->
    <add key="RedisConnPort" value="6379" />
    <!--key失效时间30秒-->
    <add key="RedisKeyTimeCont" value="120" />
    <add key="RedisKeyTimeCont" value="7200" />
    <!--Excel导出模板配置IP-->
    <add key="FileIP" value="http://121.196.36.24:8001/" />
    <add key="webpages:Version" value="3.0.0.0" />

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -1535,20 +1535,25 @@
            <param name="files">上传用户清单导入文件</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ç”¨æˆ·ç»„列表查询
            </summary>
            <param name="groupcode">班组编码</param>
            <param name="groupname">班组名称</param>
            <param name="stu_torgcode">所属组织</param>
            <param name="description">所属组织类型</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.Collections.Generic.List{VueWebApi.Models.StepDefect})">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.String,System.Collections.Generic.List{VueWebApi.Models.GroupUser})">
            <summary>
            ç”¨æˆ·ç»„新增
            </summary>
             <param name="type">提交类型(Add/Update)</param>
            <param name="json">用户组新增提交数据</param>
            <returns></returns>
        </member>
@@ -1557,6 +1562,13 @@
            ç”¨æˆ·ç»„删除
            </summary>
            <param name="UserGrupCode">用户组编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.GroupUserProject(System.String)">
            <summary>
            ç”¨æˆ·ç»„查看关联人员
            </summary>
            <param name="groupcode">班组编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.RoleTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -2506,12 +2518,13 @@
            <param name="storagecode">库位编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ERP订单查询
            </summary>
            <param name="erporderstus">订单状态码</param>
            <param name="erpordercode">订单编号</param>
            <param name="saleordercode">销售单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
@@ -2539,13 +2552,14 @@
            <param name="erpordercode">订单号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES工单查询
            </summary>
            <param name="mesorderstus">工单状态码</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>
@@ -2558,12 +2572,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="saleordercode">销售单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
@@ -2710,7 +2725,7 @@
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šå¼€å·¥(开始/报工)/外协(发料/收料)时条件判断及数据返回接口
            </summary>
            <param name="OperType">操作类型：自制(ZZ)/外协(WX)</param>
            <param name="SelectType">操作类型：外协发料标识(OUT)/外协收料标识(IN)</param>
            <param name="SelectType">操作类型：自制(设备编码)/外协(发料标识(OUT)/收料标识(IN))</param>
            <param name="orderstepqrcode">扫描二维码信息</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
@@ -4609,11 +4624,12 @@
            <param name="listId"></param>  
            <param name="func"></param>  
        </member>
        <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String)">
        <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String,System.String)">
            <summary>
            æ‰«ç ä¿¡æ¯ä¸ºå·¥å•+工序条码
            </summary>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="SelectType">设备编码</param>
            <param name="ordercode">工单编号</param>
            <param name="stepcode">工序编码</param>
            <returns></returns>

 VueWebApi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache

Binary files differ

 VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Debug/VueWebApi.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
ba620971f75c0245d192b0a5b056dd47420ee52d
16db473c7cd4741e2f1489189a448a193a8f084b

 VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt

@@ -459,7 +459,6 @@
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.dll

 VueWebApi/obj/Debug/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Excel/Óû§Çåµ¥.xls

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/Web.config

@@ -25,7 +25,7 @@
    <!--redis数据库链接配置端口号-->
    <add key="RedisConnPort" value="6379" />
    <!--key失效时间30秒-->
    <add key="RedisKeyTimeCont" value="120" />
    <add key="RedisKeyTimeCont" value="7200" />
    <!--Excel导出模板配置IP-->
    <add key="FileIP" value="http://121.196.36.24:8001/" />
    <add key="webpages:Version" value="3.0.0.0" />

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -1535,20 +1535,25 @@
            <param name="files">上传用户清单导入文件</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupSearch(System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ç”¨æˆ·ç»„列表查询
            </summary>
            <param name="groupcode">班组编码</param>
            <param name="groupname">班组名称</param>
            <param name="stu_torgcode">所属组织</param>
            <param name="description">所属组织类型</param>
            <param name="page">页码</param>
            <param name="rows">每页显示条数</param>
            <param name="prop">排序字段</param>
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.Collections.Generic.List{VueWebApi.Models.StepDefect})">
        <member name="M:VueWebApi.Controllers.BasicSettingController.UserGroupAdd(System.String,System.Collections.Generic.List{VueWebApi.Models.GroupUser})">
            <summary>
            ç”¨æˆ·ç»„新增
            </summary>
             <param name="type">提交类型(Add/Update)</param>
            <param name="json">用户组新增提交数据</param>
            <returns></returns>
        </member>
@@ -1557,6 +1562,13 @@
            ç”¨æˆ·ç»„删除
            </summary>
            <param name="UserGrupCode">用户组编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.GroupUserProject(System.String)">
            <summary>
            ç”¨æˆ·ç»„查看关联人员
            </summary>
            <param name="groupcode">班组编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.BasicSettingController.RoleTypeSearch(System.Int32,System.Int32,System.String,System.String)">
@@ -2506,12 +2518,13 @@
            <param name="storagecode">库位编码</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.ErpOrderSearch(System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.Int32,System.Int32,System.String,System.String)">
            <summary>
            ERP订单查询
            </summary>
            <param name="erporderstus">订单状态码</param>
            <param name="erpordercode">订单编号</param>
            <param name="saleordercode">销售单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
@@ -2539,13 +2552,14 @@
            <param name="erpordercode">订单号</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES工单查询
            </summary>
            <param name="mesorderstus">工单状态码</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>
@@ -2558,12 +2572,13 @@
            <param name="order">排序规则</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
        <member name="M:VueWebApi.Controllers.ProductionManagementController.MesBadOrderSearch(System.Int32,System.Int32,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String,System.String)">
            <summary>
            MES报废补单工单查询
            </summary>
            <param name="mesordercode">工单编号</param>
            <param name="sourceorder">源单单号</param>
            <param name="saleordercode">销售单号</param>
            <param name="partcode">产品编码</param>
            <param name="partname">产品名称</param>
            <param name="partspec">产品规格</param>
@@ -2710,7 +2725,7 @@
            ç”Ÿäº§å¼€æŠ¥å·¥ï¼šå¼€å·¥(开始/报工)/外协(发料/收料)时条件判断及数据返回接口
            </summary>
            <param name="OperType">操作类型：自制(ZZ)/外协(WX)</param>
            <param name="SelectType">操作类型：外协发料标识(OUT)/外协收料标识(IN)</param>
            <param name="SelectType">操作类型：自制(设备编码)/外协(发料标识(OUT)/收料标识(IN))</param>
            <param name="orderstepqrcode">扫描二维码信息</param>
            <param name="stu_torgcode">所属组织编码</param>
            <returns></returns>
@@ -4609,11 +4624,12 @@
            <param name="listId"></param>  
            <param name="func"></param>  
        </member>
        <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String)">
        <member name="M:VueWebApi.Tools.ScanStartReport.ZZEncodingSeach(System.String,System.String,System.String,System.String)">
            <summary>
            æ‰«ç ä¿¡æ¯ä¸ºå·¥å•+工序条码
            </summary>
            <param name="stu_torgcode">所属组织编码</param>
            <param name="SelectType">设备编码</param>
            <param name="ordercode">工单编号</param>
            <param name="stepcode">工序编码</param>
            <returns></returns>

 VueWebApi/obj/Release/TransformWebConfig/original/Web.config

@@ -27,7 +27,7 @@
    <!--redis数据库链接配置端口号-->
    <add key="RedisConnPort" value="6379" />
    <!--key失效时间30秒-->
    <add key="RedisKeyTimeCont" value="120" />
    <add key="RedisKeyTimeCont" value="7200" />
    <!--Excel导出模板配置IP-->
    <add key="FileIP" value="http://121.196.36.24:8001/" />
    <add key="webpages:Version" value="3.0.0.0" />

 VueWebApi/obj/Release/TransformWebConfig/transformed/Web.config

@@ -25,7 +25,7 @@
    <!--redis数据库链接配置端口号-->
    <add key="RedisConnPort" value="6379" />
    <!--key失效时间30秒-->
    <add key="RedisKeyTimeCont" value="120" />
    <add key="RedisKeyTimeCont" value="7200" />
    <!--Excel导出模板配置IP-->
    <add key="FileIP" value="http://121.196.36.24:8001/" />
    <add key="webpages:Version" value="3.0.0.0" />

 VueWebApi/obj/Release/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Release/VueWebApi.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
f33be2dbc254d5ea3b3ab81eb8f30c79df3c4fb3
b2c2c9f06449485157f9db847892f5917c4115f5

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ