工程项目，工程信息页签里 增加 工程相关 字段（见清单）； 工程类：任务下达（改为 短文本 ），分包单位（供应商），管理员（职员），材料计划（日期类型...

duhe

2024-11-11 f1685fb91078e9373cbed98a6774421e30063c67

工程项目，工程信息页签里 增加 工程相关 字段（见清单）； 工程类：任务下达（改为 短文本 ），分包单位（供应商），管理员（职员），材料计划（日期类型），施工员（职员） 计划工期（数字），实际工期（数字），试压日期（日期类型），试压验收人（职员），试压记录（长文本） 排污日期（日期类型），通水日期（日期类型），竣工图编号，竣工资料，施工完成情况（长文本） 预算类：预算造价，合同造价，结算造价，审计造价，材料费，安装费，班组工费，预收款，工费结账，结算结账 增加一个 项目信息 的页签， 把 （客户，实施担当，开发担当，对应产品，产品名称，项目阶段清单，项目难易类型，结算方，结算金额，合同总金额，产品费，实施费用，其他费用，合同实施人天，合同二次开发人天） 迁移到 项目信息 的页签里； 增加必录项目：项目名称 取消必录项目：实施担当，开发担当，对应产品，结算方； 并且 子表允许为空； 单据号 在新增和修改的情况下，改为可编辑；

 APSM/bin/Release/APSM.dll

Binary files differ

 APSM/bin/Release/APSM.pdb

Binary files differ

 DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache

Binary files differ

 Model/obj/Release/Model.csproj.AssemblyReference.cache

Binary files differ

 PayM/bin/x86/Debug/BLL.dll

Binary files differ

 PayM/bin/x86/Debug/BLL.pdb

Binary files differ

 PayM/bin/x86/Debug/DAL.dll

Binary files differ

 PayM/bin/x86/Debug/DAL.pdb

Binary files differ

 PayM/bin/x86/Debug/DBUtility.dll

Binary files differ

 PayM/bin/x86/Debug/DBUtility.pdb

Binary files differ

 PayM/bin/x86/Debug/Model.dll

Binary files differ

 PayM/bin/x86/Debug/Model.pdb

Binary files differ

 PayM/bin/x86/Debug/PayM.dll

Binary files differ

 PayM/bin/x86/Debug/PayM.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Class.pdb

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.dll

Binary files differ

 PayM/bin/x86/Debug/Pub_Control.pdb

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.dll

Binary files differ

 PayM/bin/x86/Debug/SQLHelper.pdb

Binary files differ

 PayM/obj/x86/Debug/PayM.csproj.AssemblyReference.cache

Binary files differ

 PayM/obj/x86/Debug/PayM.dll

Binary files differ

 PayM/obj/x86/Debug/PayM.pdb

Binary files differ

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillController.cs

@@ -101,6 +101,31 @@
            public string HContacts;
            public string HContactNumber;

            public int HSupplierID;                  //分包单位（gy_supllier）
            public int HMangerEmpID;                 //管理员（gy_Employee）
            public string HMaterPlanDate;               //材料计划 
            public int HWorkerID;                    //施工员（gy_Employee）
            public double HPlanWorkTimes;               //计划工期
            public double HRelWorkTimes;                //实际工期
            public string HTestDate;                    //试压日期
            public int HTestCheckerID;               //试压验收人（gy_Employee）
            public string HTestNote;                    //试压记录（富文本）
            public string HSewageDate;                  //排污日期
            public string HWaterSupplyDate;             //通水日期
            public string HWorkNote;                    //竣工资料（富文本）
            public string HWorkProcNote;                //施工完成情况（富文本）

            public double HYuSuanMoney;                 //预算造价
            public double HHeTongMoney;                 //合同造价
            public double HJieSuanMoney;                //结算造价
            public double HShenJiMoney;                 //审计造价
            public double HCaiLiaoMoney;                //材料费
            public double HAnZhuangMoney;               //安装费
            public double HBanZuMoney;                  //班组工费
            public double HYuShouKuanMoney;             //预收款
            public double HGongFeiMoney;                //工费结账
            public double HJieZhangMoney;                //结算结账

        }
        #endregion
        #region å·¥ç¨‹é¡¹ç›® é¡¹ç›®é˜¶æ®µè¡¨ä½“数据
@@ -254,6 +279,34 @@
                string HProjectNote = mainList[0].HProjectNote;
                string HContacts = mainList[0].HContacts;
                string HContactNumber = mainList[0].HContactNumber;


                int HSupplierID = mainList[0].HSupplierID;                      //分包单位（gy_supllier）
                int HMangerEmpID = mainList[0].HMangerEmpID;                    //管理员（gy_Employee）
                string HMaterPlanDate = mainList[0].HMaterPlanDate;             //材料计划 
                int HWorkerID = mainList[0].HWorkerID;                          //施工员（gy_Employee）
                double HPlanWorkTimes = mainList[0].HPlanWorkTimes;             //计划工期
                double HRelWorkTimes = mainList[0].HRelWorkTimes;               //实际工期
                string HTestDate = mainList[0].HTestDate;                       //试压日期
                int HTestCheckerID = mainList[0].HTestCheckerID;                //试压验收人（gy_Employee）
                string HTestNote = mainList[0].HTestNote;                       //试压记录（富文本）
                string HSewageDate = mainList[0].HSewageDate;                   //排污日期
                string HWaterSupplyDate = mainList[0].HWaterSupplyDate;         //通水日期
                string HWorkNote = mainList[0].HWorkNote;                       //竣工资料（富文本）
                string HWorkProcNote = mainList[0].HWorkProcNote;               //施工完成情况（富文本）

                double HYuSuanMoney = mainList[0].HYuSuanMoney;                 //预算造价
                double HHeTongMoney = mainList[0].HHeTongMoney;                 //合同造价
                double HJieSuanMoney = mainList[0].HJieSuanMoney;               //结算造价
                double HShenJiMoney = mainList[0].HShenJiMoney;                 //审计造价
                double HCaiLiaoMoney = mainList[0].HCaiLiaoMoney;               //材料费
                double HAnZhuangMoney = mainList[0].HAnZhuangMoney;             //安装费
                double HBanZuMoney = mainList[0].HBanZuMoney;                   //班组工费
                double HYuShouKuanMoney = mainList[0].HYuShouKuanMoney;         //预收款
                double HGongFeiMoney = mainList[0].HGongFeiMoney;               //工费结账
                double HJieZhangMoney = mainList[0].HJieZhangMoney;                //结算结账


                if (OperationType == 2)
                {
                    ds = oCN.RunProcReturn("select * from PM_ProjectBillMain where HBillNo ='" + HBillNo + "'", "PM_ProjectBillMain");
@@ -273,7 +326,8 @@
                {
                    string sql = "insert into PM_ProjectBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HProNumber,HProName,HCusID,HBeginDate,HEndDate,HSumMoney," +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber) " +
                        "HProMoney,HWorkMoney,HOtherMoney,HProType,HPMEmpID,HWorkEmpID,HDepEmpID,HConWorkDays,HDepDays,HLastMoney,HPayCusID,HOrgID,HMaterID,HProjectClassID,HBuildComp,HBuildAddress,HWorkNo,HReDate,HPicNo,HWorkTask,HProjectNote,HContacts,HContactNumber" +
                        ",HSupplierID,HMangerEmpID,HMaterPlanDate,HWorkerID,HPlanWorkTimes,HRelWorkTimes,HTestDate,HTestCheckerID,HTestNote,HSewageDate,HWaterSupplyDate,HWorkNote,HWorkProcNote,HYuSuanMoney,HHeTongMoney,HJieSuanMoney,HShenJiMoney,HCaiLiaoMoney,HAnZhuangMoney,HBanZuMoney,HYuShouKuanMoney,HGongFeiMoney,HJieZhangMoney) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -315,7 +369,30 @@
                        "','" + HProjectNote +
                        "','" + HContacts +
                        "','" + HContactNumber +
                        "')";
                        "','" + HSupplierID + "'" + 
                        ",'" + HMangerEmpID + "'" + 
                        ",'" + HMaterPlanDate + "'" + 
                        ",'" + HWorkerID + "'" + 
                        ",'" + HPlanWorkTimes + "'" + 
                        ",'" + HRelWorkTimes + "'" + 
                        ",'" + HTestDate + "'" + 
                        ",'" + HTestCheckerID + "'" + 
                        ",'" + HTestNote + "'" + 
                        ",'" + HSewageDate + "'" + 
                        ",'" + HWaterSupplyDate + "'" + 
                        ",'" + HWorkNote + "'" + 
                        ",'" + HWorkProcNote + "'" + 
                        ",'" + HYuSuanMoney + "'" + 
                        ",'" + HHeTongMoney + "'" + 
                        ",'" + HJieSuanMoney + "'" + 
                        ",'" + HShenJiMoney + "'" + 
                        ",'" + HCaiLiaoMoney + "'" + 
                        ",'" + HAnZhuangMoney + "'" + 
                        ",'" + HBanZuMoney + "'" + 
                        ",'" + HYuShouKuanMoney + "'" + 
                        ",'" + HGongFeiMoney + "'" + 
                        ",'" + HJieZhangMoney + "'" +
                        ")";

                    //主表
                    oCN.RunProc(sql);
@@ -364,6 +441,32 @@
                        "',HProjectNote ='" + HProjectNote +
                        "',HContacts ='" + HContacts +
                        "',HContactNumber ='" + HContactNumber +

                        "',HSupplierID = '" + HSupplierID +
                        "',HMangerEmpID = '" + HMangerEmpID +
                        "',HMaterPlanDate = '" + HMaterPlanDate +
                        "',HWorkerID = '" + HWorkerID +
                        "',HPlanWorkTimes = '" + HPlanWorkTimes +
                        "',HRelWorkTimes = '" + HRelWorkTimes +
                        "',HTestDate = '" + HTestDate +
                        "',HTestCheckerID = '" + HTestCheckerID +
                        "',HTestNote = '" + HTestNote +
                        "',HSewageDate = '" + HSewageDate +
                        "',HWaterSupplyDate = '" + HWaterSupplyDate +
                        "',HWorkNote = '" + HWorkNote +
                        "',HWorkProcNote = '" + HWorkProcNote +
                        "',HYuSuanMoney = '" + HYuSuanMoney +
                        "',HHeTongMoney = '" + HHeTongMoney +
                        "',HJieSuanMoney = '" + HJieSuanMoney +
                        "',HShenJiMoney = '" + HShenJiMoney +
                        "',HCaiLiaoMoney = '" + HCaiLiaoMoney +
                        "',HAnZhuangMoney = '" + HAnZhuangMoney +
                        "',HBanZuMoney = '" + HBanZuMoney +
                        "',HYuShouKuanMoney = '" + HYuShouKuanMoney +
                        "',HGongFeiMoney = '" + HGongFeiMoney +
                        "',HJieZhangMoney = '" + HJieZhangMoney +


                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);

 WebAPI/Properties/PublishProfiles/FolderProfile6.pubxml.user

@@ -4,7 +4,7 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <History>True|2024-11-07T02:03:15.6008864Z;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <History>True|2024-11-11T07:03:29.1473573Z;True|2024-11-11T14:52:17.0201354+08:00;True|2024-11-11T14:16:53.8725631+08:00;True|2024-11-11T13:04:30.9909737+08:00;False|2024-11-11T13:04:04.3586012+08:00;True|2024-11-07T13:54:38.7153293+08:00;False|2024-11-07T13:54:23.0036881+08:00;False|2024-11-07T13:53:56.1173012+08:00;True|2024-11-07T10:03:15.6008864+08:00;True|2024-11-07T09:45:59.3293360+08:00;False|2024-11-07T09:45:15.0034274+08:00;True|2024-11-04T14:38:54.4763789+08:00;True|2024-10-31T16:00:46.6075171+08:00;True|2024-10-31T15:22:22.3369744+08:00;True|2024-10-31T12:51:43.2180719+08:00;False|2024-10-31T12:50:50.6521635+08:00;True|2024-10-31T12:14:45.2826348+08:00;True|2024-10-31T09:58:20.1772497+08:00;False|2024-10-31T09:57:06.4220474+08:00;True|2024-10-29T08:23:40.1187027+08:00;False|2024-10-29T08:22:57.5875931+08:00;True|2024-10-28T16:59:15.9197469+08:00;True|2024-10-28T14:29:39.0107178+08:00;False|2024-10-28T14:28:48.1635009+08:00;True|2024-10-25T13:45:33.6424342+08:00;True|2024-10-25T09:58:38.8392001+08:00;False|2024-10-25T09:57:49.7417333+08:00;True|2024-10-18T16:43:35.1364495+08:00;False|2024-10-18T16:42:59.5332813+08:00;True|2024-10-18T11:56:15.8267584+08:00;False|2024-10-18T11:55:41.7667883+08:00;True|2024-10-17T16:35:21.5250546+08:00;True|2024-10-17T15:39:45.6140281+08:00;True|2024-10-17T15:13:04.7104524+08:00;True|2024-10-17T14:54:20.5672206+08:00;True|2024-10-17T13:03:49.0562978+08:00;True|2024-10-16T11:57:09.2205029+08:00;True|2024-10-16T11:47:09.1175797+08:00;True|2024-10-16T11:12:45.2631759+08:00;False|2024-10-16T11:11:57.2236500+08:00;True|2024-10-15T16:20:02.9116206+08:00;True|2024-10-15T15:58:43.2926050+08:00;True|2024-10-15T15:42:21.7936803+08:00;True|2024-10-15T15:08:43.2300880+08:00;True|2024-10-15T14:57:53.1025144+08:00;True|2024-10-15T14:49:52.0203753+08:00;True|2024-10-15T13:43:28.4322672+08:00;True|2024-10-15T13:02:51.9833820+08:00;True|2024-10-15T10:35:13.3052884+08:00;True|2024-10-15T10:31:23.7280933+08:00;True|2024-10-15T10:16:45.0292893+08:00;True|2024-10-15T09:59:30.2256849+08:00;True|2024-10-15T09:53:37.7284098+08:00;True|2024-10-15T09:45:34.6928334+08:00;False|2024-10-15T09:45:08.0828173+08:00;True|2024-10-15T09:20:15.0444151+08:00;False|2024-10-15T09:18:15.4388995+08:00;True|2024-10-14T15:31:49.0978922+08:00;False|2024-10-14T15:31:08.3741419+08:00;True|2024-10-14T15:09:44.3508500+08:00;True|2024-10-14T14:45:34.5430843+08:00;True|2024-10-14T14:04:11.8258435+08:00;True|2024-10-14T13:54:24.2353356+08:00;True|2024-10-14T13:48:16.0893349+08:00;False|2024-10-14T13:47:57.1909782+08:00;True|2024-10-14T11:12:14.9583385+08:00;False|2024-10-14T11:11:21.0058133+08:00;True|2024-10-11T16:49:55.1188159+08:00;True|2024-10-11T16:11:04.2021026+08:00;True|2024-10-11T15:48:50.7687290+08:00;True|2024-10-11T15:33:27.8527915+08:00;True|2024-10-11T14:49:01.6142514+08:00;False|2024-10-11T14:48:33.6149374+08:00;True|2024-10-11T13:50:33.4424142+08:00;False|2024-10-11T13:41:53.6580199+08:00;False|2024-10-11T13:41:39.5167380+08:00;False|2024-10-11T13:37:52.6531605+08:00;False|2024-10-11T13:37:11.7263329+08:00;</History>
    <_PublishTargetUrl>D:\网站发布\智云MESWMS\API</_PublishTargetUrl>
  </PropertyGroup>
  <ItemGroup>
@@ -294,13 +294,13 @@
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/07/2024 10:03:09</publishTime>
      <publishTime>11/11/2024 15:03:20</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/07/2024 10:03:09</publishTime>
      <publishTime>11/11/2024 15:03:20</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>11/07/2024 10:03:14</publishTime>
      <publishTime>11/11/2024 15:03:28</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>

 sdk_dingding/TopSdk/bin/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/bin/Debug/TopSdk.pdb

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.dll

Binary files differ

 sdk_dingding/TopSdk/obj/Debug/TopSdk.pdb

Binary files differ