Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

hwh

2025-02-18 d14ca5fe3519ff0cf4cfff19242fca4754b34a43

Merge branch 'master' of http://47.95.120.53:8083/r/JC34WMS

 HTML/views/WareHouseSetting/Locate.html

@@ -131,9 +131,11 @@
            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list" style="width: 100%;"></table>
                <script type="text/html" id="table-content-list">
                    {{# if(d.Make=="1"){ }}
                        <a class="editBtn layui-btn layui-btn-normal layui-btn-xs editClass" lay-event="edit">
                            <i class="layui-icon layui-icon-edit"></i>编辑</a>
                    </script>
                        <i class="layui-icon layui-icon-edit"></i>编辑</a>
                    {{# }  }}
                </script>
            </div>
        </div>
    </div>
@@ -448,6 +450,11 @@
                        align: 'center',
                        width: 90,
                    }, {
                        field: 'MakeName',
                        title: '类型标识',
                        align: 'center',
                        width: 90,
                    }, {
                        field: 'Row',
                        title: '排',
                        align: 'center',

 HTML/views/WareHouseSetting/Roadway.html

@@ -115,11 +115,11 @@
                    console.log(res)
                    if (res.code == 0) { //成功
                    for (var i = 0; i < res.data.length; i++) {
                        if (res.data[i].WareHouseNo == 'W01')
                        {
                            $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + ' selected>' + res.data[i].WareHouseNo + '-' +
                        // if (res.data[i].WareHouseNo == 'W01')
                        // {
                            $("#WarehouseName").append('<option value =' + res.data[i].WareHouseNo + '>' + res.data[i].WareHouseNo + '-' +
                            res.data[i].WareHouseName + '</option>');
                        }
                        //}
                        
                    }
                    

 Wms/Model/ModelDto/SysDto/LocatDto.cs

@@ -83,6 +83,19 @@
        public string FlagName { get; set; }

        /// <summary>
        /// 储位类型 0：跑道（对于密集库使用） 1：储位  
        /// Default: 0
        /// Nullable:True
        /// </summary>           
        public string Make { get; set; }
        /// <summary>
        /// 储位类型 0：跑道（对于密集库使用） 1：储位 
        /// Default: 0
        /// Nullable:True
        /// </summary>           
        public string MakeName { get; set; }

        /// <summary>
        /// 深度 两位数字
        /// Default:
        /// Nullable:True

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -81,6 +81,8 @@
                    StatusName = GetStatus(m.Status),
                    Flag = m.Flag,
                    FlagName = GetFlag(m.Flag),
                    Make = m.Make,
                    MakeName = m.Make == "0"? "跑道": m.Make == "1" ? "储位":"",
                    Depth = m.Depth,
                    Row = m.Row,
                    Column = m.Column,
@@ -164,7 +166,79 @@
        {
            try
            {
                #region MyRegion

                //var q = 0;
                ////R01 -01 -01 -02
                ////巷道–排-列-层 
                //for (int r = index; r <= row; r++)//排
                //{
                //    var r1 = "1";
                //    if (r < 10)
                //    {
                //        r1 = "0" + r;
                //    }
                //    else
                //    {
                //        r1 = r.ToString();
                //    }
                //    for (int l = 1; l <= layer; l++)//层
                //    {
                //        var l1 = "1";
                //        if (l < 10)
                //        {
                //            l1 = "0" + l;
                //        }
                //        else
                //        {
                //            l1 = l.ToString();
                //        }
                //        for (int c = 1; c <= col; c++)//列
                //        {
                //            var c1 = "1";
                //            if (c < 10)
                //            {
                //                c1 = "0" + c;
                //            }
                //            else
                //            {
                //                c1 = c.ToString();
                //            }
                //            var area = l <= 7 ? "A12" : "A11";//区域
                //            for (int d = 1; d <= int.Parse(dept); d++) //深度
                //            {
                //                var s = "0" + d;//深度
                //                q += await LocatRst.AddAsync(new SysStorageLocat()
                //                {
                //                    LocatNo = r1 + c1 + l1 + s,
                //                    WareHouseNo = houseNo,
                //                    RoadwayNo = roadwayNo,
                //                    AreaNo = areaNo,
                //                    Status = "0",
                //                    Flag = "0",
                //                    Depth = s,
                //                    Row = r,
                //                    Column = c,
                //                    Layer = l,
                //                    CreateUser = userId
                //                });
                //            }





                //        }
                //    }
                //}

                //return q;

                #endregion

                #region jc34
                var q = 0;

                //R01 -01 -01 -02
                //巷道–排-列-层 
                for (int r = index; r <= row; r++)//排
@@ -178,7 +252,7 @@
                    {
                        r1 = r.ToString();
                    }
                    for (int l = 1; l <= layer; l++)//层
                    for (int l = 1; l <= col; l++)//列
                    {
                        var l1 = "1";
                        if (l < 10)
@@ -189,7 +263,7 @@
                        {
                            l1 = l.ToString();
                        }
                        for (int c = 1; c <= col; c++)//列
                        for (int c = 1; c <= layer; c++)//层
                        {
                            var c1 = "1";
                            if (c < 10)
@@ -200,35 +274,29 @@
                            {
                                c1 = c.ToString();
                            }
                            var area = l <= 7 ? "A12" : "A11";//区域
                            for (int d = 1; d <= int.Parse(dept); d++) //深度
                             
                            q += await LocatRst.AddAsync(new SysStorageLocat()
                            {
                                var s = "0" + d;//深度
                                q += await LocatRst.AddAsync(new SysStorageLocat()
                                {
                                    LocatNo = r1 + c1 + l1 + s,
                                    WareHouseNo = houseNo,
                                    RoadwayNo = roadwayNo,
                                    AreaNo = areaNo,
                                    Status = "0",
                                    Flag = "0",
                                    Depth = s,
                                    Row = r,
                                    Column = c,
                                    Layer = l,
                                    CreateUser = userId
                                });
                            }





                                LocatNo = r1 + l1 + c1,
                                WareHouseNo = houseNo,
                                RoadwayNo = roadwayNo,
                                AreaNo = areaNo,
                                Status = "0",
                                Flag = "0",
                                Depth = "01",
                                Row = r,
                                Column = l,
                                Layer = c,
                                CreateUser = userId
                            });
                             
                        }
                    }
                }

                return q;
                #endregion

            }
            catch (Exception e)
            {
@@ -248,44 +316,45 @@
            {
                var q = 0;
                var depth = 0;
                var depthString = "";
                var depthString = "01";
                // 排(组)循环
                for (int i = 1; i <= model.Row; i++)
                {
                    // 列循环
                    for (int z = 1; z <= model.Col; z++)
                    {
                        if (z == 1)
                        {
                            depth += 1;
                            if (depth >= 10)
                            {
                                depthString = depth.ToString();
                            }
                            else if (depth < 10)
                            {
                                depthString = "0" + depth.ToString();
                            }
                            else {
                                //其余条件
                            }
                        }
                        //if (z == 1)
                        //{
                        //    depth += 1;
                        //    if (depth >= 10)
                        //    {
                        //        depthString = depth.ToString();
                        //    }
                        //    else if (depth < 10)
                        //    {
                        //        depthString = "0" + depth.ToString();
                        //    }
                        //    else {
                        //        //其余条件
                        //    }
                        //}
                        
                        q += await LocatRst.AddAsync(new SysStorageLocat()
                        {
                            // 区域+排+列+层
                            LocatNo = model.AreaNo + i.ToString().PadLeft(2, '0') + z.ToString().PadLeft(2, '0') + "01",
                            LocatNo = i.ToString().PadLeft(2, '0') + z.ToString().PadLeft(2, '0') + "02",
                            WareHouseNo = model.HouseNo,
                            RoadwayNo = "",
                            AreaNo = model.AreaNo,
                            Status = "0",
                            AisleOne = "1",
                            AisleOne = "",
                            AisleTwo = "",
                            Flag = "0",
                            Make = "1",
                            Depth = depthString,
                            Row = i,
                            Column = z,
                            Layer = 1,
                            Layer = 2,
                            CreateUser = userId
                        }); ;
                    }
@@ -417,12 +486,12 @@
        {
            try
            {
                var road = roadway.Substring(1, roadway.Length - 1);
                var road = roadway.Substring(2, roadway.Length - 2);
                var num = int.Parse(road);
                var rows = (num - 1) * 2 + int.Parse(row);//排
                //var rows = (num - 1) * 2 + int.Parse(row);//排

                var maxLayer = Db.Queryable<SysStorageLocat>().Where(m =>
                    m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Layer);
                    m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == num).Max(m => m.Layer);

                return maxLayer;
            }
@@ -443,9 +512,9 @@
        {
            try
            {
                var road = roadway.Substring(1, roadway.Length - 1);
                var road = roadway.Substring(2, roadway.Length - 2);
                var num = int.Parse(road);
                var rows = (num - 1) * 2 + int.Parse(row);//排
                //var rows = (num - 1) * 2 + int.Parse(row);//排

                var maxColumn = Db.Queryable<SysStorageLocat>().Where(m =>
                    m.IsDel == "0" && m.WareHouseNo == wareHouseNo && m.RoadwayNo == roadway && m.Row == int.Parse(row)).Max(m => m.Column);

 Wms/WMS.Entity/SysEntity/SysStorageLocat.cs

@@ -64,6 +64,13 @@
        public string Flag {get;set;}

        /// <summary>
        /// 储位类型 0：跑道（对于密集库使用） 1：储位  
        /// Default: 0
        /// Nullable:False
        /// </summary>           
        public string Make { get; set; }

        /// <summary>
        /// 深度 两位数字
        /// Default:
        /// Nullable:False

 Wms/Wms/Controllers/SysController.cs

@@ -1092,7 +1092,7 @@
                    //    return Ok(new { code = 400, ErrorMsg = "为获取到当前操作人信息" });
                    //}
                    var bolls = 0;
                    if (model.HouseNo == "W01")
                    if (model.HouseNo == "W02")
                    {
                        bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
                    }