From ceebffcc8a3d508348bd4f03872d3d9c02c79262 Mon Sep 17 00:00:00 2001 From: hehaibing-1996 Date: Fri, 24 Jan 2025 08:19:10 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=AF=BC=E5=85=A5=E5=BD=93=E5=89=8D=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=9A=84=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2.增加盘点接口 --- .../Services/IService/IStockTakingService.cs | 5 ++ .../Service/BatchBindMatDetailService.cs | 20 +++--- .../Services/Service/StockTakingService.cs | 15 ++++ .../Stocktaking/StockTakingByIdRequest.cs | 13 ++++ .../Controllers/PDAStocktakingController.cs | 69 +++++++++++++++++++ 5 files changed, 112 insertions(+), 10 deletions(-) create mode 100644 WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs create mode 100644 WCS.WebApi/Controllers/PDAStocktakingController.cs diff --git a/WCS.BLL/Services/IService/IStockTakingService.cs b/WCS.BLL/Services/IService/IStockTakingService.cs index 06522e5..9f748a7 100644 --- a/WCS.BLL/Services/IService/IStockTakingService.cs +++ b/WCS.BLL/Services/IService/IStockTakingService.cs @@ -32,5 +32,10 @@ namespace WCS.BLL.Services.IService public Task confirmStocktakingOrder(ConfirmStocktakingOrderRequest request); public Task commitStockTakingOrder(GetStockTakingOrderMatDetailRequest request); + + + #region 赛特制冷 + public Task stockTakingById(StockTakingByIdRequest request); + #endregion } } diff --git a/WCS.BLL/Services/Service/BatchBindMatDetailService.cs b/WCS.BLL/Services/Service/BatchBindMatDetailService.cs index f5bd2ad..358bb47 100644 --- a/WCS.BLL/Services/Service/BatchBindMatDetailService.cs +++ b/WCS.BLL/Services/Service/BatchBindMatDetailService.cs @@ -201,13 +201,13 @@ namespace WCS.BLL.Services.Service #region 校验 //工位校验 工位是否有货架校验 var station = await DbHelp.db.Queryable() - .Where(t => t.LocationCode == stationCode || t.IsEnable == true) + .Where(t => t.LocationCode == stationCode && t.IsEnable == true) .FirstAsync(); if (station == null) { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:工位[{stationCode}]不存在或已被禁用！", Data = null, }; @@ -222,7 +222,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:当前工位不存在货架，请呼叫货架后再进行操作！", Data = null, }; @@ -240,7 +240,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:数量应该大于0!", Data = null, }; @@ -249,7 +249,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:物料编码必填!", Data = null, }; @@ -258,7 +258,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:单据类型[{matDetailCurrentInfo.单据类型}]无效!", Data = null, }; @@ -268,7 +268,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:货架[{matDetailCurrentInfo.货架编码}]不是当前工位的货架!", Data = null, }; @@ -289,7 +289,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:请重试！", Data = null, }; @@ -303,7 +303,7 @@ namespace WCS.BLL.Services.Service { return new ResponseCommon>() { - Code = 200, + Code = 201, Message = $"导入失败:以下物料编码无效!\r\n{string.Join(",", matCodes)}", Data = null, }; @@ -368,7 +368,7 @@ namespace WCS.BLL.Services.Service }; return new ResponseCommon>() { - Code = 200, + Code = 201, Message = "导入失败", Data = ErrList }; diff --git a/WCS.BLL/Services/Service/StockTakingService.cs b/WCS.BLL/Services/Service/StockTakingService.cs index 06f6337..450b8ba 100644 --- a/WCS.BLL/Services/Service/StockTakingService.cs +++ b/WCS.BLL/Services/Service/StockTakingService.cs @@ -1045,5 +1045,20 @@ namespace WCS.BLL.Services.Service } + #region 赛特制冷 + public async Task stockTakingById(StockTakingByIdRequest request) + { + //先查询有无这一条库存记录 + var matDetailCurrentInfo = DbHelp.db.Queryable() + .Where(t => t.Id == request.MatDetailCurrentInfoId) + .FirstAsync(); + + return new ResponseCommon() + { + Code = 200, + Message = $"success", + }; + } + #endregion } } diff --git a/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs b/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs new file mode 100644 index 0000000..bdf5205 --- /dev/null +++ b/WCS.Model/ApiModel/Stocktaking/StockTakingByIdRequest.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace WCS.Model.ApiModel.Stocktaking +{ + public class StockTakingByIdRequest:RequestBase + { + public int MatDetailCurrentInfoId { get; set; } + + public int MatQty { get; set; } + } +} diff --git a/WCS.WebApi/Controllers/PDAStocktakingController.cs b/WCS.WebApi/Controllers/PDAStocktakingController.cs new file mode 100644 index 0000000..6137c38 --- /dev/null +++ b/WCS.WebApi/Controllers/PDAStocktakingController.cs @@ -0,0 +1,69 @@ +using Microsoft.AspNetCore.Mvc; +using WCS.BLL.DbModels; +using WCS.BLL.Services.IService; +using WCS.DAL.Db; +using WCS.DAL.DbModels; +using WCS.Model; +using WCS.Model.ApiModel; +using WCS.Model.ApiModel.PDAMatBind; +using WCS.Model.ApiModel.Stocktaking; +using WCS.Model.ApiModel.User; +using WCS.Model.WebSocketModel; + +namespace WCS.WebApi.Controllers +{ + /// + /// PDA库存盘点 + /// + [ApiController] + [Route("[controller]")] + public class PDAStocktakingController : ControllerBase + { + public IWarningService _warningService { get; set; } + + public PDAStocktakingController(IWarningService warningService) + { + _warningService = warningService; + } + + [Route("stockTakingById")] + [HttpPost(Name = "stockTakingById")] + public async Task stockTakingById(StockTakingByIdRequest request) + { + try + { + #region 参数校验 + //判断参数 //数量可以为空 数量为空盘点确认 这边删除对应数据即可 + if (request.MatDetailCurrentInfoId == 0) + { + return new ResponseCommon() + { + Code = 201, + Message = $"操作失败:参数传入错误(Id为0)!", + Data = null, + }; + } + + #endregion + + return new ResponseCommon() + { + Code = 200, + Message = "success", + Data = null, + }; + } + catch (Exception ex) + { + return new ResponseCommon() + { + Code = 201, + Message = ex.Message, + Data = null, + }; + } + } + + + } +}