添加xx仓库字段

yusijie

2022-10-16 93b96dd90242cd568b9c1fa02637b14102164c97

添加xx仓库字段

 WebAPI/Controllers/BaseSet/Gy_ProcessController.cs

@@ -327,6 +327,13 @@

                long HWorkCenterID = list[0].HWorkCenterID;    //工作中心

                long HBadWHID = list[0].HBadWHID; //不良仓库
                long HWasterWHID = list[0].HWasterWHID; //报废仓库
                long HBadCountDevelopWHID = list[0].HBadCountDevelopWHID; //研发不良品仓库
                long HWWBadWHID = list[0].HWWBadWHID; //委外不良仓库
                long HWWWasterWHID = list[0].HWWWasterWHID; //委外报废仓库
                long HWHID = list[0].HWHID; //良品仓库


                //判断权限
                //if (!ClsPub.Security_Log("Gy_Process_Edit", 1, false, msg3))
@@ -365,13 +372,13 @@
                        ",HTypeFlow,HTypeCount,HDeptNumber,HSNo" +
                        ",HLevel,HEndFlag,HStopflag,HRemark,HDeptID,HBarCodeForBase,HProcessID_K3,HBillSubType,HAutoTrunFlag" +
                        ",HFixPrice,HOverFixPrice,HProcMulID,HProcCheckNote" +
                        ",HUSEORGID,HWorkCenterID) " +
                        ",HUSEORGID,HWorkCenterID,HBadWHID,HWasterWHID,HBadCountDevelopWHID,HWWBadWHID,HWWWasterWHID,HWHID) " +
                        " Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
                        "," + Convert.ToString(HTypeFlow ? 1 : 0) + "," + Convert.ToString(HTypeCount ? 1 : 0) + ",'" + HDeptNumber + "','" + HSNo.ToString() +
                        "'," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HDeptID +
                        ",'" + HBarCode + "'," + HProcessID_K3 + ",'" +HBillSubType + "'," + Convert.ToString(HAutoTrunFlag ? 1 : 0) +
                        ",'" + HFixPrice.ToString() + "'," + HOverFixPrice.ToString() + "," + HProcMulID.ToString() + ",'" + HProcCheckNote.ToString() + "'" +
                        ","+ HUSEORGID + "," + HWorkCenterID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                        ","+ HUSEORGID + "," + HWorkCenterID + "," + HBadWHID + "," + HWasterWHID + "," + HBadCountDevelopWHID + "," + HWWBadWHID + "," + HWWWasterWHID + "," + HWHID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
                    oCN.Commit();
@@ -403,6 +410,12 @@
                        ",HOverFixPrice= " + HOverFixPrice +
                        ",HProcMulID= " + HProcMulID +
                        ",HWorkCenterID= " + HWorkCenterID +
                        ",HBadWHID= " + HBadWHID +
                        ",HWasterWHID= " + HWasterWHID +
                        ",HBadCountDevelopWHID= " + HBadCountDevelopWHID +
                        ",HWWBadWHID= " + HWWBadWHID +
                        ",HWWWasterWHID= " + HWWWasterWHID +
                        ",HWHID= " + HWHID +
                        ",HProcCheckNote='" + HProcCheckNote + "' Where HItemID=" + HItemID, ref DBUtility.ClsPub.sExeReturnInfo);
                    //修改上级为非末级代码
                    oCN.RunProc("Update Gy_Process set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);

 WebAPI/Controllers/NewApiController.cs

@@ -168,5 +168,71 @@
        {
            return YqnQbService.DeleteProcess(hItemId);
        }
        /// <summary>
        /// èŽ·å–不良仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getBadWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetBadWHList(string sWhere)
        {
            return YqnQbService.GetBadWHList(sWhere);
        }
        /// <summary>
        /// èŽ·å–报废仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWasterWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWasterWHList(string sWhere)
        {
            return YqnQbService.GetWasterWHList(sWhere);
        }
        /// <summary>
        /// èŽ·å–研发不良品仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getBadCountDevelopWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
        {
            return YqnQbService.GetBadCountDevelopWHList(sWhere);
        }
        /// <summary>
        /// èŽ·å–委外不良仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWWBadWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWWBadWHList(string sWhere)
        {
            return YqnQbService.GetWWBadWHList(sWhere);
        }
        /// <summary>
        /// èŽ·å–委外报废仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWWWasterWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWWWasterWHList(string sWhere)
        {
            return YqnQbService.GetWWWasterWHList(sWhere);
        }
        /// <summary>
        /// èŽ·å–良品仓库
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        [Route("api/newBill/getWHList")]
        [HttpGet]
        public ApiResult<DataSet> GetWHList(string sWhere)
        {
            return YqnQbService.GetWHList(sWhere);
        }
    }
}

 WebAPI/Models/»ù´¡×ÊÁÏ/Gy_Process.cs

@@ -38,5 +38,11 @@
        public string HBarCodeForBase { get; set; }
        
        public long HWorkCenterID { get; set; }
        public long HBadWHID { get; set; }
        public long HWasterWHID { get; set; }
        public long HBadCountDevelopWHID { get; set; }
        public long HWWBadWHID { get; set; }
        public long HWWWasterWHID { get; set; }
        public long HWHID { get; set; }
    }
}

 WebAPI/Service/YqnQbService.cs

@@ -158,6 +158,78 @@
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–不良仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetBadWHList(string sWhere)
        {
            var dataSet = GetBadWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到不良仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–报废仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetWasterWHList(string sWhere)
        {
            var dataSet = GetWasterWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到报废仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–研发不良品仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetBadCountDevelopWHList(string sWhere)
        {
            var dataSet = GetBadCountDevelopWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到研发不良品仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–委外不良仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetWWBadWHList(string sWhere)
        {
            var dataSet = GetWWBadWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到委外不良仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–委外报废仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetWWWasterWHList(string sWhere)
        {
            var dataSet = GetWWWasterWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到委外报废仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–良品仓库列表
        /// </summary>
        /// <param name="sWhere"></param>
        /// <returns></returns>
        public static ApiResult<DataSet> GetWHList(string sWhere)
        {
            var dataSet = GetWH(sWhere);
            if (dataSet == null || dataSet.Tables[0].Rows.Count == 0)
                return new ApiResult<DataSet> { code = -1, msg = "未查询到良品仓库" };
            return new ApiResult<DataSet> { code = 1, msg = "查询成功", data = dataSet };
        }
        /// <summary>
        /// èŽ·å–流转卡列表
        /// </summary>
        /// <param name="sWhere"></param>
@@ -239,7 +311,7 @@
            if (list?.Count == 0)
                return new ApiResult<List<M_Process>> { code = -1, msg = "查询为空" };
            return new ApiResult<List<M_Process>> { code = 0, msg = "查询成功", data = list, count = pageCount };
        }
        }        
        /// <summary>
        /// åˆ é™¤ä¸€æ¡å·¥åº
        /// </summary>
@@ -260,6 +332,48 @@
            var dataSet = oCN.RunProcReturn(sql, "h_v_MES_StationOutBillList");
            return dataSet;
        }
        public static DataSet GetBadWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetBadWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetBadWH");
            return dataSet;
        }
        public static DataSet GetWasterWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetWasterWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWasterWH");
            return dataSet;
        }
        public static DataSet GetBadCountDevelopWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetBadCountDevelopWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetBadCountDevelopWH");
            return dataSet;
        }
        public static DataSet GetWWBadWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetWWBadWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWWBadWH");
            return dataSet;
        }
        public static DataSet GetWWWasterWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetWWWasterWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWWWasterWH");
            return dataSet;
        }
        public static DataSet GetWH(string sWhere)
        {
            var sql = "Select * from h_v_Sc_GetWH Where 1=1 " + sWhere;
            SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
            var dataSet = oCN.RunProcReturn(sql, "h_v_Sc_GetWH");
            return dataSet;
        }
        public static DataSet GetStationInBill(string strWhere)
        {
            var sql = "Select top 5000 * from h_v_MES_StationInBillList Where 1=1 " + strWhere;

 WebAPI/WebAPI.csproj.user

@@ -19,8 +19,8 @@
    <IISExpressUseClassicPipelineMode />
    <UseGlobalApplicationHostFile />
    <ProjectView>ShowAllFiles</ProjectView>
    <Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/Web API</Controller_SelectedScaffolderCategoryPath>
    <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
    <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
  </PropertyGroup>
  <ProjectExtensions>
    <VisualStudio>