yl
2024-07-26 7c78ddfc867ac8cf06cc911bb59977d9381deb12
车间看板新增车间参数
已修改5个文件
84 ■■■■■ 文件已修改
VueWebCoreApi.sln 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebCoreApi/Controllers/KanBanManagerentController.cs 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
VueWebCoreApi.sln
@@ -3,7 +3,7 @@
# Visual Studio Version 16
VisualStudioVersion = 16.0.32002.261
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VueWebCoreApi", "VueWebCoreApi\VueWebCoreApi.csproj", "{316CBE3A-CB91-4F63-AFA4-A8C533020BD7}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VueWebCoreApi", "VueWebCoreApi\VueWebCoreApi.csproj", "{316CBE3A-CB91-4F63-AFA4-A8C533020BD7}"
EndProject
Global
    GlobalSection(SolutionConfigurationPlatforms) = preSolution
VueWebCoreApi/Controllers/KanBanManagerentController.cs
@@ -109,12 +109,13 @@
        /// <summary>
        /// 圣沣车间看板,上生产信息
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "WorkShopProduceTopData")]
        [HttpGet]
        public JsonResult WorkShopProduceTopData()
        public JsonResult WorkShopProduceTopData(string wkshopcode)
        {
            mes = KanBanManagerentBLL.WorkShopProduceTopData();
            mes = KanBanManagerentBLL.WorkShopProduceTopData(wkshopcode);
            return Json(mes);
        }
        #endregion
@@ -123,12 +124,13 @@
        /// <summary>
        /// 圣沣车间看板,下左近一周不良趋势
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "WorkShopProduceBottomLeftData")]
        [HttpGet]
        public JsonResult WorkShopProduceBottomLeftData()
        public JsonResult WorkShopProduceBottomLeftData(string wkshopcode)
        {
            mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData();
            mes = KanBanManagerentBLL.WorkShopProduceBottomLeftData(wkshopcode);
            return Json(mes);
        }
        #endregion
@@ -137,12 +139,13 @@
        /// <summary>
        /// 圣沣车间看板,下右近一月不良统计
        /// </summary>
        /// <param name="wkshopcode">车间编码</param>
        /// <returns></returns>
        [Route(template: "WorkShopProduceBottomRightData")]
        [HttpGet]
        public JsonResult WorkShopProduceBottomRightData()
        public JsonResult WorkShopProduceBottomRightData(string wkshopcode)
        {
            mes = KanBanManagerentBLL.WorkShopProduceBottomRightData();
            mes = KanBanManagerentBLL.WorkShopProduceBottomRightData(wkshopcode);
            return Json(mes);
        }
        #endregion
VueWebCoreApi/DLL/BLL/KanBanManagerentBLL.cs
@@ -55,23 +55,23 @@
        #region[圣沣车间看板,上生产信息]
        public static ToMessage WorkShopProduceTopData()
        public static ToMessage WorkShopProduceTopData(string wkshopcode)
        {
            return KanBanManagerentDAL.WorkShopProduceTopData();
            return KanBanManagerentDAL.WorkShopProduceTopData(wkshopcode);
        }
        #endregion
        #region[圣沣车间看板,下左近一周不良趋势]
        public static ToMessage WorkShopProduceBottomLeftData()
        public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
        {
            return KanBanManagerentDAL.WorkShopProduceBottomLeftData();
            return KanBanManagerentDAL.WorkShopProduceBottomLeftData(wkshopcode);
        }
        #endregion
        #region[圣沣车间看板,下右近一月不良统计]
        public static ToMessage WorkShopProduceBottomRightData()
        public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
        {
            return KanBanManagerentDAL.WorkShopProduceBottomRightData();
            return KanBanManagerentDAL.WorkShopProduceBottomRightData(wkshopcode);
        }
        #endregion
VueWebCoreApi/DLL/DAL/KanBanManagerentDAL.cs
@@ -153,13 +153,16 @@
        #region[圣沣车间看板,上生产信息]
        public static ToMessage WorkShopProduceTopData()
        public static ToMessage WorkShopProduceTopData(string wkshopcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select * from h_v_SFKanBan_WorkshopTop";
                var data = DapperHelper.selecttable(sql);
                string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
                sql = @"select * from h_v_SFKanBan_WorkshopTop where wkshp_code in @wkshoplist";
                dynamicParams.Add("@wkshoplist", wkshoplist);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.message = "查询成功!";
                mes.data = data;
@@ -176,17 +179,25 @@
        #endregion
        #region[圣沣车间看板,下左近一周不良趋势]
        public static ToMessage WorkShopProduceBottomLeftData()
        public static ToMessage WorkShopProduceBottomLeftData(string wkshopcode)
        {
            string sql = "";
            Dictionary<object, object> dir = new Dictionary<object, object>();
            try
            {
                //存储过程名(当前时间往前一周)
                string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
                sql = @"h_p_SFKanBan_WorkshopBottomLeft";
                var data = DapperHelper.lissql(sql);
                for (int i = 0; i < wkshoplist.Length; i++)
                {
                    var dynamicParams = new DynamicParameters();
                    dynamicParams.Add("@wkshop_code", wkshoplist[i].ToString());
                    var dt = DapperHelper.selectProcedure(sql, dynamicParams);
                    dir.Add(wkshoplist[i].ToString(), dt);
                }
                mes.code = "200";
                mes.message = "查询成功!";
                mes.data = data;
                mes.data = dir;
            }
            catch (Exception e)
            {
@@ -200,13 +211,16 @@
        #endregion
        #region[圣沣车间看板,下右近一月不良统计]
        public static ToMessage WorkShopProduceBottomRightData()
        public static ToMessage WorkShopProduceBottomRightData(string wkshopcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
            try
            {
                sql = @"select * from h_v_SFKanBan_WorkshopBottomRight";
                var data = DapperHelper.selecttable(sql);
                string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[]
                sql = @"select * from h_v_SFKanBan_WorkshopBottomRight where wkshp_code in @wkshoplist";
                dynamicParams.Add("@wkshoplist", wkshoplist);
                var data = DapperHelper.selectdata(sql, dynamicParams);
                mes.code = "200";
                mes.message = "查询成功!";
                mes.data = data;
@@ -316,12 +330,21 @@
            {
                sql = @"select * from h_v_SFKanBan_WorkShopCompreRightBottom";
                var data = DapperHelper.selecttable(sql);
                dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
                dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
                dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
                mes.code = "200";
                mes.message = "查询成功!";
                mes.data = dir;
                if (data.Rows.Count > 0)
                {
                    dir.Add("Y", data.Rows[0]["BaseQuantity"].ToString());
                    dir.Add("B", data.Rows[1]["BaseQuantity"].ToString());
                    dir.Add("C", data.Rows[2]["BaseQuantity"].ToString());
                    mes.code = "200";
                    mes.message = "查询成功!";
                    mes.data = dir;
                }
                else
                {
                    mes.code = "200";
                    mes.message = "查询成功!";
                    mes.data = null;
                }
            }
            catch (Exception e)
            {
VueWebCoreApi/DLL/DAL/ReportManagerDAL.cs
@@ -179,7 +179,7 @@
                var total = 0; //总条数
                var sql = @"select top 100 percent AA.saleOrderCode as 销售订单号,AA.m_po as 生产订单号,AA.wkshp_code as 车间编码,AA.wkshp_name as 车间名称,AA.wo_code as 生产工单号,
                             AA.status as 工单状态,AA.lm_date as 单据日期,AA.route_code as 工艺路线编号,AA.route_name as 工艺路线名称,
                             AA.status as 工单状态,AA.lm_date as 单据日期,
                             AA.partcode as 产品编码,AA.partname as 产品名称,AA.partspec as 产品规格,AA.plan_qty as 任务数量,left(AA.concat_name,len(concat_name)-1) as 生产进度 
                             from (
                                 select E.saleOrderCode,W.m_po,W.wo_code,W.wkshp_code,F.torg_name as wkshp_name,