YL
2021-10-20 83ec7ddc59ecf033d53af906ce9bcf36aa385d97
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -25,18 +25,18 @@
        /// </summary>
        [Route("Gy_Supplier/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string Organization)
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_Gy_SupplierList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + " order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -109,7 +109,16 @@
        {
            try
            {
                ds = oCN.RunProcReturn("select * from Gy_Supplier where HItemID=" + HInterID, "Gy_Supplier");
                string sql = string.Format(@"select  s.HItemID,s.HNumber 编码,s.HName 名称,s.HHelpCode  助记码,s.HShortName 简称,s.HAddress 地址,s.HLinkMan 联系人,s.HLinkPhone 联系电话
                                            ,s.HMobilePhone 手机,s.HFax 传真,s.HPostalCode 邮编,s.HEmail 电子邮件,s.HCorMan 法人代表,s.HBank 开户银行,s.HBankAccount 银行账号,
                                           s.HTaxNum 税务登记号,s.HEnglishName 英文名称,s.HEngLishAddress 英文地址,s.HCountry 国家,s.HStopflag 禁用标志
                                           ,s.HRemark 备注,s.HAreaID 地区ID,a.HName 地区名称,s.HTaxRate 增值税率,s.HCurID 默认货币ID,r.HName 默认货币,
                                           s.HSSID 结算方式ID,e.HName 结算方式 from Gy_Supplier s
                                           left join Gy_AreaSet a on s.HAreaID=a.HItemID
                                           left join Gy_Currency r on s.HCurID=r.HItemID
                                           left  join Gy_SettleStyle e on s.HSSID=e.HItemID
                                           where s.HItemID='" + HInterID + "'");
                ds = oCN.RunProcReturn(sql, "Gy_Supplier");
                objJsonResult.code = "1";
                objJsonResult.count = 1;
@@ -151,13 +160,14 @@
                List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg1);
                long HItemID = list[0].HItemID;
                long HItemID = list[0].HInterID;
                string HNumber = list[0].HNumber;
                string HShortNumber = list[0].HShortNumber;
                string HName = list[0].HName;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                string HEndFlag = list[0].HEnfFlag;
                string HStopflag = list[0].HStopflag;
                string HHelpCode = list[0].HHelpCode;
                string HShortName = list[0].HShortName;
                string HAddress = list[0].HAddress;
@@ -208,7 +218,7 @@
                    ",HTaxNum,HTaxRate,HCountry,HCorMan,HEnglishName" +
                    ",HEnglishAddress,HCurID,HSSID,HAreaID) " +
                " values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "','" + HParentID + "'" +
                "," + HLevel + ",'0','0','" + HRemark + "'" +
                "," + HLevel + ",0,'" + HStopflag + "','" + HRemark + "'" +
                ",'" + HShortName + "','" + HAddress + "','" + HLinkMan + "','" + HLinkPhone + "','" + HMobilePhone + "'" +
                ",'" + HFax + "','" + HPostalCode + "','" + HEmail + "','" + HBank + "','" + HBankAccount + "'" +
                ",'" + HTaxNum + "','" + HTaxRate + "','" + HCountry + "','" + HCorMan + "','" + HEnglishName + "'" +
@@ -261,14 +271,14 @@
                msg2 = "[" + msg2.ToString() + "]";
                List<Supplier> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Supplier>>(msg2);
                long HItemID = list[0].HItemID;
                long HItemID = list[0].HInterID;
                string HNumber = list[0].HNumber;
                string HShortNumber = list[0].HShortNumber;
                string HName = list[0].HName;
                long HParentID = list[0].HParentID;
                long HLevel = list[0].HLevel;
                string HEndFlag = list[0].HEnfFlag;
                bool HStopflag = list[0].HStopflag;
                string HStopflag = list[0].HStopflag;
                string HHelpCode = list[0].HHelpCode;
                string HShortName = list[0].HShortName;
                string HAddress = list[0].HAddress;
@@ -317,16 +327,6 @@
                    return objJsonResult;
                }
                if (oDept.HavSameNumber(HItemID, HNumber))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "代码重复!";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                //若MAINDI重复则重新获取
                oCN.BeginTran();
                //主表
@@ -336,7 +336,7 @@
                   ",HShortNumber='" + HShortNumber + "'" +
                   ",HParentID=" + HParentID.ToString() +
                   ",HLevel=" + HLevel.ToString() +
                   ",HStopflag=" + HStopflag +
                   ",HStopflag ='" + HStopflag + "'" +
                   ",HRemark= '" + HRemark + "'" +
                   ",HHelpCode='" + HHelpCode + "'" +
                   ",HShortName='" + HShortName + "'" +