解决冲突

bklLiudl

2024-08-23 62b3bf8205277b9bdceaa83f0d7e5d73312e1780

解决冲突

 Wms/WMS.BLL/SysServer/MaterialsServer.cs

@@ -92,6 +92,16 @@
            return await Db.Queryable<SysMaterials>().CountAsync(s => s.SkuNo == SkuNo && s.IsDel == "0");
        }


        /// <summary>
        /// 根据编号查询物料信息
        /// </summary>
        /// <param name="PackagNo">包装编号</param>
        /// <returns></returns>
        public async Task<int> GetMateByPa(string PackagNo)
        {
            return await Db.Queryable<SysMaterials>().CountAsync(s => s.PackagNo == PackagNo && s.IsDel == "0");
        }
        /// <summary>
        /// 新增物料信息
        /// </summary>

 Wms/WMS.BLL/SysServer/StorageLocatServer.cs

@@ -247,12 +247,30 @@
            try
            {
                var q = 0;
                var depth = 0;
                var depthString = "";
                // 排(组)循环
                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 {
                                //其余条件
                            }
                        }
                        
                        q += await LocatRst.AddAsync(new SysStorageLocat()
                        {
                            // 区域+排+列+层
@@ -264,7 +282,7 @@
                            AisleOne = "1",
                            AisleTwo = "",
                            Flag = "0",
                            Depth = z.ToString(),
                            Depth = depthString,
                            Row = i,
                            Column = z,
                            Layer = 1,

 Wms/Wms/Controllers/SysController.cs

@@ -1091,7 +1091,17 @@
                    //{
                    //    return Ok(new { code = 400, ErrorMsg = "为获取到当前操作人信息" });
                    //}
                    var bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
                    var bolls = 0;
                    if (model.HouseNo == "W01")
                    {
                        bolls = await _locatSvc.AddStorageLocat(model.Index, model.HouseNo, model.RoadwayNo, model.AreaNo, model.Row, model.Col, model.Layer, model.Depth, 1);
                    }
                    else
                    {
                        bolls = await _locatSvc.AddPkStorageLocat(model, 1);
                    }
                    
                    
                    if (bolls > 0)
                    {
                        await _operation.InsertOperation("仓库设置", "储位管理", model.RoadwayNo, "添加", "添加储位信息 储位号：" + model.RoadwayNo, 1);