18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

非采购上架接口

Browse Source
This commit is contained in:
tongfei
2023-11-11 10:25:42 +08:00
parent f2edf1ea4c
commit 4ff41e1ded
12 changed files with 580 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/WMS.Web.Api/Controllers/InStockTaskController.cs
View File

@@ -75,14 +75,31 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("GetSourceOrder/{sourceBillNo}")]
public async Task<ResultList<InStockTaskBillNoQueryResponse>> GetSourceOrder([FromRoute] string sourceBillNo)
public async Task<ResultList<SourceBillNoQueryResponse>> GetSourceOrder([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list= await _inStockTaskRepositories.GetListBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null });
return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
}
/// <summary>
/// 来源单-编号模糊查询-非采购上架使用-pad
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
[HttpGet]
[Route("GetSourceOrderNoPurchase/{sourceBillNo}")]
public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> GetSourceOrderNoPurchase([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
var list = await _inStockTaskRepositories.GetListInfoBy(new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo, InstockType = null });
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
}
/// <summary>
@@ -92,15 +109,32 @@ namespace WMS.Web.Api.Controllers
/// <returns></returns>
[HttpGet]
[Route("Adjust/{sourceBillNo}")]
public async Task<ResultList<InStockTaskBillNoQueryResponse>> Adjust([FromRoute] string sourceBillNo)
public async Task<ResultList<SourceBillNoQueryResponse>> Adjust([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
return await _inStockTaskService.Adjust(sourceBillNo);
}
/// <summary>
/// 来源单的信息校准-非采购上架使用-对应金蝶-pad
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
[HttpGet]
[Route("AdjustNoPurchase/{sourceBillNo}")]
public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> AdjustNoPurchase([FromRoute] string sourceBillNo)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
return await _inStockTaskService.AdjustNoPurchase(sourceBillNo);
}
/// <summary>
/// 采购订单物料明细和箱物料明细-对比-pad
/// </summary>

16
src/WMS.Web.Api/wwwroot/WMS.Web.Api.xml
View File

@@ -115,6 +115,13 @@
<param name="sourceBillNo">来源单号</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.GetSourceOrderNoPurchase(System.String)">
<summary>
来源单-编号模糊查询-非采购上架使用-pad
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Adjust(System.String)">
<summary>
来源单的信息校准-对应金蝶-pad
@@ -122,6 +129,13 @@
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.AdjustNoPurchase(System.String)">
<summary>
来源单的信息校准-非采购上架使用-对应金蝶-pad
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.InStockTaskController.Contrast(WMS.Web.Core.Dto.InStockTask.ContrastMaterialsRequest)">
<summary>
采购订单物料明细和箱物料明细-对比-pad
@@ -349,7 +363,7 @@
<summary>
根据箱号获取箱信息
</summary>
<param name="billNos">必填</param>
<param name="boxBillNos">必填</param>
<returns></returns>
</member>
<member name="T:WMS.Web.Api.Controllers.TakeStockController">

289
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -1110,21 +1110,26 @@
采购订单物料明细和箱物料明细-对比影响对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.BoxId">
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.TotalCount">
<summary>
箱号明细数量的总和
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.BoxBaseDto">
<summary>
收货和上架需要用的箱的基本信息-对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.BoxBaseDto.BoxId">
<summary>
箱号ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.BoxBillNo">
<member name="P:WMS.Web.Core.Dto.InStockTask.BoxBaseDto.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.ContrastMaterialsResponse.TotalCount">
<summary>
箱号明细数量的总和
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest">
<summary>
模糊查询来源单据-请求对象
@@ -1140,81 +1145,6 @@
来源单据类型
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse">
<summary>
来源单号模糊查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Id">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.SupplierId">
<summary>
供应商
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.OrgId">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.StockCode">
<summary>
仓库编码（对应金蝶和单点）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.StockName">
<summary>
仓库名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Qty">
<summary>
订单数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.DeliveredQty">
<summary>
已交数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryResponse.Remark">
<summary>
明细备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.InStockTaskDetailsInfoDto">
<summary>
入库任务单明细详情
@@ -1285,6 +1215,201 @@
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseQueryResponse">
<summary>
来源单模糊查询响应-非采购-对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseQueryResponse.Id">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseQueryResponse.Boxs">
<summary>
箱信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseQueryResponse.Details">
<summary>
明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseBoxQueryResponse">
<summary>
箱信息
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseBoxQueryResponse.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseBoxQueryResponse.TaskId">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseBoxQueryResponse.BoxId">
<summary>
箱信息ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseBoxQueryResponse.BoxBillNo">
<summary>
箱号
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse">
<summary>
来源单模糊查询响应明细-非采购-对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.TaskId">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.SupplierId">
<summary>
供应商
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.OrgId">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.StockCode">
<summary>
仓库编码（对应金蝶和单点）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.StockName">
<summary>
仓库名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.Qty">
<summary>
订单数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.DeliveredQty">
<summary>
已交数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoNoPurchaseDetailsQueryResponse.Remark">
<summary>
明细备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse">
<summary>
来源单号模糊查询响应对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.Id">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.DetailsId">
<summary>
明细ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.SupplierId">
<summary>
供应商
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.OrgId">
<summary>
组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.SourceBillNo">
<summary>
来源单号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.StockCode">
<summary>
仓库编码（对应金蝶和单点）
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.StockName">
<summary>
仓库名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.MaterialName">
<summary>
物料名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.MaterialNumber">
<summary>
物料编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.Specifications">
<summary>
物料规格型号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.Qty">
<summary>
订单数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.DeliveredQty">
<summary>
已交数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStockTask.SourceBillNoQueryResponse.Remark">
<summary>
明细备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskBoxRequest">
<summary>
箱信息和任务单绑定

41
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1411,6 +1411,13 @@
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.GetListInfoBy(WMS.Web.Core.Dto.InStockTask.InStockTaskBillNoQueryRequest)">
<summary>
列表-根据来源单模糊查询-非采购上架使用
</summary>
<param name="dto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Infrastructure.IInStockTaskRepositories.AddRange(System.Collections.Generic.List{WMS.Web.Domain.Entitys.InStockTask},System.Boolean)">
<summary>
批量添加
@@ -1652,7 +1659,14 @@
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.Adjust(System.String)">
<summary>
来源单-与金蝶校准-第二步-pad
来源单-与金蝶校准-第二步-pad：这个只针对采购订单
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.AdjustNoPurchase(System.String)">
<summary>
来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
@@ -1665,6 +1679,14 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockTaskService.SysnMiscellaneous(System.Collections.Generic.List{System.String},System.Boolean)">
<summary>
同步：其他入库类型单据
</summary>
<param name="billNos"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.IOutStockService">
<summary>
出库服务
@@ -2454,7 +2476,7 @@
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.ShelfNoPurchase(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
非采购单上架-按箱
非采购单上架
</summary>
<param name="dto"></param>
<param name="loginInDto"></param>
@@ -2478,7 +2500,7 @@
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.ShelfNoPurchaseSave(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto,System.Boolean)">
<summary>
非采购上架-按箱-保存
非采购上架-保存
</summary>
<param name="dto"></param>
<param name="staffId"></param>
@@ -2519,7 +2541,14 @@
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.Adjust(System.String)">
<summary>
来源单-与金蝶校准-第二步-pad
来源单-与金蝶校准-第二步-pad：这个只针对采购订单
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockTaskService.AdjustNoPurchase(System.String)">
<summary>
来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
</summary>
<param name="sourceBillNo"></param>
<returns></returns>
@@ -3244,12 +3273,12 @@
<param name="entity"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.TakeStockService.ErpOperate(WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto,System.String)">
<member name="M:WMS.Web.Domain.Services.TakeStockService.ErpOperate(WMS.Web.Core.Dto.Erp.TakeStock.ErpTakeStockSaveDto,WMS.Web.Domain.Values.Erp.FormIdParam)">
<summary>
同步金蝶操作
</summary>
<param name="dto"></param>
<param name="formId"></param>
<param name="type"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Values.BackRecordType">

18
src/WMS.Web.Core/Dto/InStockTask/ContrastMaterialsResponse.cs
View File

@@ -7,7 +7,18 @@ namespace WMS.Web.Core.Dto.InStockTask
/// <summary>
/// 采购订单物料明细和箱物料明细-对比影响对象
/// </summary>
public class ContrastMaterialsResponse
public class ContrastMaterialsResponse:BoxBaseDto
{
/// <summary>
/// 箱号明细数量的总和
/// </summary>
public decimal TotalCount { get; set; }
}
/// <summary>
/// 收货和上架需要用的箱的基本信息-对象
/// </summary>
public class BoxBaseDto
{
/// <summary>
/// 箱号ID
@@ -18,10 +29,5 @@ namespace WMS.Web.Core.Dto.InStockTask
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
/// <summary>
/// 箱号明细数量的总和
/// </summary>
public decimal TotalCount { get; set; }
}
}

128
src/WMS.Web.Core/Dto/InStockTask/SourceBillNoNoPurchaseQueryResponse.cs Normal file
View File

@@ -0,0 +1,128 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.InStockTask
{
/// <summary>
/// 来源单模糊查询响应-非采购-对象
/// </summary>
public class SourceBillNoNoPurchaseQueryResponse
{
/// <summary>
/// 单据ID(等同-入库任务单ID)
/// </summary>
public int Id { get; set; }
/// <summary>
/// 来源单号
/// </summary>
public string SourceBillNo { get; set; }
/// <summary>
/// 箱信息
/// </summary>
public List<SourceBillNoNoPurchaseBoxQueryResponse> Boxs { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<SourceBillNoNoPurchaseDetailsQueryResponse> Details { get; set; }
}
/// <summary>
/// 箱信息
/// </summary>
public class SourceBillNoNoPurchaseBoxQueryResponse
{
/// <summary>
/// ID
/// </summary>
public int Id { get; set; } = 0;
/// <summary>
/// 单据ID(等同-入库任务单ID)
/// </summary>
public int TaskId { get; set; }
/// <summary>
/// 箱信息ID
/// </summary>
public int BoxId { get; set; }
/// <summary>
/// 箱号
/// </summary>
public string BoxBillNo { get; set; }
}
/// <summary>
/// 来源单模糊查询响应明细-非采购-对象
/// </summary>
public class SourceBillNoNoPurchaseDetailsQueryResponse
{
/// <summary>
/// 单据ID(等同-入库任务单ID)
/// </summary>
public int TaskId { get; set; }
/// <summary>
/// 明细ID
/// </summary>
public int DetailsId { get; set; }
/// <summary>
/// 供应商
/// </summary>
public int SupplierId { get; set; }
/// <summary>
/// 组织
/// </summary>
public int OrgId { get; set; }
/// <summary>
/// 仓库编码（对应金蝶和单点）
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 仓库名称
/// </summary>
public string StockName { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 物料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 物料编码
/// </summary>
public string MaterialNumber { get; set; }
/// <summary>
/// 物料规格型号
/// </summary>
public string Specifications { get; set; }
/// <summary>
/// 订单数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 已交数量
/// </summary>
public decimal DeliveredQty { get; set; }
/// <summary>
/// 明细备注
/// </summary>
public string Remark { get; set; }
}
}

2
src/WMS.Web.Core/Dto/InStockTask/InStockTaskBillNoQueryResponse.cs → src/WMS.Web.Core/Dto/InStockTask/SourceBillNoQueryResponse.cs
View File

@@ -7,7 +7,7 @@ namespace WMS.Web.Core.Dto.InStockTask
/// <summary>
/// 来源单号模糊查询响应对象
/// </summary>
public class InStockTaskBillNoQueryResponse
public class SourceBillNoQueryResponse
{
/// <summary>
/// 单据ID(等同-入库任务单ID)

19
src/WMS.Web.Domain/IService/IInStockTaskService.cs
View File

@@ -13,11 +13,18 @@ namespace WMS.Web.Domain.IService
public interface IInStockTaskService
{
/// <summary>
/// 来源单-与金蝶校准-第二步-pad
/// 来源单-与金蝶校准-第二步-pad：这个只针对采购订单
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<ResultList<InStockTaskBillNoQueryResponse>> Adjust(string sourceBillNo);
Task<ResultList<SourceBillNoQueryResponse>> Adjust(string sourceBillNo);
/// <summary>
/// 来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> AdjustNoPurchase(string sourceBillNo);
/// <summary>
/// 同步：采购入库类型单据
/// </summary>
@@ -25,5 +32,13 @@ namespace WMS.Web.Domain.IService
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SsynPurchaseInStock(List<string> billNos = null, bool isTransaction=true);
/// <summary>
/// 同步：其他入库类型单据
/// </summary>
/// <param name="billNos"></param>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SysnMiscellaneous(List<string> billNos = null, bool isTransaction = true);
}
}

10
src/WMS.Web.Domain/Infrastructure/IInStockTaskRepositories.cs
View File

@@ -76,7 +76,15 @@ namespace WMS.Web.Domain.Infrastructure
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
Task<List<InStockTaskBillNoQueryResponse>> GetListBy(InStockTaskBillNoQueryRequest dto);
Task<List<SourceBillNoQueryResponse>> GetListBy(InStockTaskBillNoQueryRequest dto);
/// <summary>
/// 列表-根据来源单模糊查询-非采购上架使用
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
Task<List<SourceBillNoNoPurchaseQueryResponse>> GetListInfoBy(InStockTaskBillNoQueryRequest dto);
/// <summary>
/// 批量添加

4
src/WMS.Web.Domain/Services/InStockService.cs
View File

@@ -116,7 +116,7 @@ namespace WMS.Web.Domain.Services
}
/// <summary>
/// 非采购单上架-按箱
/// 非采购单上架
/// </summary>
/// <param name="dto"></param>
/// <param name="loginInDto"></param>
@@ -203,7 +203,7 @@ namespace WMS.Web.Domain.Services
return Result.ReFailure(ResultCodes.DateWriteError);
}
/// <summary>
/// 非采购上架-按箱-保存
/// 非采购上架-保存
/// </summary>
/// <param name="dto"></param>
/// <param name="staffId"></param>

55
src/WMS.Web.Domain/Services/InStockTaskService.cs
View File

@@ -41,11 +41,11 @@ namespace WMS.Web.Domain.Services
}
/// <summary>
/// 来源单-与金蝶校准-第二步-pad
/// 来源单-与金蝶校准-第二步-pad：这个只针对采购订单
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
public async Task<ResultList<InStockTaskBillNoQueryResponse>> Adjust(string sourceBillNo)
public async Task<ResultList<SourceBillNoQueryResponse>> Adjust(string sourceBillNo)
{
//1.事务
IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
@@ -55,20 +55,55 @@ namespace WMS.Web.Domain.Services
//2.查看是否有入库任务单
var task = await _inStockTaskRepositories.GetBySource(sourceBillNo);
if (task == null)
return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.OrderNoData);
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.OrderNoData);
//3.有的话就同步一下金蝶的数据
var billNos = new List<string>();
billNos.Add(sourceBillNo);
//3.1这里要对入库任务单的类型逐一判断，进行去ErpService找对应的单据类型重新获取；这里只有采购，后面再加其它的
//3.1采购订单类型-进去金蝶交互更新
if (task.Type == InstockType.Purchase)
{
var result = await this.SsynPurchaseInStock(billNos, isTransaction);
if (!result.IsSuccess) isRollback = true;
}
else if (task.Type == InstockType.Miscellaneous)
{
//4.提交事务
var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return ResultList<SourceBillNoQueryResponse>.ReFailure(ResultCodes.AdjustError);
//5.再一次查询新的数据：并返回最后的结果
var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
var list = await _inStockTaskRepositories.GetListBy(request);
return ResultList<SourceBillNoQueryResponse>.ReSuccess(list);
}
/// <summary>
/// 来源单-与金蝶校准-第二步-pad：这个是非采购订单上架使用
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
public async Task<ResultList<SourceBillNoNoPurchaseQueryResponse>> AdjustNoPurchase(string sourceBillNo)
{
//1.事务
IDbContextTransaction _transaction = _basicsRepositories.GetTransaction();
bool isRollback = false;
bool isTransaction = false;
//2.查看是否有入库任务单
var task = await _inStockTaskRepositories.GetBySource(sourceBillNo);
if (task == null)
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.OrderNoData);
//3.有的话就同步一下金蝶的数据
var billNos = new List<string>();
billNos.Add(sourceBillNo);
//3.1这里要对入库任务单的类型逐一判断，进行去ErpService找对应的单据类型重新获取；这里只有采购，后面再加其它的
if (task.Type == InstockType.Miscellaneous)
{
var result = await this.SysnMiscellaneous(billNos, isTransaction);
if (!result.IsSuccess) isRollback = true;
}
else if (task.Type == InstockType.Assembled)
{
@@ -82,18 +117,16 @@ namespace WMS.Web.Domain.Services
{
}
//4.提交事务
var isSuccess = _basicsRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return ResultList<InStockTaskBillNoQueryResponse>.ReFailure(ResultCodes.AdjustError);
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReFailure(ResultCodes.AdjustError);
//5.再一次查询新的数据：并返回最后的结果
var request = new InStockTaskBillNoQueryRequest() { SourceBillNo = sourceBillNo };
var list = await _inStockTaskRepositories.GetListBy(request);
return ResultList<InStockTaskBillNoQueryResponse>.ReSuccess(list);
var list = await _inStockTaskRepositories.GetListInfoBy(request);
return ResultList<SourceBillNoNoPurchaseQueryResponse>.ReSuccess(list);
}
/// <summary>

69
src/WMS.Web.Repositories/InStockTaskRepositories.cs
View File

@@ -259,7 +259,7 @@ namespace WMS.Web.Repositories
/// </summary>
/// <param name="sourceBillNo"></param>
/// <returns></returns>
public async Task<List<InStockTaskBillNoQueryResponse>> GetListBy(InStockTaskBillNoQueryRequest dto)
public async Task<List<SourceBillNoQueryResponse>> GetListBy(InStockTaskBillNoQueryRequest dto)
{
//1.获取物料集合
var materials_result = await _erpService.BillQueryForMaterial();
@@ -276,7 +276,7 @@ namespace WMS.Web.Repositories
if(dto.InstockType.HasValue)
query = query.Where(w => (int)w.order.Type == dto.InstockType.Value);
var list = await query.Select(s => new InStockTaskBillNoQueryResponse()
var list = await query.Select(s => new SourceBillNoQueryResponse()
{
Id=s.order.Id,
DetailsId=s.detail.Id,
@@ -298,6 +298,71 @@ namespace WMS.Web.Repositories
}
/// <summary>
/// 列表-根据来源单模糊查询-非采购上架使用
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<List<SourceBillNoNoPurchaseQueryResponse>> GetListInfoBy(InStockTaskBillNoQueryRequest dto)
{
//1.获取物料集合
var materials_result = await _erpService.BillQueryForMaterial();
var materials = new List<ErpMaterialDto>();
if (materials_result.IsSuccess)
materials = materials_result.Data.ToList();
//这里只查状态为：部分入库和等待收货
var task_query = _context.InStockTask
.Where(w => EF.Functions.Like(w.SourceBillNo, "%" + dto.SourceBillNo + "%") && (w.Status == InstockStatus.Part || w.Status == InstockStatus.Wait));
if (dto.InstockType.HasValue)
task_query = task_query.Where(w => (int)w.Type == dto.InstockType.Value);
//找到头列表
var taskList = await task_query
.Select(x=>new SourceBillNoNoPurchaseQueryResponse()
{
Id=x.Id,
SourceBillNo=x.SourceBillNo
}).ToListAsync();
if (taskList != null && taskList.Count != 0)
{
var ids = taskList.Select(x => x.Id).ToList();
//找明细
var task_details = await _context.InStockTaskDetails.Where(x => ids.Contains(x.Fid))
.Select(s=>new SourceBillNoNoPurchaseDetailsQueryResponse()
{
TaskId=s.Fid,
SupplierId = s.SupplierId,
OrgId = s.OrgId,
MaterialId = s.MaterialId,
StockCode = s.StockCode,
StockName = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.StockCode),
MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, s.MaterialId),
MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, s.MaterialId),
Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, s.MaterialId),
Qty = s.AccruedQty,
DeliveredQty = s.DeliveredQty,
Remark = s.Remark
}).ToListAsync();
//找箱
var task_box = await _context.InstockTaskBox.Where(x => ids.Contains(x.TaskId))
.Select(s => new SourceBillNoNoPurchaseBoxQueryResponse()
{
Id = s.Id,
TaskId=s.TaskId,
BoxId = s.BoxId,
BoxBillNo = s.BoxBillNo
}).ToListAsync();
//对应头赋值：明细和箱
foreach (var item in taskList)
{
item.Details = task_details.Where(x => x.TaskId == item.Id).ToList();
item.Boxs = task_box.Where(x => x.TaskId == item.Id).ToList();
}
}
return taskList;
}
/// <summary>
/// 批量添加