解决冲突

bklLiudl

2024-08-23 62b3bf8205277b9bdceaa83f0d7e5d73312e1780

 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);
@@ -1234,18 +1244,23 @@
                    var bolls = _locatSvc.EditStorageLocatList(model, _config.WcsHost + _config.EditLocateUrl, 1);//int.Parse(userId)
                    if (bolls)
                    {
                        SysStorageLocat storage = _locatSvc.GetStorageLocat(model.Id[0]);
                        string msg = "储位状态 储位号：" + storage.RoadwayNo;
                        SysStorageLocat storage;
                        //string msg = "储位状态 储位号：" + storage.RoadwayNo;
                        if (model.Id.Count > 1)
                        {
                            var list = _locatSvc.GetStorageLocat();
                            foreach (var item in model.Id)
                            {
                                storage = _locatSvc.GetStorageLocat(item);
                                _operation.InsertOperation("仓库设置", "储位管理", storage.LocatNo, "批量编辑", "批量修改储位信息 储位号：" + storage.LocatNo, Convert.ToInt32(userId));
                                storage = list.FirstOrDefault(m=>m.Id == item);
                                if (storage != null)
                                {
                                    _operation.InsertOperation("仓库设置", "储位管理", storage.LocatNo, "批量编辑", "批量修改储位信息 储位号：" + storage.LocatNo, Convert.ToInt32(userId));
                                }
                            }
                        }
                        else
                        {
                            storage = _locatSvc.GetStorageLocat(model.Id[0]);
                            _operation.InsertOperation("仓库设置", "储位管理", storage.LocatNo, "修改", "修改储位信息 储位号：" + storage.LocatNo, Convert.ToInt32(userId));
                        }