hwh
2025-02-18 c2db1ba1de0a9b2916585ae823972bdc18a229e6
储位
4个文件已修改
36 ■■■■ 已修改文件
HTML/views/WareHouseSetting/StorageLegend.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/SysServer/StorageLocatServer.cs 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/SysController.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/WareHouseSetting/StorageLegend.html
@@ -253,7 +253,7 @@
            });
            getRoadway(); //获取仓库巷道
            getRow(); //获取巷道中排
            funDepth(); //获取排的深度
            //funDepth(); //获取排的深度
            GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val()); //获取数据渲染库位图
            GetSlotChart($("#WareHouseNo").val()); //获取圆形信息
            GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()) //获取柱状信息
@@ -376,10 +376,11 @@
                }
                getRow(); //获取巷道中排
                GetSlotChartz($("#WareHouseNo").val(), $("#RoadwayNo").val()); //获取柱状信息
                GetSlotVm($("#WareHouseNo").val(), $("#RoadwayNo").val(), $("#Row").val(), $("#Depth").val());
            })
            //排变更
            form.on('select(SelectRow)', function (data) {
                funDepth(); //获取排中深度
                //funDepth(); //获取排中深度
            });
            //深度变更
            form.on('select(SelectDepth)', function (data) {
@@ -389,7 +390,7 @@
            function getRow()
            {
                $("#Row").empty();//清空上一个查询下拉值
                synData(IP + "/Sys/ByRoadwayGetRow", { roadwayNo: $("#RoadwayNo").val() }, 'get', function (res) {
                synData(IP + "/Sys/ByRoadwayGetRow", { warehouseNo:$("#WareHouseNo").val(), roadwayNo: $("#RoadwayNo").val() }, 'get', function (res) {
                    // console.log(res)
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
@@ -397,7 +398,7 @@
                        }
                        $("#Row option[value='" + res.data[0] + "']").attr("selected", "selected")
                        form.render('select');
                        funDepth(); //获取深度
                        //funDepth(); //获取深度
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
@@ -521,6 +522,7 @@
                        var html = '';
                        var list = res.data;
                        //按层渲染
                        debugger
                        for (let i = res.maxlayer; i > 0; i--) {
                            html += '<tr style="height:10px;">';
Wms/WMS.BLL/SysServer/StorageLocatServer.cs
@@ -82,7 +82,7 @@
                    Flag = m.Flag,
                    FlagName = GetFlag(m.Flag),
                    Make = m.Make,
                    MakeName = m.Make == "0"? "跑道": m.Make == "1" ? "储位":"",
                    MakeName = m.Make == "0" ? "跑道" : m.Make == "1" ? "储位" : "",
                    Depth = m.Depth,
                    Row = m.Row,
                    Column = m.Column,
@@ -139,7 +139,7 @@
        {
            try
            {
                var bl = LocatRst.EditStorageLocat(model.Id,model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
                var bl = LocatRst.EditStorageLocat(model.Id, model.AreaNo, model.Status, model.Flag, model.Temperature, url, userId);
                return bl;
            }
@@ -274,7 +274,7 @@
                            {
                                c1 = c.ToString();
                            }
                            q += await LocatRst.AddAsync(new SysStorageLocat()
                            {
                                LocatNo = r1 + l1 + c1,
@@ -289,7 +289,7 @@
                                Layer = c,
                                CreateUser = userId
                            });
                        }
                    }
                }
@@ -338,7 +338,7 @@
                        //        //其余条件
                        //    }
                        //}
                        q += await LocatRst.AddAsync(new SysStorageLocat()
                        {
                            // 区域+排+列+层
@@ -908,9 +908,9 @@
        /// </summary>
        /// <param name="roadwayNo">巷道</param>
        /// <returns></returns>
        public List<string> ByRoadwayGetRow(string roadwayNo)
        public List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
        {
            string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = 'W01' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
            string str = $"select Row from SysStorageLocat where IsDel = '0' and WareHouseNo = '{wareHouseNo}' and RoadwayNo = '{roadwayNo}' group by Row order by Row";
            List<string> row = Db.Ado.SqlQuery<string>(str);
            return row;
Wms/WMS.IBLL/ISysServer/IStorageLocatServer.cs
@@ -178,7 +178,7 @@
        /// </summary>
        /// <param name="roadwayNo">巷道</param>
        /// <returns></returns>
        List<string> ByRoadwayGetRow(string roadwayNo);
        List<string> ByRoadwayGetRow(string wareHouseNo, string roadwayNo);
        #region 平库
Wms/Wms/Controllers/SysController.cs
@@ -1100,8 +1100,8 @@
                    {
                        bolls = await _locatSvc.AddPkStorageLocat(model, 1);
                    }
                    if (bolls > 0)
                    {
                        await _operation.InsertOperation("仓库设置", "储位管理", model.RoadwayNo, "添加", "添加储位信息 储位号:" + model.RoadwayNo, 1);
@@ -1251,7 +1251,7 @@
                            var list = _locatSvc.GetStorageLocat();
                            foreach (var item in model.Id)
                            {
                                storage = list.FirstOrDefault(m=>m.Id == item);
                                storage = list.FirstOrDefault(m => m.Id == item);
                                if (storage != null)
                                {
                                    _operation.InsertOperation("仓库设置", "储位管理", storage.LocatNo, "批量编辑", "批量修改储位信息 储位号:" + storage.LocatNo, Convert.ToInt32(userId));
@@ -1703,9 +1703,9 @@
        /// <param name="roadwayNo">巷道号</param>
        /// <returns></returns>
        [HttpGet]
        public IActionResult ByRoadwayGetRow(string roadwayNo)
        public IActionResult ByRoadwayGetRow(string wareHouseNo, string roadwayNo)
        {
            List<string> row = _locatSvc.ByRoadwayGetRow(roadwayNo);
            List<string> row = _locatSvc.ByRoadwayGetRow(wareHouseNo, roadwayNo);
            return Ok(new
            {
                data = row,