王 垚
2021-12-23 6c66fff0a02b6860e63a1eb9791100130584084c
代码上传
1个文件已删除
2个文件已修改
1 文件已重命名
396 ■■■■■ 已修改文件
WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs 386 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/工资管理/Gy_ClassTimePrjSubController.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/基础资料/Gy_ClassTimePrjSub.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/WebAPI.csproj 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/BaseSet/Gy_ClassTimePrjController.cs
File was deleted
WebAPI/Controllers/¹¤×ʹÜÀí/Gy_ClassTimePrjSubController.cs
File was renamed from WebAPI/Controllers/BaseSet/Gy_ClassTimePrjSubController.cs
@@ -139,7 +139,7 @@
                string HSumWorkTimes = list[0].HSumWorkTimes;
                string HRate = list[0].HRate;
                decimal HSumMoney = list[0].HSumMoney;
                DateTime HYear = list[0].HYear;
                string HYear = list[0].HYear;
                decimal HPeriod = list[0].HSumMoney;
                decimal HOldRate = list[0].HOldRate;
                //保存
@@ -155,7 +155,7 @@
                    "," + HRate + "," + HSumMoney.ToString() + "," + HYear.ToString() + "," + HPeriod.ToString() +
                    "," + HOldRate.ToString() + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
                }
                else { 
@@ -176,7 +176,7 @@
                    //修改子项目代码
                    //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_Warehouse,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
                    //将上级 ä¸ºéžæœ«çº§
                    oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HItemID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.RunProc("Update Gy_ClassTimePrjSub set HStopflag=0 where HInterID=" + hparentid, ref DBUtility.ClsPub.sExeReturnInfo);
                    //
                    oCN.Commit();
                }
WebAPI/Models/»ù´¡×ÊÁÏ/Gy_ClassTimePrjSub.cs
@@ -13,7 +13,7 @@
        public string HName { get; set; }
        public string HNumber { get; set; }
        public long hparentid { get; set; }
        public DateTime HYear { get; set; }
        public string  HYear { get; set; }
        public decimal HPeriod { get; set; }
        public decimal HSumMoney { get; set; }
        public string HSumWorkTimes { get; set; }
WebAPI/WebAPI.csproj
@@ -279,7 +279,6 @@
    <Compile Include="App_Start\SwaggerConfig.cs" />
    <Compile Include="App_Start\WebApiConfig.cs" />
    <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
    <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
@@ -351,6 +350,7 @@
    <Compile Include="Controllers\博日自动扫码线\ScanlineAPIController.cs" />
    <Compile Include="Controllers\基础资料\基础资料\Gy_StockCheckItemBillController.cs" />
    <Compile Include="Controllers\工资管理\Gy_ClassTimePrjBillController.cs" />
    <Compile Include="Controllers\工资管理\Gy_ClassTimePrjSubController.cs" />
    <Compile Include="Controllers\工资管理\Pay_OtherBalBillController.cs" />
    <Compile Include="Controllers\工资管理\Pay_GroupBalBillController.cs" />
    <Compile Include="Controllers\PurchaseOrderController.cs" />