parent: 3ec6bd04 | 补丁 | 提交 | ignore whitespace
1
仲国强
2021-09-01 5bcd00a788426eeab0621711a7882ec9a10394f3 
1
4个文件已修改
92 ■■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_CustomerController.cs 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_SupplierController.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs


@@ -31,12 +31,12 @@


            {


                if (sWhere == null || sWhere.Equals(""))


                {


                    ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere, "h_v_Gy_CustomerList");


                    ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");


                }


                else


                {


                    string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 ";


                    string sql = sql1 + sWhere;


                    string sql = sql1 + sWhere + " order by HItemID desc";


                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");


                }


                if (ds == null || ds.Tables[0].Rows.Count == 0)


@@ -77,8 +77,17 @@


        {


            try


            {


                ds = oCN.RunProcReturn("select * from Gy_Customer where HItemID=" + HInterID, "Gy_Customer");




                string sql = string.Format(@"select  c.HItemID,c.HNumber 客户代码,c.HName 客户名称,c.HHelpCode  助记码,c.HShortName 简称,c.HAddress 地址,c.HLinkMan 联系人,c.HLinkPhone 联系电话


                                            ,c.HMobilePhone 手机,c.HFax 传真,c.HPostalCode 邮编,c.HEmail 电子邮件,c.HCorMan 法人代表,c.HBank 开户银行,c.HBankAccount 银行账号,


                                            c.HTaxNum 税务登记号,c.HTaxRate 增值税率,c.HEnglishName 英文名称,c.HEngLishAddress 英文地址,c.HCountry 国家,c.HCusStatus 客户状态


                                            ,c.HStopflag 禁用标志,c.HRemark 备注,c.HAreaID 地区ID,a.HName 地区名称,c.HCurID 默认货币ID,r.HName 默认货币,


                                            c.HSSID 结算方式ID,s.HName 结算方式,c.HCusTypeID 客户分类ID,t.HName 客户分类 from Gy_Customer c


                                            left join Gy_AreaSet a on c.HAreaID=a.HItemID


                                            left join Gy_Currency r on c.HCurID=r.HItemID 


                                            left  join Gy_SettleStyle s on c.HSSID=s.HItemID


                                            left  join Gy_CusType t on c.HCusTypeID=t.HItemID 


                                            where c.HItemID='" + HInterID + "'");


                ds = oCN.RunProcReturn(sql, "Gy_Customer");


                objJsonResult.code = "1";


                objJsonResult.count = 1;


                objJsonResult.Message = "";


@@ -255,7 +264,7 @@


                    ",HSubsidyAccrualRating,HCreditRating,HMaxCreditRating" +


                    ",HCusTypeID) " +


                    " 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 + "'" +


@@ -381,7 +390,7 @@


                    return objJsonResult;


                }




              






                //若MAINDI重复则重新获取


                oCN.BeginTran();


@@ -390,8 +399,8 @@


                    " HNumber='" + HNumber + "'" +


                    ",HName='" + HName + "'" +


                    ",HShortNumber='" + HShortNumber + "'" +


                    ",HLevel ='"+ HLevel + "'" +


                    ",HEndFlag  ='" + HEndFlag  + "'" +


                    ",HLevel ='" + HLevel + "'" +


                    ",HEndFlag  ='" + HEndFlag + "'" +


                    ",HParentID='" + HParentID + "'" +


                    ",HStopflag ='" + HStopflag + "'" +


                    ",HHelpCode ='" + HHelpCode + "'" +




 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs


@@ -31,12 +31,12 @@


            {


                if (sWhere == null || sWhere.Equals(""))


                {


                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere, "h_v_Gy_SupplierList");


                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + 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;


@@ -209,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 + "'" +




 WebAPI/Controllers/Sc_CheckToolsRepairWorkBillController.cs


@@ -515,7 +515,18 @@




        public static DataSet Sc_MouldRepairCheckBillList_s(string sWhere)


        {


            return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList ", "h_v_Sc_MouldRepairCheckBillList");


            DataSet ds;


            if (sWhere == null || sWhere.Equals(""))


            {


                ds = new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldRepairCheckBillList_Edit " + sWhere, "h_v_Sc_MouldRepairCheckBillList_Edit");


            }


            else


            {


                string sql1 = "select * from h_v_Sc_MouldRepairCheckBillList_Edit where 1 = 1 ";


                string sql = sql1 + sWhere;


                ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairCheckBillList_Edit");


            }


            return ds;


        }


        #endregion




@@ -1638,6 +1649,7 @@


            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);


            string msg2 = sArray[0].ToString();


            string msg3 = sArray[1].ToString();


            string msg4 = sArray[2].ToString();






            string UserName = "";


@@ -1651,7 +1663,7 @@


                lsmain = oListModels.getObjectByJson_Gy_MouldRepairCheckBillMain(msg2);


                foreach (Model.ClsSc_MouldRepairCheckBillMain oItem in lsmain)


                {


                    //oItem.HMaker = "";


                    oItem.HMaker = msg4;


                    UserName = oItem.HMaker;  //制单人


                    oItem.HBillType = "3817";


                    oItem.HBillSubType = "3817";




 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user


@@ -18,25 +18,25 @@


      <publishTime>02/22/2013 16:43:40</publishTime>


    </File>


    <File Include="bin/BLL.dll">


      <publishTime>09/01/2021 10:17:02</publishTime>


      <publishTime>08/31/2021 16:28:48</publishTime>


    </File>


    <File Include="bin/BLL.pdb">


      <publishTime>09/01/2021 10:17:02</publishTime>


      <publishTime>08/31/2021 16:28:48</publishTime>


    </File>


    <File Include="bin/DAL.dll">


      <publishTime>09/01/2021 10:17:00</publishTime>


      <publishTime>08/31/2021 16:28:46</publishTime>


    </File>


    <File Include="bin/DAL.pdb">


      <publishTime>09/01/2021 10:17:00</publishTime>


      <publishTime>08/31/2021 16:28:46</publishTime>


    </File>


    <File Include="bin/Dapper.dll">


      <publishTime>07/22/2016 22:52:40</publishTime>


    </File>


    <File Include="bin/DBUtility.dll">


      <publishTime>09/01/2021 10:16:59</publishTime>


      <publishTime>08/31/2021 16:28:44</publishTime>


    </File>


    <File Include="bin/DBUtility.pdb">


      <publishTime>09/01/2021 10:16:59</publishTime>


      <publishTime>08/31/2021 16:28:44</publishTime>


    </File>


    <File Include="bin/Interop.gregn6Lib.dll">


      <publishTime>08/25/2021 10:28:25</publishTime>


@@ -60,10 +60,10 @@


      <publishTime>07/25/2012 19:48:56</publishTime>


    </File>


    <File Include="bin/Model.dll">


      <publishTime>09/01/2021 10:16:59</publishTime>


      <publishTime>08/31/2021 16:28:45</publishTime>


    </File>


    <File Include="bin/Model.pdb">


      <publishTime>09/01/2021 10:16:59</publishTime>


      <publishTime>08/31/2021 16:28:45</publishTime>


    </File>


    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">


      <publishTime>08/25/2021 20:46:11</publishTime>


@@ -72,22 +72,22 @@


      <publishTime>08/04/2014 04:33:56</publishTime>


    </File>


    <File Include="bin/Pub_Class.dll">


      <publishTime>09/01/2021 10:16:57</publishTime>


      <publishTime>08/31/2021 16:28:42</publishTime>


    </File>


    <File Include="bin/Pub_Class.pdb">


      <publishTime>09/01/2021 10:16:57</publishTime>


      <publishTime>08/31/2021 16:28:42</publishTime>


    </File>


    <File Include="bin/Pub_Control.dll">


      <publishTime>09/01/2021 10:16:58</publishTime>


      <publishTime>08/31/2021 16:28:43</publishTime>


    </File>


    <File Include="bin/Pub_Control.pdb">


      <publishTime>09/01/2021 10:16:58</publishTime>


      <publishTime>08/31/2021 16:28:43</publishTime>


    </File>


    <File Include="bin/SQLHelper.dll">


      <publishTime>09/01/2021 10:16:58</publishTime>


      <publishTime>08/31/2021 16:28:43</publishTime>


    </File>


    <File Include="bin/SQLHelper.pdb">


      <publishTime>09/01/2021 10:16:58</publishTime>


      <publishTime>08/31/2021 16:28:43</publishTime>


    </File>


    <File Include="bin/stdole.dll">


      <publishTime>05/09/2021 13:35:37</publishTime>


@@ -189,10 +189,10 @@


      <publishTime>11/24/2014 19:18:48</publishTime>


    </File>


    <File Include="bin/WebAPI.dll">


      <publishTime>09/01/2021 10:17:03</publishTime>


      <publishTime>08/31/2021 16:28:49</publishTime>


    </File>


    <File Include="bin/WebAPI.pdb">


      <publishTime>09/01/2021 10:17:03</publishTime>


      <publishTime>08/31/2021 16:28:49</publishTime>


    </File>


    <File Include="bin/WebGrease.dll">


      <publishTime>07/18/2013 01:03:52</publishTime>


@@ -363,7 +363,7 @@


      <publishTime>08/06/2021 22:57:28</publishTime>


    </File>


    <File Include="Web.config">


      <publishTime>09/01/2021 10:17:09</publishTime>


      <publishTime>08/31/2021 16:28:55</publishTime>


    </File>


  </ItemGroup>


</Project>