Merge branch 'wxw'

Administrator

2024-02-22 d34d36d5c0478d1e5f56b92fc5b38fc5ca379e5c

 Wms/Wms/Controllers/SysController.cs

@@ -760,7 +760,7 @@
                model.CreateUser = int.Parse(userId);
                string bolls = _areaSvc.InsertStorageArea(model);
                var arr = bolls.Split(":");
                if (arr[0] != "-1" )
                if (arr[0] != "-1")
                {
                    SysStorageArea area = _areaSvc.GetStorageMaxArea();
                    _operation.InsertOperation("仓库设置", "区域管理", area.AreaNo, "添加", "添加区域信息 区域号：" + area.AreaNo, Convert.ToInt32(userId));
@@ -1536,6 +1536,7 @@

        #region 储位图例

        #region 立库
        /// <summary>
        /// 根据仓库 排
        /// </summary>
@@ -1652,6 +1653,41 @@
            });
        }



        #endregion

        #region 平库

        /// <summary>
        /// 根据仓库 排
        /// </summary>
        /// <param name="wareHouseNo">仓库</param>
        /// <param name="row">排</param>
        /// <param name="depth">深度</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult GetFlatLibraryLegend(string wareHouseNo, string row)
        {
            //获取储位信息
            List<SysStorageLocat> storagelist = _locatSvc.GetFlatLibraryLegend(wareHouseNo, row);

            //Dictionary<string, int> dic = new Dictionary<string, int>()
            //{
            //    "B01"
            //};

            return Ok(new
            {
                data = storagelist,
                //dic,
                code = 0,
                msg = ""
            });
        }

        #endregion

        /// <summary>
        /// 根据储位地址获取储位上的托盘和物品信息
        /// </summary>