1.工单派发选择工艺路线或选择生产车间时判断绑定条件接口开发 2.组织架构删除update改为delete 3.工艺路线新增else if改为if 4...

yl

2023-03-04 72da1f7ca6f73346ff92bed7df96b4d28d6ccfd1

 VueWebApi/DLL/DAL/BasicSettingDAL.cs

@@ -244,7 +244,7 @@
                }
                else
                {
                    sql = @"update TOrganization set is_delete='1'  where id=@orgid";
                    sql = @"delete TOrganization   where id=@orgid";
                    dynamicParams.Add(@"orgid", orgid);
                    cont = DapperHelper.SQL(sql, dynamicParams);
                    if (cont > 0)
@@ -1512,21 +1512,8 @@
                }
                if (unitAttr != "" && unitAttr != null)
                {
                    switch (unitAttr)
                    {
                        case "WG":  //外购
                            search += "and A.mtype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                        case "WX":  //外协
                            search += "and A.btype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                        default:    //客户
                            search += "and A.htype=@unitAttr ";
                            dynamicParams.Add("@unitAttr", unitAttr);
                            break;
                    }
                    search += "and A.type=@unitAttr ";
                    dynamicParams.Add("@unitAttr", unitAttr);
                }
                if (createUser != "" && createUser != null)
                {
@@ -1539,7 +1526,7 @@
                }
                // --------------查询指定数据--------------
                var total = 0; //总条数
                var sql = @"select A.id,A.code,A.name,A.mtype,A.btype,A.htype,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
                var sql = @"select A.id,A.code,A.name,A.type,A.conttacts,A.conttphone,A.addr,T.username as lm_user,A.lm_date from TCustomer A
                            left join TUser T on A.lm_user=T.usercode
                            where  A.is_delete<>'1' " + search;
                var data = DapperHelper.GetPageList<object>(sql, dynamicParams, prop, order, startNum, endNum, out total);
@@ -1560,7 +1547,7 @@
        #endregion

        #region[往来单位新增编辑]
        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string mtypecode, string btypecode, string htypecode, string person, string contact, string description, string usercode, string OperType)
        public static ToMessage AddUpdateCurrentUnit(string unitid, string unitcode, string unitname, string typecode, string person, string contact, string description, string usercode, string OperType)
        {
            var dynamicParams = new DynamicParameters();
            try
@@ -1578,13 +1565,11 @@
                        mes.data = null;
                        return mes;
                    }
                    var sql = @"insert into TCustomer(code,name,mtype,btype,htype,conttacts,conttphone,addr,lm_user,lm_date) 
                            values(@unitcode,@unitname,@mtypecode,@btypecode,@htypecode,@person,@contact,@description,@usercode,@CreateDate)";
                    var sql = @"insert into TCustomer(code,name,type,conttacts,conttphone,addr,lm_user,lm_date) 
                            values(@unitcode,@unitname,@typecode,@person,@contact,@description,@usercode,@CreateDate)";
                    dynamicParams.Add("@unitcode", unitcode);
                    dynamicParams.Add("@unitname", unitname);
                    dynamicParams.Add("@mtypecode", mtypecode);
                    dynamicParams.Add("@btypecode", btypecode);
                    dynamicParams.Add("@htypecode", htypecode);
                    dynamicParams.Add("@typecode", typecode);
                    dynamicParams.Add("@person", person);
                    dynamicParams.Add("@contact", contact);
                    dynamicParams.Add("@description", description);
@@ -1608,12 +1593,10 @@
                }
                if (OperType == "Update")
                {
                    var sql = @"update TCustomer set name=@unitname,mtype=@mtypecode,btype=@btypecode,htype=@htypecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
                    var sql = @"update TCustomer set name=@unitname,type=@typecode,conttacts=@person,conttphone=@contact,addr=@description,lm_user=@usercode,lm_date=@CreateDate where id=@unitid";
                    dynamicParams.Add("@unitid", unitid);
                    dynamicParams.Add("@unitname", unitname);
                    dynamicParams.Add("@mtypecode", mtypecode);
                    dynamicParams.Add("@btypecode", btypecode);
                    dynamicParams.Add("@htypecode", htypecode);
                    dynamicParams.Add("@typecode", typecode);
                    dynamicParams.Add("@person", person);
                    dynamicParams.Add("@contact", contact);
                    dynamicParams.Add("@description", description);
@@ -1839,7 +1822,7 @@
                sql = @"select B.id,B.ando_cogfigid,U.usercode,U.username,A.enable  from TAnDon_Roul_ConFig A
                        inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
                        left  join TUser U on B.usercode=U.usercode
                        where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode";
                        where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode and U.is_delete=0";
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@calltypecode", calltypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
@@ -1873,7 +1856,7 @@
                        left join (
                        select B.usercode   from  TAnDon_Roul_ConFig A
                        inner join TAnDon_Roul_ConFigUser B on A.id=B.ando_cogfigid
                        where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode and A.enable='Y'
                        where A.wkshp_code=@wkshopcode and A.andotype_code=@calltypecode
                        ) B  on A.usercode=B.usercode
                        where A.userclassid='0'";
                dynamicParams.Add("@wkshopcode", wkshopcode);
@@ -1920,30 +1903,19 @@
                dynamicParams.Add("@wkshopcode", wkshopcode);
                dynamicParams.Add("@calltypecode", calltypecode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
                if (json == null || json.Rows.Count <= 0)
                if (data.Rows.Count > 0)
                {
                    //清除安灯、设备任务配置表数据
                    sql = @"delete TAnDon_Roul_ConFig where id=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                    mid = Convert.ToInt32(data.Rows[0]["ID"].ToString());
                    //清除安灯、设备任务配置关联人员表数据
                    sql = @"delete TAnDon_Roul_ConFigUser  where ando_cogfigid=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                }
                else
                else 
                {
                    //清除安灯、设备任务配置表数据
                    sql = @"delete TAnDon_Roul_ConFig where id=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });
                    //清除安灯、设备任务配置关联人员表数据
                    sql = @"delete TAnDon_Roul_ConFigUser  where ando_cogfigid=@mid";
                    list.Add(new { str = sql, parm = new { mid = mid } });


                    //获取主表最大ID
                    sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+1,1) as id";
                    sql = @"select ISNULL(IDENT_CURRENT('TAnDon_Roul_ConFig')+1,1) as id";
                    var dt = DapperHelper.selecttable(sql);

                    mid = Convert.ToInt32(dt.Rows[0]["ID"].ToString());
                    //写入安灯、设备任务配置表数据
                    sql = @"insert into TAnDon_Roul_ConFig(wkshp_code,andotype_code,lm_user,lm_date,enable) values(@wkshp_code,@andotype_code,@lm_user,@lm_date,@enable)";
                    list.Add(new
@@ -1958,12 +1930,12 @@
                            enable = enable
                        }
                    });
                    //循环写入安灯、设备任务配置关联人员表
                    for (int i = 0; i < json.Rows.Count; i++)
                    {
                        sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,user_code) values(@usercode,@role_code)";
                        list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
                    }
                }
                //循环写入安灯、设备任务配置关联人员表
                for (int i = 0; i < json.Rows.Count; i++)
                {
                    sql = @"insert into TAnDon_Roul_ConFigUser(ando_cogfigid,usercode) values(@ando_cogfigid,@role_code)";
                    list.Add(new { str = sql, parm = new { ando_cogfigid = mid, role_code = json.Rows[i]["CODE"].ToString() } });
                }
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
@@ -2095,5 +2067,33 @@
            return mes;
        }
        #endregion


        #region[通过车间编码查找设备信息]
        public static ToMessage WhkspIsEqpSearch(string wkshpcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                //获取设备下拉框数据
                sql = @"select code as eqp_code,name as eqp_name  
                            from TEqpInfo where wksp_code=@wkshpcode and enable='Y' ";
                dynamicParams.Add("@wkshpcode", wkshpcode);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion
    }
}