zzr99
2021-11-19 64c5349d0ac0d4888b3dd3da3ec3e7cb35a341fc
设备保养点检记录选择设备带出规程记录
4个文件已修改
150 ■■■■ 已修改文件
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/WebAPIController.cs 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Models/ClsGy_EquipFileMain.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebAPI/Controllers/SBGL/Gy_EquipFileMainController.cs
@@ -202,6 +202,8 @@
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier) 
                string HMaker = msg4;
                string HMakeDate = DateTime.Now.Date.ToString();
                int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
                int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -217,11 +219,11 @@
                oCN.RunProc("Insert into Gy_EquipFileBillMain " +
                   " (hbillno,HEquipFileNumber,HEquipFileNo,HName,HModel,HModel2,HMaterID,HUnitID,HOutComDate" +
                   ",HOutComNo,HDeptID,HUseEmpID,HRepairEmpID,HAddress,HSetupDate,HStartupDate,HStatus," +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate) " +
                   "HEquipFileTypeID,HProNum,HBarCode,HWorkArea,HLogo,HSellSupID,HMakeSupID,hbilltype,HDate,HYear,HMaker,HMakeDate,HEquipMaintainRuleInterID,HEquipDotCheckRuleInterID) " +
                   " Values('" + hbillno + "','" + HEquipFileNumber + "','" + HEquipFileNo + "','" + HName + "','" + HModel + "','" + HModel2 + "'," + HMaterID + "," + HUnitID +
                   ",'" + HOutComDate + "','" + HOutComNo + "'," + HDeptID + "," + HUseEmpID + "," + HRepairEmpID + ",'" + HAddress +
                   "','" + HSetupDate + "','" + HStartupDate + "','" + HStatus + "'," + HEquipFileTypeID + ",'" + HProNum +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +
                   "','" + HBarCode + "','" + HWorkArea + "','" + HLogo + "'," + HSellSupID + "," + HMakeSupID +",'3308','" + HDate +"','"+ HYear+ "','" + HMaker + "','" + HMakeDate +"','"+ HEquipMaintainRuleInterID+"','"+ HEquipDotCheckRuleInterID+
                   "')", ref DBUtility.ClsPub.sExeReturnInfo);
                //修改上级为非末级代码
                oCN.Commit();
@@ -289,6 +291,8 @@
                int HMakeSupID = list[0].HMakeSupID;              // int        //制造商 (Gy_Supplier)
                string HUpDater = msg4;
                string HUpDateDate = DateTime.Now.Date.ToString();
                int HEquipDotCheckRuleInterID = list[0].HEquipDotCheckRuleInterID;
                int HEquipMaintainRuleInterID = list[0].HEquipMaintainRuleInterID;
                if (!DBUtility.ClsPub.AllowNumber(HEquipFileNumber))
                {
@@ -340,6 +344,8 @@
                    ",HMakeSupID= " + HMakeSupID +
                    ",HUpDater= '" + HUpDater + "'" +
                    ",HUpDateDate= '" + HUpDateDate + "'" +
                    ",HEquipDotCheckRuleInterID='"+ HEquipDotCheckRuleInterID+"'"+
                    ",HEquipMaintainRuleInterID='"+ HEquipMaintainRuleInterID+"'"+
                    " Where HInterID=" + HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
                //修改子项目代码
                //oCN.RunProc("exec h_p_Gy_UpdateNumber Gy_RepairCheck,'" + HNumber + ".','" + this.HOldNumber + ".'", ref DBUtility.ClsPub.sExeReturnInfo);
WebAPI/Controllers/WebAPIController.cs
@@ -2178,6 +2178,110 @@
            }
        }
         /// <summary>
        /// 根据设备显示设备保养规程项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetMaintainItemtemByEquipProjectID")]
        [HttpGet]
        public object GetMaintainItemtemByEquipProjectID(int EquipProjectID)
        {
            if (EquipProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "产品器具未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select t.HMaintainItemID HMaintainItemID,m.HNumber HMaintainItemNumber,t.HMaintainItem HMaintainItem,t.HMaintainPart HMaintainPart,t.HClaim HClaim,t.HManagerID HManagerID,e.HNumber HManagerNumber,e.HName HManagerName,a.HRemark
                                                from Sb_EquipMaintainRuleBillMain a left join Sb_EquipMaintainRuleBillSub_Item t on a.HInterID=t.HInterID
                                                left join Gy_Maintain m on m.HItemID=t.HMaintainItemID
                                                left join Gy_Employee e on e.HItemID=t.HManagerID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
                ds = oCN.RunProcReturn(sql, "Sb_EquipMaintainRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 根据设备显示设备点检程项目
        /// </summary>
        /// <returns></returns>
        [Route("Web/GetDotCheckRuleItemByEquipProjectID")]
        [HttpGet]
        public object GetDotCheckRuleItemByEquipProjectID(int EquipProjectID)
        {
            if (EquipProjectID <= 0)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "产品器具未选择";
                objjson.data = null;
                return objjson;
            }
            try
            {
                SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                string sql = string.Format(@"select b.HDotCheckItemID HDotCheckItemID,c.HNumber HDotCheckCode,b.HDotCheckItem,b.HDotCheckPart,b.HClaim,
                                    b.HManagerID,e.HNumber HManagerCode,e.HName HManagerName,b.HRemark from Sb_EquipDotCheckRuleBillMain  a
                                    left join Sb_EquipDotCheckRuleBillSub b on a.HInterID=b.HInterID
                                    left join Gy_QCCheckItem c on c.HItemID=b.HDotCheckItemID
                                     left join Gy_Employee e on e.HItemID=b.HManagerID
                                    where a.HInterID=(select HEquipDotCheckRuleInterID from Gy_EquipFileBillMain where HInterID=" + EquipProjectID + ") ");
                ds = oCN.RunProcReturn(sql, "Sb_EquipDotCheckRuleBillMain");
                if (ds == null || ds.Tables[0].Rows.Count <= 0)
                {
                    objjson.code = "0";
                    objjson.count = 0;
                    objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
                    objjson.data = null;
                    return objjson;
                }
                else
                {
                    objjson.code = "1";
                    objjson.count = 1;
                    objjson.Message = "获取成功!";
                    objjson.data = ds.Tables[0];
                    return objjson;
                }
            }
            catch (Exception ex)
            {
                objjson.code = "0";
                objjson.count = 0;
                objjson.Message = "获取失败" + ex.ToString();
                objjson.data = null;
                return objjson;
            }
        }
        /// <summary>
        /// 获取维修项目列表
WebAPI/Models/ClsGy_EquipFileMain.cs
@@ -30,6 +30,8 @@
        public string HLogo;                //√        varchar(50)    //品牌
        public int HSellSupID;              // √    int        //供应商(Gy_Supplier)
        public int HMakeSupID;              // int        //制造商 (Gy_Supplier) 
        public int HEquipDotCheckRuleInterID;
        public int HEquipMaintainRuleInterID;
    }
}
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
      <publishTime>02/22/2013 08:43:40</publishTime>
    </File>
    <File Include="bin/BLL.dll">
      <publishTime>11/17/2021 17:22:47</publishTime>
      <publishTime>11/19/2021 17:06:10</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>11/17/2021 17:22:47</publishTime>
      <publishTime>11/19/2021 17:06:10</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>11/17/2021 17:22:44</publishTime>
      <publishTime>11/19/2021 17:06:06</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>11/17/2021 17:22:44</publishTime>
      <publishTime>11/19/2021 17:06:06</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 14:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>11/17/2021 17:22:38</publishTime>
      <publishTime>11/19/2021 17:06:00</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>11/17/2021 17:22:38</publishTime>
      <publishTime>11/19/2021 17:06:00</publishTime>
    </File>
    <File Include="bin/Interop.gregn6Lib.dll">
      <publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
      <publishTime>07/25/2012 11:48:56</publishTime>
    </File>
    <File Include="bin/Model.dll">
      <publishTime>11/17/2021 17:22:39</publishTime>
      <publishTime>11/19/2021 17:06:01</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>11/17/2021 17:22:39</publishTime>
      <publishTime>11/19/2021 17:06:01</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
      <publishTime>08/03/2014 20:33:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>11/17/2021 17:22:36</publishTime>
      <publishTime>11/19/2021 17:05:56</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>11/17/2021 17:22:36</publishTime>
      <publishTime>11/19/2021 17:05:56</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>11/17/2021 17:22:37</publishTime>
      <publishTime>11/19/2021 17:05:58</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>11/17/2021 17:22:37</publishTime>
      <publishTime>11/19/2021 17:05:58</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>11/17/2021 17:22:37</publishTime>
      <publishTime>11/19/2021 17:05:58</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>11/17/2021 17:22:37</publishTime>
      <publishTime>11/19/2021 17:05:58</publishTime>
    </File>
    <File Include="bin/stdole.dll">
      <publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
      <publishTime>11/24/2014 11:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>11/17/2021 17:22:52</publishTime>
      <publishTime>11/19/2021 17:06:15</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>11/17/2021 17:22:52</publishTime>
      <publishTime>11/19/2021 17:06:15</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
      <publishTime>08/06/2021 22:57:28</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>11/17/2021 17:23:18</publishTime>
      <publishTime>11/19/2021 17:09:40</publishTime>
    </File>
  </ItemGroup>
</Project>