正清河 仓库看板、车间综合看板接口

yl

2023-09-13 d11b595b22ae25e49e24f298ba2ca58528bda532

正清河 仓库看板、车间综合看板接口

 .vs/VueWebApi/v16/.suo

Binary files differ

 VueWebApi/Controllers/KanBanManagerentController.cs

@@ -158,9 +158,9 @@
 


        #region[大岛仓库看板,左上产品待入库列表]
        #region[正清和仓库看板,左上产品待入库列表]
        /// <summary>
        /// 大岛仓库看板,左上产品待入库列表
        /// 正清和仓库看板,左上产品待入库列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseTopLeftData")]
@@ -172,9 +172,9 @@
        }
        #endregion

        #region[大岛仓库看板,左下产品待发货列表]
        #region[正清和仓库看板,左下产品待发货列表]
        /// <summary>
        /// 大岛仓库看板,左下产品待发货列表
        /// 正清和仓库看板,左下产品待发货列表
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseTopBottomData")]
@@ -186,9 +186,9 @@
        }
        #endregion

        #region[大岛仓库看板,右上成品库、半成品库top5库存排行]
        #region[正清和仓库看板,右上成品库、半成品库top5库存排行]
        /// <summary>
        /// 大岛仓库看板,右上成品库、半成品库top5库存排行
        /// 正清和仓库看板,右上成品库、半成品库top5库存排行
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseRightTopData")]
@@ -200,9 +200,9 @@
        }
        #endregion

        #region[大岛仓库看板,右下原料库库top5库存排行]
        #region[正清和仓库看板,右下原料库库top5库存排行]
        /// <summary>
        /// 大岛仓库看板,右下原料库库top5库存排行
        /// 正清和仓库看板,右下原料库库top5库存排行
        /// </summary>
        /// <returns></returns>
        [Route(template: "WareHouseRightBottomData")]
@@ -216,17 +216,45 @@



        #region[车间看板公告]
        #region[正清和车间综合看板,左上生产订单]
        /// <summary>
        /// 车间看板公告
        /// 正清和车间综合看板,左上生产订单
        /// </summary>
        /// <param name="shopcode">车间编码</param>
        /// <param name="wkshopcode">车间编码字符串集</param>
        /// <returns></returns>
        [Route(template: "WkspReportNotice")]
        [HttpPost]
        public HttpResponseMessage WkspReportNotice(string shopcode)
        [Route(template: "WorkShopCompreLeftTop")]
        [HttpGet]
        public HttpResponseMessage WorkShopCompreLeftTop(string wkshopcode)
        {
            mes = KanBanManagerentBLL.WkspReportNotice(shopcode);
            mes = KanBanManagerentBLL.WorkShopCompreLeftTop(wkshopcode);
            return TJson.toJson(mes);
        }
        #endregion

        #region[正清和车间综合看板,右上销售订单]
        /// <summary>
        /// 正清和车间综合看板,右上销售订单
        /// </summary>
        /// <returns></returns>
        [Route(template: "WorkShopCompreRightTop")]
        [HttpGet]
        public HttpResponseMessage WorkShopCompreRightTop()
        {
            mes = KanBanManagerentBLL.WorkShopCompreRightTop();
            return TJson.toJson(mes);
        }
        #endregion

        #region[正清和车间综合看板,右下库存]
        /// <summary>
        /// 正清和车间综合看板,右下库存
        /// </summary>
        /// <returns></returns>
        [Route(template: "WorkShopCompreRightBottom")]
        [HttpGet]
        public HttpResponseMessage WorkShopCompreRightBottom()
        {
            mes = KanBanManagerentBLL.WorkShopCompreRightBottom();
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/Controllers/ProductModelController.cs

@@ -242,7 +242,6 @@
            string uomcode = obj["uomcode"].ToString();           //单位编码
            string warehousecode = obj["warehousecode"].ToString(); //所属仓库编码
            string stocktypecode = obj["stocktypecode"].ToString(); //存货类型编码
            string materialtypecode = obj["materialtypecode"].ToString(); //物料类型编码
            string minstockqty = obj["minstockqty"].ToString(); //最小库存
            string maxstockqty = obj["maxstockqty"].ToString(); //最大库存
            string is_batchno = obj["is_batchno"].ToString();   //是否批次管理
@@ -251,7 +250,7 @@
            string is_outcheck = obj["is_outcheck"].ToString(); //是否出厂检验
            var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
            string OperType = obj["OperType"].ToString();  //操作类型
            mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
            mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
            return TJson.toJson(mes);
        }
        #endregion

 VueWebApi/DLL/BLL/KanBanManagerentBLL.cs

@@ -77,30 +77,28 @@

        



        #region[大岛仓库看板,左上产品待入库列表]
        #region[正清和仓库看板,左上产品待入库列表]
        public static ToMessage WareHouseTopLeftData()
        {
            return KanBanManagerentDAL.WareHouseTopLeftData();
        }
        #endregion

        #region[大岛仓库看板,左下产品待发货列表]
        #region[正清和仓库看板,左下产品待发货列表]
        public static ToMessage WareHouseTopBottomData()
        {
            return KanBanManagerentDAL.WareHouseTopBottomData();
        }
        #endregion

        #region[大岛仓库看板,右上成品库、半成品库top5库存排行]
        #region[正清和仓库看板,右上成品库、半成品库top5库存排行]
        public static ToMessage WareHouseRightTopData()
        {
            return KanBanManagerentDAL.WareHouseRightTopData();
        }
        #endregion

        #region[大岛仓库看板,右下原料库库top5库存排行]
        #region[正清和仓库看板,右下原料库库top5库存排行]
        public static ToMessage WareHouseRightBottomData()
        {
            return KanBanManagerentDAL.WareHouseRightBottomData();
@@ -108,10 +106,26 @@
        #endregion


        #region[车间看板公告]
        public static ToMessage WkspReportNotice(string shopcode)


        #region[正清和车间综合看板,左上生产订单]
        public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
        {
            return KanBanManagerentDAL.WkspReportNotice(shopcode);
            return KanBanManagerentDAL.WorkShopCompreLeftTop(wkshopcode);
        }
        #endregion

        #region[正清和车间综合看板,右上销售订单]
        public static ToMessage WorkShopCompreRightTop()
        {
            return KanBanManagerentDAL.WorkShopCompreRightTop();
        }
        #endregion

        #region[正清和车间综合看板,右下库存]
        public static ToMessage WorkShopCompreRightBottom()
        {
            return KanBanManagerentDAL.WorkShopCompreRightBottom();
        }
        #endregion
    }

 VueWebApi/DLL/BLL/ProductModelBLL.cs

@@ -85,9 +85,9 @@
        #endregion

        #region[存货档案新增编辑]
        public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
        public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
        {
            return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, is_batchno, is_fifo, is_incheck, is_outcheck, username, operType);
            return ProductModelDAL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, minstockqty, maxstockqty, is_batchno, is_fifo, is_incheck, is_outcheck, username, operType);
        }
        #endregion


 VueWebApi/DLL/DAL/KanBanManagerentDAL.cs

@@ -403,7 +403,7 @@

        

        #region[大岛仓库看板,左上产品待入库列表]
        #region[正清和仓库看板,左上产品待入库列表]
        public static ToMessage WareHouseTopLeftData()
        {
            string sql = "";
@@ -427,7 +427,7 @@
        }
        #endregion

        #region[大岛仓库看板,左下产品待发货列表]
        #region[正清和仓库看板,左下产品待发货列表]
        public static ToMessage WareHouseTopBottomData()
        {
            string sql = "";
@@ -451,7 +451,7 @@
        }
        #endregion

        #region[大岛仓库看板,右上成品库、半成品库top5库存排行]
        #region[正清和仓库看板,右上成品库、半成品库top5库存排行]
        public static ToMessage WareHouseRightTopData()
        {
            string sql = "";
@@ -474,7 +474,7 @@
        }
        #endregion

        #region[大岛仓库看板,右下原料库库top5库存排行]
        #region[正清和仓库看板,右下原料库库top5库存排行]
        public static ToMessage WareHouseRightBottomData()
        {
            string sql = "";
@@ -498,21 +498,106 @@
        #endregion


        #region[车间看板公告]
        public static ToMessage WkspReportNotice(string shopcode)

        #region[正清和车间综合看板,左上生产订单]
        public static ToMessage WorkShopCompreLeftTop(string wkshopcode)
        {
            string sql = "";
            var sql = "";
            var dynamicParams = new DynamicParameters();
            Dictionary<object, object> dir = new Dictionary<object, object>();
            Dictionary<object, object> dir0 = new Dictionary<object, object>();
            Dictionary<object, object> dir1 = new Dictionary<object, object>();
            try
            {
                string[] selects = Array.ConvertAll<string, string>(shopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                //获取车间公告信息
                sql = @"select contents  from TSystemAnnouncement
                       where wksp_code in @shopcode";
                var data = DapperHelper.selectlist(sql, new { shopcode = selects.ToArray() });
                string[] wkshoplist = Array.ConvertAll<string, string>(wkshopcode.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries), s => s.ToString()); //string分割转string[] 
                sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftTop";
                var data = DapperHelper.selecttable(sql);
                sql = @"select * from h_v_DDKanBan_WorkShopCompreLeftCenter";
                var data1 = DapperHelper.selecttable(sql);
                for (int i = 0; i < wkshoplist.Length; i++)
                {
                    var top0 = data.AsEnumerable()
                               .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 添加查询条件
                               .Select(group => new
                               {
                                   wkshp_code = group.Field<string>("wkshp_code"),
                                   plan_qty = group.Field<decimal>("plan_qty"),
                                   good_qty = group.Field<decimal>("good_qty")
                               }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m, good_qty = 0m })//为空时指定默认值
                               .ToList();
                    dir0.Add(wkshoplist[i].ToString(), top0);

                    var top1 = data1.AsEnumerable()
                               .Where(row => row.Field<string>("wkshp_code") == wkshoplist[i].ToString()) // 添加查询条件
                               .Select(group => new
                               {
                                   wkshp_code = group.Field<string>("wkshp_code"),
                                   plan_qty = group.Field<decimal>("plan_qty"),
                                   quantity = group.Field<decimal>("quantity")
                               }).DefaultIfEmpty(new { wkshp_code = wkshoplist[i].ToString(), plan_qty = 0m,quantity = 0m })//为空时指定默认值
                               .ToList();
                    dir1.Add(wkshoplist[i].ToString(), top1);
                }
                dir.Add("LeftTop", dir0);
                dir.Add("LeftBottom", dir1);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = data;
                mes.data = dir;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[正清和车间综合看板,右上销售订单]
        public static ToMessage WorkShopCompreRightTop()
        {
            var sql = "";
            Dictionary<object, object> dir = new Dictionary<object, object>();
            try
            {
                sql = @"select * from h_v_DDKanBan_WorkShopCompreRightTop";
                var data = DapperHelper.selecttable(sql);
                sql = @"select * from h_v_DDKanBan_WorkShopCompreRightCenter";
                var data1 = DapperHelper.selecttable(sql);
                dir.Add("RightTop", data);
                dir.Add("RightBottom", data1);
                mes.code = "200";
                mes.Message = "查询成功!";
                mes.data = dir;
            }
            catch (Exception e)
            {
                mes.code = "300";
                mes.count = 0;
                mes.Message = e.Message;
                mes.data = null;
            }
            return mes;
        }
        #endregion

        #region[正清和车间综合看板,右下库存]
        public static ToMessage WorkShopCompreRightBottom()
        {
            var sql = "";
            Dictionary<object, object> dir = new Dictionary<object, object>();
            try
            {
                sql = @"select * from h_v_DDKanBan_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;
            }
            catch (Exception e)
            {

 VueWebApi/DLL/DAL/ProductModelDAL.cs

@@ -568,7 +568,7 @@
        #endregion

        #region[存货档案新增编辑]
        public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string materialtypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
        public static ToMessage AddUpdateInventoryFile(string materialid, string materialcode, string materialname, string materialspec, string uomcode, string warehousecode, string stocktypecode, string minstockqty, string maxstockqty,string is_batchno,string is_fifo,string is_incheck,string is_outcheck, string username, string operType)
        {
            var dynamicParams = new DynamicParameters();
            try
@@ -594,7 +594,7 @@
                    dynamicParams.Add("@uomcode", uomcode);
                    dynamicParams.Add("@warehousecode", warehousecode);
                    dynamicParams.Add("@stocktypecode", stocktypecode);
                    dynamicParams.Add("@materialtypecode", materialtypecode);
                    dynamicParams.Add("@materialtypecode", "");
                    dynamicParams.Add("@minstockqty", minstockqty);
                    dynamicParams.Add("@maxstockqty", maxstockqty);
                    dynamicParams.Add("@username", username);
@@ -630,7 +630,7 @@
                    dynamicParams.Add("@uomcode", uomcode);
                    dynamicParams.Add("@warehousecode", warehousecode);
                    dynamicParams.Add("@stocktypecode", stocktypecode);
                    dynamicParams.Add("@materialtypecode", materialtypecode);
                    dynamicParams.Add("@materialtypecode", "");
                    dynamicParams.Add("@minstockqty", minstockqty);
                    dynamicParams.Add("@maxstockqty", maxstockqty);
                    dynamicParams.Add("@username", username);

 VueWebApi/Logs/2023-09-13.TXT

 VueWebApi/Properties/PublishProfiles/FolderProfile1.pubxml.user

@@ -750,13 +750,13 @@
      <publishTime>12/24/2021 15:38:29</publishTime>
    </File>
    <File Include="bin/VueWebApi.dll">
      <publishTime>09/12/2023 16:38:24</publishTime>
      <publishTime>09/13/2023 18:10:18</publishTime>
    </File>
    <File Include="bin/VueWebApi.pdb">
      <publishTime>09/12/2023 16:38:24</publishTime>
      <publishTime>09/13/2023 18:10:18</publishTime>
    </File>
    <File Include="bin/VueWebApi.xml">
      <publishTime>09/12/2023 16:38:24</publishTime>
      <publishTime>09/13/2023 18:10:18</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>02/08/2013 16:42:28</publishTime>

 VueWebApi/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/bin/VueWebApi.xml

@@ -2335,33 +2335,45 @@
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
            <summary>
            大岛仓库看板,左上产品待入库列表
            正清和仓库看板,左上产品待入库列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
            <summary>
            大岛仓库看板,左下产品待发货列表
            正清和仓库看板,左下产品待发货列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
            <summary>
            大岛仓库看板,右上成品库、半成品库top5库存排行
            正清和仓库看板,右上成品库、半成品库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
            <summary>
            大岛仓库看板,右下原料库库top5库存排行
            正清和仓库看板,右下原料库库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkspReportNotice(System.String)">
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreLeftTop(System.String)">
            <summary>
            车间看板公告
            正清和车间综合看板,左上生产订单
            </summary>
            <param name="shopcode">车间编码</param>
            <param name="wkshopcode">车间编码字符串集</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightTop">
            <summary>
            正清和车间综合看板,右上销售订单
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightBottom">
            <summary>
            正清和车间综合看板,右下库存
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">

 VueWebApi/obj/Debug/VueWebApi.csproj.AssemblyReference.cache

Binary files differ

 VueWebApi/obj/Debug/VueWebApi.csproj.FileListAbsolute.txt

@@ -459,7 +459,6 @@
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Deployment.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\bin\zh-Hans\System.Web.WebPages.Razor.resources.dll
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.AssemblyReference.cache
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CoreCompileInputs.cache
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.csproj.CopyComplete
D:\新凯迪MES\MES项目\MES正清河\VueWebApi\VueWebApi\obj\Debug\VueWebApi.dll

 VueWebApi/obj/Debug/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.pdb

Binary files differ

 VueWebApi/obj/Release/Package/PackageTmp/bin/VueWebApi.xml

@@ -2335,33 +2335,45 @@
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopLeftData">
            <summary>
            大岛仓库看板,左上产品待入库列表
            正清和仓库看板,左上产品待入库列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseTopBottomData">
            <summary>
            大岛仓库看板,左下产品待发货列表
            正清和仓库看板,左下产品待发货列表
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightTopData">
            <summary>
            大岛仓库看板,右上成品库、半成品库top5库存排行
            正清和仓库看板,右上成品库、半成品库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WareHouseRightBottomData">
            <summary>
            大岛仓库看板,右下原料库库top5库存排行
            正清和仓库看板,右下原料库库top5库存排行
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WkspReportNotice(System.String)">
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreLeftTop(System.String)">
            <summary>
            车间看板公告
            正清和车间综合看板,左上生产订单
            </summary>
            <param name="shopcode">车间编码</param>
            <param name="wkshopcode">车间编码字符串集</param>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightTop">
            <summary>
            正清和车间综合看板,右上销售订单
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.KanBanManagerentController.WorkShopCompreRightBottom">
            <summary>
            正清和车间综合看板,右下库存
            </summary>
            <returns></returns>
        </member>
        <member name="M:VueWebApi.Controllers.LoginController.LoginSave(System.String,System.String,System.String)">

 VueWebApi/obj/Release/VueWebApi.pdb

Binary files differ