PDA扫描模块退出功能调用方法修改，缓存列表删除功能调用方法修改；凯贝客户条码生成模块流水号字段类型修改

yxj

9 天以前 bdda209f00d8f03ab50acf7e219f71d7f68a375f

 WebAPI/Controllers/BLL/Xt_UserController.cs

@@ -1,6 +1,7 @@
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using Pub_Class;
using SyntacticSugar.constant;
using System;
using System.Collections;
using System.Collections.Generic;
@@ -107,6 +108,26 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //获取当前用户身份列表
                string sql = "select HLev from System_UserGroupInfo u " +
                        " left join System_UserGroup r " +
                        "on u.GroupId = r.GroupID where u.UserId = '" + HCzybm + "'";

                //用户身份判断
                DataSet hLev = oCN.RunProcReturn(sql, "System_UserGroupInfo");
                foreach(DataRow dr in hLev.Tables[0].Rows)
                {
                    if (!dr["HLev"].Equals(RoleConstant.EMPLOYEE))
                    {
                        objJsonResult.code = CodeConstant.FAIL;
                        objJsonResult.count = CountConstant.FAIL;
                        objJsonResult.Message = "管理员身份不允许删除！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }      

                oCN.BeginTran();
                //删除用户信息
                oCN.RunProc("delete from  Gy_Czygl where Czybm='" + HCzybm + "'");
@@ -200,20 +221,31 @@
                        return objJsonResult;
                    }

                    //判断用户数是否大于客户账号数
                    ds = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    oCN.RunProc("insert into Gy_Czygl (Czybm,Czymc,Czmm,Explain,HempID,HK3UserID " +
                    ",HKeeperID,HKeeper,HSecManagerID,HSecManager " +
                    ",HSellManID,HSellMan,HDeptID,HDept " +
                    ",HWhID,HWHName,HSupID,HSupName " +
                    ",HSCWHID,HSCWHName " +
                    ",HCloudUserName,HCloudUserPsd,HUSEORGID,HProcID" +
                    ",HGroupID,HSourceID,HCheckEmpID) " +
                    ",HGroupID,HSourceID,HCheckEmpID,HWorkCenterID,HICNumber,HDingDingUserID,HCusID) " +
                    "values ('" + lsmain[0].Czybm.ToString() + "','" + lsmain[0].Czymc.ToString() + "','" + ClsPub.StrToPsd(lsmain[0].Czmm.ToString()) + "','" + lsmain[0].Explain.ToString() + "','" + lsmain[0].HEmpID.ToString() + "',"+ lsmain[0].HK3UserID.ToString() + "" +
                    ","+ lsmain[0].HKeeperID.ToString() + ",'"+ lsmain[0].HKeeper.ToString() + "',"+ lsmain[0].HSecManagerID.ToString() + ",'"+ lsmain[0].HSecManager.ToString() + "'" +
                    "," + lsmain[0].HSellManID.ToString() + ",'" + lsmain[0].HSellMan.ToString() + "'," + lsmain[0].HDeptID.ToString() + ",'" + lsmain[0].HDept.ToString() + "'" +
                    "," + lsmain[0].HWhID.ToString() + ",'" + lsmain[0].HWHName.ToString() + "'," + lsmain[0].HSupID.ToString() + ",'" + lsmain[0].HSupName.ToString() + "'" +
                    "," + lsmain[0].HSCWHID.ToString() + ",'" + lsmain[0].HSCWHName.ToString() + "'" + 
                    ",'" + lsmain[0].HCloudUserName.ToString() + "','" + lsmain[0].HCloudUserPsd.ToString() + "',"+ lsmain[0].HOrgID.ToString() + "," + lsmain[0].HProcID.ToString() + "" +
                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + ")");
                    ","+ lsmain[0].HGroupID.ToString() + ","+ lsmain[0].HSourceID.ToString() + "," + lsmain[0].HCheckEmpID.ToString() + "," + lsmain[0].HWorkCenterID.ToString() + ",'" + lsmain[0].HICNumber + "','" + lsmain[0].HDingDingUserID + "','" + lsmain[0].HCusID + "'" + ")");

                    //新增后查询  确保数据添加成功
                    ds = oCN.RunProcReturn("Select * from  Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
@@ -239,6 +271,17 @@
                }
                else //修改
                {
                    //判断用户数是否大于客户账号数
                    ds = oCN.RunProcReturn("Exec h_p_Xt_BaseInfo ", "h_p_Xt_BaseInfo");
                    if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBack"]) != "0")
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = ds.Tables[0].Rows[0]["HBackRemark"].ToString();
                        objJsonResult.data = null;
                        return objJsonResult;
                    }

                    ds = oCN.RunProcReturn("select * from  Gy_Czygl where Czybm='" + lsmain[0].Czybm.ToString() + "'", "Gy_Czygl");
                    if (ds.Tables[0].Rows[0]["Czmm"].ToString() !=  lsmain[0].Czmm)  //修改密码
                    {
@@ -264,10 +307,14 @@
                        ",HProcID=" + lsmain[0].HProcID.ToString() +
                        ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                        ",HGroupID=" + lsmain[0].HGroupID.ToString() +
                        ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                        ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                        ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                        ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                        ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
                        ",HICNumber='" + lsmain[0].HICNumber + "'" +
                        ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
                        ",HCusID='" + lsmain[0].HCusID + "'" +
                        "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                    }
                    else
@@ -293,10 +340,14 @@
                            ",HProcID=" + lsmain[0].HProcID.ToString() +
                           ",HSourceID=" + lsmain[0].HSourceID.ToString() +
                           ",HGroupID=" + lsmain[0].HGroupID.ToString() +
                           ",HWorkCenterID=" + lsmain[0].HWorkCenterID.ToString() +
                           ",HSupName='" + lsmain[0].HSupName.ToString() + "'" +
                           ",HCloudUserName='" + lsmain[0].HCloudUserName.ToString() + "'" +
                           ",HCloudUserPsd='" + lsmain[0].HCloudUserPsd.ToString() + "'" +
                           ",HUSEORGID=" + lsmain[0].HOrgID.ToString() +
                           ",HICNumber='" + lsmain[0].HICNumber + "'" +
                           ",HDingDingUserID='" + lsmain[0].HDingDingUserID + "'" +
                           ",HCusID='" + lsmain[0].HCusID + "'" +
                           "  where  Czybm='" + lsmain[0].Czybm.ToString() + "'");
                    }

@@ -331,8 +382,6 @@
            }
        }
        #endregion



        #region  根据用户编码查找已分配供应商列表
        [Route("Xt_User/SupperPlaylist")]
@@ -792,6 +841,7 @@
            }
        }
        #endregion

        #region 用户关联组织维护 删除
        /// <summary>
        ///参数：string HInterID。
@@ -826,7 +876,7 @@

                oCN.BeginTran();

                string sql = "delete from Gy_UserORGRelation where HItemID = " + HInterID;
                string sql = "delete from Gy_UserByOrgRelation where HItemID = " + HInterID;
                oCN.RunProc(sql);

                oCN.Commit();
@@ -847,6 +897,7 @@
            }
        }
        #endregion

        #region 用户关联组织维护 编辑初始化
        /// <summary>
        ///参数：string sql。
@@ -889,6 +940,7 @@
            }
        }
        #endregion

        #region 用户关联组织维护 保存
        [Route("Xt_User/UserRelationOrganizationList_Save")]
        [HttpPost]
@@ -940,11 +992,11 @@
                        string HOrgName = item["HOrgName"].ToString();      //组织名称


                        sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
                        ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
                        sql = "select * from Gy_UserByOrgRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID;
                        ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
                        if (ds.Tables[0].Rows.Count == 0)
                        {
                            sql = "insert into Gy_UserORGRelation(HUserID,HOrgID)" +
                            sql = "insert into Gy_UserByOrgRelation(HUserID,HOrgID)" +
                                "values(" +
                                "'" + HUserID + "'" +
                                "," + HOrgID + "" +
@@ -983,15 +1035,15 @@
                        string HOrgNumber = item["HOrgNumber"].ToString();  //组织代码
                        string HOrgName = item["HOrgName"].ToString();      //组织名称

                        sql = "select * from Gy_UserORGRelation where HItemID = " + HItemID;
                        ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
                        sql = "select * from Gy_UserByOrgRelation where HItemID = " + HItemID;
                        ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
                        if (ds.Tables[0].Rows.Count > 0)
                        {
                            sql = "select * from Gy_UserORGRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID + " and HItemID <> " + HItemID;
                            ds = oCN.RunProcReturn(sql, "Gy_UserORGRelation");
                            sql = "select * from Gy_UserByOrgRelation where HUserID = '" + HUserID + "' and HOrgID = " + HOrgID + " and HItemID <> " + HItemID;
                            ds = oCN.RunProcReturn(sql, "Gy_UserByOrgRelation");
                            if (ds.Tables[0].Rows.Count == 0)
                            {
                                sql = "update Gy_UserORGRelation set " +
                                sql = "update Gy_UserByOrgRelation set " +
                                      "HUserID = '" + HUserID + "' " +
                                      ",HOrgID = " + HOrgID + " " +
                                      "where HItemID = " + HItemID;
@@ -1543,6 +1595,168 @@
                objJsonResult.count = 0;
                objJsonResult.Message = "保存失败！" + e.ToString();
                objJsonResult.data = 1;
                return objJsonResult;
            }
        }
        #endregion

        #region 用户关联部门查询
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist")]
        [HttpGet]
        public object UserRelationDeptlist(string sWhere, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "";


                if (sWhere == null || sWhere.Equals(""))
                {
                    sql = "select * from h_v_Gy_UserDeptRelationList_Query order by 用户代码 asc,部门代码 asc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
                }
                else
                {
                    sql = "select * from h_v_Gy_UserDeptRelationList_Query where 1=1 ";
                    sql = sql + sWhere + " order by 用户代码 asc,部门代码 asc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 用户关联部门 根据用户ID查找
        /// <summary>
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist_EditInit")]
        [HttpGet]
        public object UserRelationDeptlist_EditInit(int HItemID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Query", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无查看权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                string sql = "select * from h_v_Gy_UserDeptRelationList_Query where HItemID = " + HItemID;
                ds = oCN.RunProcReturn(sql, "h_v_Gy_UserDeptRelationList_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region 用户关联部门 删除
        /// <summary>
        ///参数：string HInterID。
        ///返回值：object。
        /// </summary>
        [Route("Xt_User/UserRelationDeptlist_Drop")]
        [HttpGet]
        public object UserRelationDeptlist_Drop(string HInterID, string user)
        {
            try
            {
                string s = "";

                //查看权限
                if (!DBUtility.ClsPub.Security_Log("Gy_UserRelationDept_Drop", 1, false, user))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无删除权限！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                if (HInterID == null || HInterID.Equals(""))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID不能为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                oCN.BeginTran();

                string sql = "delete from Gy_UserDeptRelation where HItemID = " + HInterID;
                oCN.RunProc(sql);

                oCN.Commit();

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
@@ -2255,6 +2469,7 @@
            }
        }
        #endregion

        #region 用户关联职员维护 删除
        /// <summary>
        ///参数：string HInterID。
@@ -2310,6 +2525,7 @@
            }
        }
        #endregion

        #region 用户关联职员维护 编辑初始化
        /// <summary>
        ///参数：string sql。
@@ -2352,6 +2568,7 @@
            }
        }
        #endregion

        #region 用户关联职员维护 保存
        [Route("Xt_User/UserRelationEmployeelist_Save")]
        [HttpPost]
@@ -2816,6 +3033,7 @@
            }
        }
        #endregion

        #region  查询指定用户所关联客户中的客户
        [Route("Xt_User/CustomerPlaylistFromUserCustomerList")]
        [HttpGet]
@@ -2869,6 +3087,7 @@
            }
        }
        #endregion

        #region 用户关联客户保存
        [Route("Xt_User/SaveUserCustomer")]
        [HttpPost]
@@ -2925,6 +3144,7 @@
            }
        }
        #endregion


        #region 用户关联客户 文件上传
        [Route("Xt_User/Gy_UserCustomer_ImportByExcel")]
@@ -3086,6 +3306,7 @@
            }
        }
        #endregion

        #region 用户关联客户 导入(数据验证)
        [Route("Xt_User/Gy_UserCustomer_ImportByExcel_Confirm")]
        [HttpPost]
@@ -3266,6 +3487,7 @@
            }
        }
        #endregion

        #region 用户关联客户 导入(保存)
        [Route("Xt_User/Gy_UserCustomer_ImportByExcel_Save")]
        [HttpPost]
@@ -3556,6 +3778,7 @@
            }
        }
        #endregion

        #region 用户关联客户维护 编辑初始化
        /// <summary>
        ///参数：string sql。
@@ -3598,6 +3821,7 @@
            }
        }
        #endregion

        #region 用户关联客户维护 保存
        [Route("Xt_User/UserRelationCustomerlist_Save")]
        [HttpPost]
@@ -3756,6 +3980,7 @@
            }
        }
        #endregion


        #region  根据用户编码查找已分配工序列表
        [Route("Xt_User/ProcessPlaylist")]
@@ -4299,5 +4524,33 @@
            }
        }
        #endregion

        #region 根据用户关联组织 过滤条件
        [Route("Xt_User/getOrgIDListByUser")]
        [HttpGet]
        public object getOrgIDListByUser(string UserID, string UserName,string HOrgID)
        {            
            try
            {
              
                //根据用户ID 查询用户关联组织表
                ds = oCN.RunProcReturn("exec h_p_GetHorgIDByUser_Query '"+ UserID + "','"+ UserName + "','"+ HOrgID + "'", "h_p_GetHorgIDByUser_Query");

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {               
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}