箱唛接口功能
This commit is contained in:
tongfei
89
src/WMS.Web.Api/Controllers/BoxMarkController.cs
Normal file
89
src/WMS.Web.Api/Controllers/BoxMarkController.cs
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
using Microsoft.AspNetCore.Http;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Internal.Results;
|
||||||
|
using WMS.Web.Domain.Infrastructure;
|
||||||
|
using WMS.Web.Domain.IService;
|
||||||
|
using WMS.Web.Domain.IService.Public;
|
||||||
|
using WMS.Web.Domain.Values;
|
||||||
|
|
||||||
|
namespace WMS.Web.Api.Controllers
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛-接口
|
||||||
|
/// </summary>
|
||||||
|
[Route("api/[controller]")]
|
||||||
|
[ApiController]
|
||||||
|
public class BoxMarkController : ControllerBase
|
||||||
|
{
|
||||||
|
|
||||||
|
private readonly ILoginService _loginService;
|
||||||
|
private readonly IBoxMarkService _boxMarkService;
|
||||||
|
private readonly IBoxMarkRepositories _boxMarkRepositories;
|
||||||
|
private readonly IExportExcelService _exportExcelService;
|
||||||
|
public BoxMarkController(
|
||||||
|
ILoginService loginService,
|
||||||
|
IBoxMarkRepositories boxMarkRepositories,
|
||||||
|
IBoxMarkService boxMarkService,
|
||||||
|
IExportExcelService exportExcelService)
|
||||||
|
{
|
||||||
|
this._loginService = loginService;
|
||||||
|
this._boxMarkService = boxMarkService;
|
||||||
|
this._exportExcelService = exportExcelService;
|
||||||
|
this._boxMarkRepositories = boxMarkRepositories;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 列表
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
[Route("GetList")]
|
||||||
|
public async Task<ResultPagedList<BoxMarkQueryResponse>> GetPagedList([FromBody] BoxMarkQueryRequest dto)
|
||||||
|
{
|
||||||
|
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||||
|
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||||
|
return ResultPagedList<BoxMarkQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||||
|
var (list, count) = await _boxMarkRepositories.GetPagedList(dto, loginInfo.UserInfo.CompanyId);
|
||||||
|
return ResultPagedList<BoxMarkQueryResponse>.ReSuccess(list, count);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
[Route("generate")]
|
||||||
|
public async Task<Result> DeleteAsync([FromBody] GenerateBoxMarkDto dto)
|
||||||
|
{
|
||||||
|
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||||
|
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||||
|
return ResultPagedList<BoxMarkQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||||
|
return await _boxMarkService.Generate(dto, loginInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 批量删除
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
[HttpPost]
|
||||||
|
[Route("delete")]
|
||||||
|
public async Task<Result> Delete([FromBody] OperateRequest dto)
|
||||||
|
{
|
||||||
|
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
|
||||||
|
if (loginInfo == null || loginInfo.UserInfo == null)
|
||||||
|
return ResultPagedList<BoxMarkQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
|
||||||
|
var isSuccess= await _boxMarkRepositories.DeleteRange(dto.Ids);
|
||||||
|
if(!isSuccess)
|
||||||
|
return Result.ReFailure(ResultCodes.DateWriteError);
|
||||||
|
return Result.ReSuccess();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,6 +37,32 @@
|
|||||||
<param name="dto"></param>
|
<param name="dto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Api.Controllers.BoxMarkController">
|
||||||
|
<summary>
|
||||||
|
箱唛-接口
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Api.Controllers.BoxMarkController.GetPagedList(WMS.Web.Core.Dto.BoxMarkQueryRequest)">
|
||||||
|
<summary>
|
||||||
|
列表
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Api.Controllers.BoxMarkController.DeleteAsync(WMS.Web.Core.Dto.GenerateBoxMarkDto)">
|
||||||
|
<summary>
|
||||||
|
生成
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Api.Controllers.BoxMarkController.Delete(WMS.Web.Core.Dto.OperateRequest)">
|
||||||
|
<summary>
|
||||||
|
批量删除
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Api.Controllers.ChangeBoxRecordController">
|
<member name="T:WMS.Web.Api.Controllers.ChangeBoxRecordController">
|
||||||
<summary>
|
<summary>
|
||||||
改箱
|
改箱
|
||||||
|
|||||||
@@ -305,6 +305,191 @@
|
|||||||
序列号集
|
序列号集
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Core.Dto.BoxMarkQueryRequest">
|
||||||
|
<summary>
|
||||||
|
请求对象
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.OrderBillNos">
|
||||||
|
<summary>
|
||||||
|
订单编号集合字符串
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.Material">
|
||||||
|
<summary>
|
||||||
|
物料三件套搜索
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.BeginBillNo">
|
||||||
|
<summary>
|
||||||
|
开始的箱唛编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.EndBillNo">
|
||||||
|
<summary>
|
||||||
|
结束的箱唛编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.Creator">
|
||||||
|
<summary>
|
||||||
|
操作人
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.BeginTime">
|
||||||
|
<summary>
|
||||||
|
生成开始时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryRequest.EndTime">
|
||||||
|
<summary>
|
||||||
|
生成结束时间
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="T:WMS.Web.Core.Dto.BoxMarkQueryResponse">
|
||||||
|
<summary>
|
||||||
|
列表响应对象
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.Id">
|
||||||
|
<summary>
|
||||||
|
唯一ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.BillNo">
|
||||||
|
<summary>
|
||||||
|
箱唛编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.OrderBillNo">
|
||||||
|
<summary>
|
||||||
|
订单编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.Specifications">
|
||||||
|
<summary>
|
||||||
|
物料规格型号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.MaterialNumber">
|
||||||
|
<summary>
|
||||||
|
物料编码
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.MaterialName">
|
||||||
|
<summary>
|
||||||
|
物料名称
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.BarCode">
|
||||||
|
<summary>
|
||||||
|
69条码
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.CratingQty">
|
||||||
|
<summary>
|
||||||
|
装箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.CratingNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.CratingGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.TailboxQty">
|
||||||
|
<summary>
|
||||||
|
尾箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.TailboxNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.TailboxGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.Remark">
|
||||||
|
<summary>
|
||||||
|
备注
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.Creator">
|
||||||
|
<summary>
|
||||||
|
操作人
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.BoxMarkQueryResponse.CreateTime">
|
||||||
|
<summary>
|
||||||
|
创建时间（生成时间）
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="T:WMS.Web.Core.Dto.GenerateBoxMarkDto">
|
||||||
|
<summary>
|
||||||
|
生成箱唛dto
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.BillNo">
|
||||||
|
<summary>
|
||||||
|
箱唛编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.OrderBillNo">
|
||||||
|
<summary>
|
||||||
|
订单编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.MaterialId">
|
||||||
|
<summary>
|
||||||
|
物料ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.ProductQty">
|
||||||
|
<summary>
|
||||||
|
产品数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.CratingQty">
|
||||||
|
<summary>
|
||||||
|
装箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.CratingNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.CratingGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.TailboxQty">
|
||||||
|
<summary>
|
||||||
|
尾箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.TailboxNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.TailboxGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Core.Dto.GenerateBoxMarkDto.Remark">
|
||||||
|
<summary>
|
||||||
|
备注
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Core.Dto.BoxResponse">
|
<member name="T:WMS.Web.Core.Dto.BoxResponse">
|
||||||
<summary>
|
<summary>
|
||||||
箱信息(头部)
|
箱信息(头部)
|
||||||
@@ -4284,7 +4469,7 @@
|
|||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockEndTime">
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.OutStockEndTime">
|
||||||
<summary>
|
<summary>
|
||||||
出库结束时间
|
出库完成时间
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Operator">
|
<member name="P:WMS.Web.Core.Dto.OutStockTask.OutStockTaskQueryInfoResponse.Operator">
|
||||||
|
|||||||
@@ -270,6 +270,104 @@
|
|||||||
序列号
|
序列号
|
||||||
</summary>
|
</summary>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Domain.Entitys.BoxMark">
|
||||||
|
<summary>
|
||||||
|
箱唛表
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.Id">
|
||||||
|
<summary>
|
||||||
|
ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.BillNo">
|
||||||
|
<summary>
|
||||||
|
箱唛编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.FirstBillNo">
|
||||||
|
<summary>
|
||||||
|
箱唛编号-首位
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.LastBillNo">
|
||||||
|
<summary>
|
||||||
|
箱唛编号-末尾序号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.OrderBillNo">
|
||||||
|
<summary>
|
||||||
|
订单编号
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.MaterialId">
|
||||||
|
<summary>
|
||||||
|
物料ID
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.ProductQty">
|
||||||
|
<summary>
|
||||||
|
产品数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.CratingQty">
|
||||||
|
<summary>
|
||||||
|
装箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.CratingNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.CratingGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
装箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.TailboxQty">
|
||||||
|
<summary>
|
||||||
|
尾箱数量
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.TailboxNetWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱净重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.TailboxGrossWeightQty">
|
||||||
|
<summary>
|
||||||
|
尾箱毛重
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.Remark">
|
||||||
|
<summary>
|
||||||
|
备注
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.CreatorId">
|
||||||
|
<summary>
|
||||||
|
操作人
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="P:WMS.Web.Domain.Entitys.BoxMark.CreateTime">
|
||||||
|
<summary>
|
||||||
|
创建时间（生成时间）
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Entitys.BoxMark.Create(System.Int32)">
|
||||||
|
<summary>
|
||||||
|
创建
|
||||||
|
</summary>
|
||||||
|
<param name="creatorId"></param>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Entitys.BoxMark.GenerateBillNo(System.Int32,System.Int32)">
|
||||||
|
<summary>
|
||||||
|
生成编号
|
||||||
|
</summary>
|
||||||
|
<param name="firstBillNo"></param>
|
||||||
|
<param name="lastBillNo"></param>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.Entitys.ChangeBoxRecord">
|
<member name="T:WMS.Web.Domain.Entitys.ChangeBoxRecord">
|
||||||
<summary>
|
<summary>
|
||||||
wms改箱记录
|
wms改箱记录
|
||||||
@@ -2110,6 +2208,41 @@
|
|||||||
<param name="isTransaction"></param>
|
<param name="isTransaction"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Domain.Infrastructure.IBoxMarkRepositories">
|
||||||
|
<summary>
|
||||||
|
箱唛-仓储接口
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Infrastructure.IBoxMarkRepositories.GetPagedList(WMS.Web.Core.Dto.BoxMarkQueryRequest,System.Int32)">
|
||||||
|
<summary>
|
||||||
|
列表分页
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<param name="companyId"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Infrastructure.IBoxMarkRepositories.Add(WMS.Web.Domain.Entitys.BoxMark,System.Boolean)">
|
||||||
|
<summary>
|
||||||
|
添加
|
||||||
|
</summary>
|
||||||
|
<param name="entity"></param>
|
||||||
|
<param name="isTransaction"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Infrastructure.IBoxMarkRepositories.GetBy">
|
||||||
|
<summary>
|
||||||
|
详情-根据最新的ID
|
||||||
|
</summary>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Infrastructure.IBoxMarkRepositories.DeleteRange(System.Collections.Generic.List{System.Int32},System.Boolean)">
|
||||||
|
<summary>
|
||||||
|
批量删除
|
||||||
|
</summary>
|
||||||
|
<param name="ids"></param>
|
||||||
|
<param name="isTransaction"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.Infrastructure.IBoxRepositories">
|
<member name="T:WMS.Web.Domain.Infrastructure.IBoxRepositories">
|
||||||
<summary>
|
<summary>
|
||||||
老ops箱信息
|
老ops箱信息
|
||||||
@@ -2611,6 +2744,19 @@
|
|||||||
<param name="isTransaction"></param>
|
<param name="isTransaction"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Domain.IService.IBoxMarkService">
|
||||||
|
<summary>
|
||||||
|
箱唛-服务接口
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.IService.IBoxMarkService.Generate(WMS.Web.Core.Dto.GenerateBoxMarkDto,WMS.Web.Core.Dto.Login.LoginInDto)">
|
||||||
|
<summary>
|
||||||
|
生成
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<param name="loginInfo"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.IService.IChangeMoveBoxService">
|
<member name="T:WMS.Web.Domain.IService.IChangeMoveBoxService">
|
||||||
<summary>
|
<summary>
|
||||||
改箱 移箱服务
|
改箱 移箱服务
|
||||||
@@ -3890,6 +4036,19 @@
|
|||||||
<param name="dto"></param>
|
<param name="dto"></param>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="T:WMS.Web.Domain.Services.BoxMarkService">
|
||||||
|
<summary>
|
||||||
|
箱唛-服务
|
||||||
|
</summary>
|
||||||
|
</member>
|
||||||
|
<member name="M:WMS.Web.Domain.Services.BoxMarkService.Generate(WMS.Web.Core.Dto.GenerateBoxMarkDto,WMS.Web.Core.Dto.Login.LoginInDto)">
|
||||||
|
<summary>
|
||||||
|
生成
|
||||||
|
</summary>
|
||||||
|
<param name="dto"></param>
|
||||||
|
<param name="loginInfo"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="T:WMS.Web.Domain.Services.BoxService">
|
<member name="T:WMS.Web.Domain.Services.BoxService">
|
||||||
<summary>
|
<summary>
|
||||||
箱服务信息
|
箱服务信息
|
||||||
|
|||||||
46
src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs
Normal file
46
src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryRequest.cs
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace WMS.Web.Core.Dto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 请求对象
|
||||||
|
/// </summary>
|
||||||
|
public class BoxMarkQueryRequest : PaginationBaseRequestDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 订单编号集合字符串
|
||||||
|
/// </summary>
|
||||||
|
public string OrderBillNos { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料三件套搜索
|
||||||
|
/// </summary>
|
||||||
|
public string Material { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 开始的箱唛编号
|
||||||
|
/// </summary>
|
||||||
|
public string BeginBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 结束的箱唛编号
|
||||||
|
/// </summary>
|
||||||
|
public string EndBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 操作人
|
||||||
|
/// </summary>
|
||||||
|
public string Creator { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成开始时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? BeginTime { get; set; } = null;
|
||||||
|
/// <summary>
|
||||||
|
/// 生成结束时间
|
||||||
|
/// </summary>
|
||||||
|
public DateTime? EndTime { get; set; } = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
91
src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryResponse.cs
Normal file
91
src/WMS.Web.Core/Dto/BoxMark/BoxMarkQueryResponse.cs
Normal file
@@ -0,0 +1,91 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace WMS.Web.Core.Dto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 列表响应对象
|
||||||
|
/// </summary>
|
||||||
|
public class BoxMarkQueryResponse
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 唯一ID
|
||||||
|
/// </summary>
|
||||||
|
public int Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛编号
|
||||||
|
/// </summary>
|
||||||
|
public string BillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 订单编号
|
||||||
|
/// </summary>
|
||||||
|
public string OrderBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料规格型号
|
||||||
|
/// </summary>
|
||||||
|
public string Specifications { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// 物料编码
|
||||||
|
/// </summary>
|
||||||
|
public string MaterialNumber { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料名称
|
||||||
|
/// </summary>
|
||||||
|
public string MaterialName { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 69条码
|
||||||
|
/// </summary>
|
||||||
|
public string BarCode { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public string Remark { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 操作人
|
||||||
|
/// </summary>
|
||||||
|
public string Creator { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建时间（生成时间）
|
||||||
|
/// </summary>
|
||||||
|
public string CreateTime { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
67
src/WMS.Web.Core/Dto/BoxMark/GenerateBoxMarkDto.cs
Normal file
67
src/WMS.Web.Core/Dto/BoxMark/GenerateBoxMarkDto.cs
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
|
namespace WMS.Web.Core.Dto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 生成箱唛dto
|
||||||
|
/// </summary>
|
||||||
|
public class GenerateBoxMarkDto
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛编号
|
||||||
|
/// </summary>
|
||||||
|
public string BillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 订单编号
|
||||||
|
/// </summary>
|
||||||
|
public string OrderBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料ID
|
||||||
|
/// </summary>
|
||||||
|
public int MaterialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 产品数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal ProductQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public string Remark { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
135
src/WMS.Web.Domain/Entitys/BoxMark.cs
Normal file
135
src/WMS.Web.Domain/Entitys/BoxMark.cs
Normal file
@@ -0,0 +1,135 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel.DataAnnotations.Schema;
|
||||||
|
using System.Text;
|
||||||
|
using WMS.Web.Core;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.Entitys
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛表
|
||||||
|
/// </summary>
|
||||||
|
[Serializable]
|
||||||
|
[Table("t_wms_box_mark")]
|
||||||
|
public class BoxMark : EntityBase
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// ID
|
||||||
|
/// </summary>
|
||||||
|
public override int Id { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛编号
|
||||||
|
/// </summary>
|
||||||
|
public string BillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛编号-首位
|
||||||
|
/// </summary>
|
||||||
|
public int FirstBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛编号-末尾序号
|
||||||
|
/// </summary>
|
||||||
|
public int LastBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 订单编号
|
||||||
|
/// </summary>
|
||||||
|
public string OrderBillNo { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 物料ID
|
||||||
|
/// </summary>
|
||||||
|
public int MaterialId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 产品数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal ProductQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 装箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal CratingGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱数量
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱净重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxNetWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 尾箱毛重
|
||||||
|
/// </summary>
|
||||||
|
public decimal TailboxGrossWeightQty { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 备注
|
||||||
|
/// </summary>
|
||||||
|
public string Remark { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 操作人
|
||||||
|
/// </summary>
|
||||||
|
public int CreatorId { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建时间（生成时间）
|
||||||
|
/// </summary>
|
||||||
|
public DateTime CreateTime { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 创建
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="creatorId"></param>
|
||||||
|
public void Create(int creatorId)
|
||||||
|
{
|
||||||
|
this.CreatorId = creatorId;
|
||||||
|
this.CreateTime = DateTime.Now;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成编号
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="firstBillNo"></param>
|
||||||
|
/// <param name="lastBillNo"></param>
|
||||||
|
public void GenerateBillNo(int firstBillNo,int lastBillNo)
|
||||||
|
{
|
||||||
|
this.FirstBillNo=Convert.ToInt32(DateTime.Now.ToString("yyMMdd"));
|
||||||
|
if (this.FirstBillNo == firstBillNo)
|
||||||
|
this.LastBillNo = lastBillNo + 1;
|
||||||
|
else
|
||||||
|
this.LastBillNo = 1;
|
||||||
|
|
||||||
|
if (this.LastBillNo.ToString().Length >= 5)
|
||||||
|
{
|
||||||
|
this.BillNo = "XM" + this.FirstBillNo + this.LastBillNo;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
string lastStr = this.LastBillNo.ToString();
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
lastStr = "0" + lastStr;
|
||||||
|
if (lastStr.Length >= 5) break;
|
||||||
|
}
|
||||||
|
this.BillNo = "XM" + this.FirstBillNo + lastStr;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
24
src/WMS.Web.Domain/IService/IBoxMarkService.cs
Normal file
24
src/WMS.Web.Domain/IService/IBoxMarkService.cs
Normal file
@@ -0,0 +1,24 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Dto.Login;
|
||||||
|
using WMS.Web.Core.Internal.Results;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.IService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛-服务接口
|
||||||
|
/// </summary>
|
||||||
|
public interface IBoxMarkService
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 生成
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <param name="loginInfo"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<Result> Generate(GenerateBoxMarkDto dto, LoginInDto loginInfo);
|
||||||
|
}
|
||||||
|
}
|
||||||
45
src/WMS.Web.Domain/Infrastructure/IBoxMarkRepositories.cs
Normal file
45
src/WMS.Web.Domain/Infrastructure/IBoxMarkRepositories.cs
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Domain.Entitys;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.Infrastructure
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛-仓储接口
|
||||||
|
/// </summary>
|
||||||
|
public interface IBoxMarkRepositories
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 列表分页
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <param name="companyId"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<(List<BoxMarkQueryResponse> list, int total)> GetPagedList(BoxMarkQueryRequest dto, int companyId);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 添加
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="entity"></param>
|
||||||
|
/// <param name="isTransaction"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<bool> Add(BoxMark entity, bool isTransaction = true);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 详情-根据最新的ID
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<BoxMark> GetBy();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 批量删除
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="ids"></param>
|
||||||
|
/// <param name="isTransaction"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
Task<bool> DeleteRange(List<int> ids, bool isTransaction = true);
|
||||||
|
}
|
||||||
|
}
|
||||||
17
src/WMS.Web.Domain/Mappers/BoxMarkMapper.cs
Normal file
17
src/WMS.Web.Domain/Mappers/BoxMarkMapper.cs
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Domain.Entitys;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.Mappers
|
||||||
|
{
|
||||||
|
public class BoxMarkMapper : Profile
|
||||||
|
{
|
||||||
|
public BoxMarkMapper()
|
||||||
|
{
|
||||||
|
CreateMap<GenerateBoxMarkDto, BoxMark>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
62
src/WMS.Web.Domain/Services/BoxMarkService.cs
Normal file
62
src/WMS.Web.Domain/Services/BoxMarkService.cs
Normal file
@@ -0,0 +1,62 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Dto.Login;
|
||||||
|
using WMS.Web.Core.Internal.Results;
|
||||||
|
using WMS.Web.Domain.Entitys;
|
||||||
|
using WMS.Web.Domain.Infrastructure;
|
||||||
|
using WMS.Web.Domain.IService;
|
||||||
|
using WMS.Web.Domain.IService.Public;
|
||||||
|
using WMS.Web.Domain.Values;
|
||||||
|
|
||||||
|
namespace WMS.Web.Domain.Services
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛-服务
|
||||||
|
/// </summary>
|
||||||
|
public class BoxMarkService : IBoxMarkService
|
||||||
|
{
|
||||||
|
private readonly IMapper _mapper;
|
||||||
|
public readonly IBasicsRepositories _transactionRepositories;
|
||||||
|
private readonly IBoxMarkRepositories _boxMarkRepositories;
|
||||||
|
public BoxMarkService(IMapper mapper,
|
||||||
|
IBasicsRepositories transactionRepositories,
|
||||||
|
IBoxMarkRepositories boxMarkRepositories)
|
||||||
|
{
|
||||||
|
_mapper = mapper;
|
||||||
|
_transactionRepositories = transactionRepositories;
|
||||||
|
_boxMarkRepositories = boxMarkRepositories;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 生成
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <param name="loginInfo"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<Result> Generate(GenerateBoxMarkDto dto, LoginInDto loginInfo)
|
||||||
|
{
|
||||||
|
//1.获取最新的箱唛信息
|
||||||
|
var entity_new = await _boxMarkRepositories.GetBy();
|
||||||
|
|
||||||
|
//2.dto映射实体
|
||||||
|
var entity = new BoxMark();
|
||||||
|
entity= _mapper.Map(dto, entity);
|
||||||
|
entity.Create(loginInfo.UserInfo.StaffId);
|
||||||
|
|
||||||
|
var new_firstBillNo = entity_new == null ? 0 : entity_new.FirstBillNo;
|
||||||
|
var new_lastBillNo = entity_new == null ? 0 : entity_new.LastBillNo;
|
||||||
|
entity.GenerateBillNo(new_firstBillNo, new_lastBillNo);
|
||||||
|
|
||||||
|
//添加
|
||||||
|
var isSuccess = await _boxMarkRepositories.Add(entity);
|
||||||
|
if (!isSuccess)
|
||||||
|
return Result<InStockTask>.ReFailure(ResultCodes.DateWriteError);
|
||||||
|
|
||||||
|
return Result.ReSuccess();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
217
src/WMS.Web.Repositories/BoxMarkRepositories.cs
Normal file
217
src/WMS.Web.Repositories/BoxMarkRepositories.cs
Normal file
@@ -0,0 +1,217 @@
|
|||||||
|
using AutoMapper;
|
||||||
|
using Microsoft.EntityFrameworkCore;
|
||||||
|
using Microsoft.EntityFrameworkCore.Storage;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
using WMS.Web.Core.Dto;
|
||||||
|
using WMS.Web.Core.Dto.Erp;
|
||||||
|
using WMS.Web.Domain.Entitys;
|
||||||
|
using WMS.Web.Domain.Infrastructure;
|
||||||
|
using WMS.Web.Domain.IService.Public;
|
||||||
|
using WMS.Web.Domain.Values.Single;
|
||||||
|
using WMS.Web.Repositories.Configuration;
|
||||||
|
|
||||||
|
namespace WMS.Web.Repositories
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// 箱唛-仓储
|
||||||
|
/// </summary>
|
||||||
|
public class BoxMarkRepositories : IBoxMarkRepositories
|
||||||
|
{
|
||||||
|
private readonly ILoginRepositories _loginRepositories;
|
||||||
|
private readonly RepositoryDbContext _context;
|
||||||
|
private readonly ISingleDataService _singleDataService;
|
||||||
|
private readonly IErpService _erpService;
|
||||||
|
private readonly IErpBasicDataExtendService _erpBasicDataExtendService;
|
||||||
|
private readonly IBasicsRepositories _basicsRepositories;
|
||||||
|
|
||||||
|
|
||||||
|
public BoxMarkRepositories(RepositoryDbContext context,
|
||||||
|
IErpService erpService,
|
||||||
|
ILoginRepositories loginRepositories,
|
||||||
|
ISingleDataService singleDataService,
|
||||||
|
IBasicsRepositories basicsRepositories,
|
||||||
|
IErpBasicDataExtendService erpBasicDataExtendService)
|
||||||
|
{
|
||||||
|
_context = context;
|
||||||
|
_erpService = erpService;
|
||||||
|
_basicsRepositories = basicsRepositories;
|
||||||
|
_loginRepositories = loginRepositories;
|
||||||
|
_singleDataService = singleDataService;
|
||||||
|
_erpBasicDataExtendService = erpBasicDataExtendService;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 列表-分页
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="dto"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<(List<BoxMarkQueryResponse> list, int total)> GetPagedList(BoxMarkQueryRequest dto, int companyId)
|
||||||
|
{
|
||||||
|
//1.获取物料集合和组织集合和供应商的集合
|
||||||
|
var materials = new List<ErpMaterialDto>();
|
||||||
|
var materials_result = await _erpService.BillQueryForMaterial();
|
||||||
|
if (materials_result.IsSuccess)
|
||||||
|
materials = materials_result.Data.ToList();
|
||||||
|
|
||||||
|
|
||||||
|
//物料集合；模糊查询后的物料集合
|
||||||
|
if (!string.IsNullOrEmpty(dto.Material))
|
||||||
|
materials = materials.Where(w => w.MaterialNumber.Contains(dto.Material) || w.MaterialName.Contains(dto.Material) || w.Specifications.Contains(dto.Material)).ToList();
|
||||||
|
|
||||||
|
if (companyId == 0)
|
||||||
|
companyId = _loginRepositories.CompanyId;
|
||||||
|
List<int> cr_ids = new List<int>();
|
||||||
|
if (!string.IsNullOrEmpty(dto.Creator))
|
||||||
|
{
|
||||||
|
var staffList = await _basicsRepositories.GetStaffListAsync(companyId);
|
||||||
|
if (staffList != null)
|
||||||
|
cr_ids = staffList.Where(w => w.Name.Contains(dto.Creator)).Select(s => s.Id).ToList();
|
||||||
|
}
|
||||||
|
var query = _context.BoxMark.Where(adv => 1 == 1);
|
||||||
|
|
||||||
|
//编号查询
|
||||||
|
if (!string.IsNullOrEmpty(dto.BeginBillNo) &&
|
||||||
|
!string.IsNullOrEmpty(dto.EndBillNo))
|
||||||
|
{
|
||||||
|
if (dto.BeginBillNo.ToString().Length >= 13 && dto.EndBillNo.ToString().Length >= 13)
|
||||||
|
{
|
||||||
|
var begYMD = Convert.ToInt32(dto.BeginBillNo.Substring(2, 6));
|
||||||
|
var endYMD = Convert.ToInt32(dto.EndBillNo.Substring(2, 6));
|
||||||
|
//if (begYMD <= endYMD)
|
||||||
|
|
||||||
|
var begNo = Convert.ToInt32(dto.BeginBillNo.Substring(8));
|
||||||
|
var endNo = Convert.ToInt32(dto.EndBillNo.Substring(8));
|
||||||
|
query = query.Where(w => w.FirstBillNo >= begYMD && w.FirstBillNo <= endYMD && w.LastBillNo >= begNo && w.LastBillNo <= endNo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
query = query.Where(w => w.BillNo == dto.BeginBillNo || w.BillNo == dto.EndBillNo);
|
||||||
|
|
||||||
|
//订单号查询
|
||||||
|
if (!string.IsNullOrEmpty(dto.OrderBillNos))
|
||||||
|
{
|
||||||
|
var orderBNS = dto.OrderBillNos.Replace("，", ",");
|
||||||
|
var orderBillNoList= orderBNS.Split(",").Where(x => !string.IsNullOrEmpty(x)).ToList();
|
||||||
|
if (orderBillNoList != null && orderBillNoList.Count != 0)
|
||||||
|
{
|
||||||
|
query = query.Where(w => orderBillNoList.Contains(w.OrderBillNo));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//物料ID在模糊后的物料
|
||||||
|
if (!string.IsNullOrEmpty(dto.Material))
|
||||||
|
{
|
||||||
|
if (materials != null && materials.Count != 0)
|
||||||
|
{
|
||||||
|
var mids = materials.Select(x => x.MaterialId).ToList();
|
||||||
|
query = query.Where(w => mids.Contains(w.MaterialId));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cr_ids.Count != 0)
|
||||||
|
query = query.Where(w => cr_ids.Contains(w.CreatorId));
|
||||||
|
|
||||||
|
if (dto.BeginTime != null)
|
||||||
|
query = query.Where(w => w.CreateTime >= dto.BeginTime.Value);
|
||||||
|
if (dto.EndTime != null)
|
||||||
|
query = query.Where(w => w.CreateTime <= dto.EndTime.Value);
|
||||||
|
|
||||||
|
int total = await query.CountAsync();
|
||||||
|
var list = await query.Select(s => new BoxMarkQueryResponse()
|
||||||
|
{
|
||||||
|
Id = s.Id,
|
||||||
|
BillNo = s.BillNo,
|
||||||
|
OrderBillNo = s.OrderBillNo,
|
||||||
|
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
|
||||||
|
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
|
||||||
|
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
|
||||||
|
BarCode = "",
|
||||||
|
|
||||||
|
CratingQty = s.CratingQty,
|
||||||
|
CratingNetWeightQty = s.CratingNetWeightQty,
|
||||||
|
CratingGrossWeightQty = s.CratingGrossWeightQty,
|
||||||
|
|
||||||
|
TailboxQty = s.TailboxQty,
|
||||||
|
TailboxNetWeightQty = s.TailboxNetWeightQty,
|
||||||
|
TailboxGrossWeightQty = s.TailboxGrossWeightQty,
|
||||||
|
|
||||||
|
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, s.CreatorId),
|
||||||
|
CreateTime = s.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
|
||||||
|
Remark = s.Remark
|
||||||
|
}).OrderByDescending(x => x.Id).Skip((dto.PageNo - 1) * dto.PageSize).Take(dto.PageSize).ToListAsync();
|
||||||
|
|
||||||
|
return (list, total);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 新增
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="entity"></param>
|
||||||
|
/// <param name="isTransaction"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<bool> Add(BoxMark entity, bool isTransaction = true)
|
||||||
|
{
|
||||||
|
IDbContextTransaction _transaction = null;
|
||||||
|
if (isTransaction)
|
||||||
|
_transaction = _context.Database.BeginTransaction();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await _context.BoxMark.AddAsync(entity);
|
||||||
|
await _context.SaveChangesAsync();
|
||||||
|
if (_transaction != null)
|
||||||
|
_transaction.Commit();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (_transaction != null)
|
||||||
|
_transaction.Rollback();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 详情-根据最新的ID
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<BoxMark> GetBy()
|
||||||
|
{
|
||||||
|
var entity = await _context.BoxMark.OrderByDescending(x => x.Id).FirstOrDefaultAsync();
|
||||||
|
return entity;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 批量删除
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="id"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public async Task<bool> DeleteRange(List<int> ids, bool isTransaction = true)
|
||||||
|
{
|
||||||
|
IDbContextTransaction _transaction = null;
|
||||||
|
if (isTransaction)
|
||||||
|
_transaction = _context.Database.BeginTransaction();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var list = await _context.BoxMark.Where(f => ids.Contains(f.Id)).ToListAsync();
|
||||||
|
_context.BoxMark.RemoveRange(list);
|
||||||
|
await _context.SaveChangesAsync();
|
||||||
|
|
||||||
|
if (_transaction != null)
|
||||||
|
_transaction.Commit();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
if (_transaction != null)
|
||||||
|
_transaction.Rollback();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -351,11 +351,17 @@ namespace WMS.Web.Repositories.Configuration
|
|||||||
});
|
});
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
//箱唛表
|
||||||
|
builder.Entity<BoxMark>(ent =>
|
||||||
|
{
|
||||||
|
ent.ToTable("t_wms_box_mark");
|
||||||
|
ent.HasKey(x => x.Id);
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
base.OnModelCreating(builder);
|
base.OnModelCreating(builder);
|
||||||
}
|
}
|
||||||
|
public DbSet<BoxMark> BoxMark { get; set; }
|
||||||
public DbSet<FileDownManager> FileDownManager { get; set; }
|
public DbSet<FileDownManager> FileDownManager { get; set; }
|
||||||
public DbSet<SerialNumbers> SerialNumbers { get; set; }
|
public DbSet<SerialNumbers> SerialNumbers { get; set; }
|
||||||
public DbSet<ErpOpsSyncDate> ErpOpsSyncDate { get; set; }
|
public DbSet<ErpOpsSyncDate> ErpOpsSyncDate { get; set; }
|
||||||
|
|||||||
@@ -294,6 +294,7 @@ namespace WMS.Web.Repositories.DependencyInjection
|
|||||||
Services.AddTransient<IInventoryInOutDetailsService, InventoryInOutDetailsService>();
|
Services.AddTransient<IInventoryInOutDetailsService, InventoryInOutDetailsService>();
|
||||||
Services.AddTransient<IInventoryDetailsService, InventoryDetailsService>();
|
Services.AddTransient<IInventoryDetailsService, InventoryDetailsService>();
|
||||||
Services.AddTransient<IInStockTaskBoxService, InStockTaskBoxService>();
|
Services.AddTransient<IInStockTaskBoxService, InStockTaskBoxService>();
|
||||||
|
Services.AddTransient<IBoxMarkService, BoxMarkService>();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,6 +77,7 @@ namespace Microsoft.Extensions.DependencyInjection
|
|||||||
services.AddTransient<ITakeStockRepositories, TakeStockRepositories>();
|
services.AddTransient<ITakeStockRepositories, TakeStockRepositories>();
|
||||||
services.AddTransient<IErpOpsSyncDateRepositories, ErpOpsSyncDateRepositories>();
|
services.AddTransient<IErpOpsSyncDateRepositories, ErpOpsSyncDateRepositories>();
|
||||||
services.AddTransient<IInStockTaskBoxRepositories, InStockTaskBoxRepositories>();
|
services.AddTransient<IInStockTaskBoxRepositories, InStockTaskBoxRepositories>();
|
||||||
|
services.AddTransient<IBoxMarkRepositories, BoxMarkRepositories>();
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user