Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

YL

2021-12-23 517b819913e5146cc47b80877dd557326c76246a

 WebAPI/Controllers/WebAPIController.cs

@@ -187,6 +187,45 @@
        }



        //撤销缓存列表记录
        [Route("Web/Rescind_Json")]
        [HttpGet]
        public object Rescind_Json(long sHInterID, string sBillNo, string sBillType)
        {
            string sErrMsg = string.Empty;
            try
            {
                if (webserver.RescindBillList(sHInterID, sBillNo, sBillType, ref sErrMsg))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "删除成功！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "删除失败！"; 
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            catch (Exception)
            {

                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "删除失败！";
                objJsonResult.data = null;
                return objJsonResult;
            }

        }


        //删除缓存列表记录
        [Route("Web/Delete_Json")]
        [HttpGet]
@@ -2199,28 +2238,29 @@
            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
                List<object> list = new List<object>();
                DataSet ds2;
                DataSet ds1;
                string sql1 = 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;
                }
                string sql2 = string.Format(@"select b.HMaterID,m.HNumber HMaterNumber,m.HName HMaterName,b.HUnitID,u.HNumber HUnitNumber,u.HName HUnitName,b.HQty,b.HRemark from Sb_EquipMaintainRuleBillMain a  
                                    left join Sb_EquipMaintainRuleBillSub b on a.HInterID=b.HInterID 
                                                left join h_v_IF_Material m on b.HMaterID=m.HItemID
                                    left join h_v_IF_Unit u on b.HUnitID=u.HItemID
                                                where a.HInterID=(select HEquipMaintainRuleInterID from Gy_EquipFileBillMain  where HInterID=" + EquipProjectID + ") ");

                ds1 = oCN.RunProcReturn(sql1, "Sb_EquipMaintainRuleBillMain");//保养
                ds2 = oCN.RunProcReturn(sql2, "Sc_MouldMaintainRuleBillMain");//配件
                list.Add(ds1.Tables[0]);
                list.Add(ds2.Tables[0]);
                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "获取信息成功！";
                objJsonResult.list = list;
                return objJsonResult;
            }
            catch (Exception ex)
            {