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-09 14:07:49 +08:00
parent 3ccebc07f5 15f786ff46
commit f52a1060b6
22 changed files with 507 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/WMS.Web.Api/Controllers/SysConfigController.cs
View File

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.EntityFrameworkCore;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -7,6 +8,7 @@ using System.Linq;
using System.Threading.Tasks;
using WMS.Web.Core;
using WMS.Web.Core.Dto;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.SingleData;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Infrastructure;
@@ -123,22 +125,22 @@ namespace WMS.Web.Api.Controllers
/// <summary>
/// 根据仓库获取金蝶子仓库
/// </summary>
/// <param name="id">仓库id</param>
/// <param name="number">仓库编码</param>
/// <param name="name">模糊匹配</param>
/// <returns></returns>
[HttpGet]
[Route("GetErp_SubUcStock/{id}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] int id)
[Route("GetErp_SubUcStock/{number}")]
public async Task<Result<List<UcStockResponse>>> GetErp_SubUcStock([FromRoute] string number, [FromQuery] string name)
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<UcStockResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
List<UcStockResponse> list = new List<UcStockResponse>();
var code = _singleDataService.GetSingleDataCode(SingleAction.Stocks, loginInfo.UserInfo.CompanyId, id);
if (code.Substring(0, 2).Equals("HD") || code.Substring(0, 2).Equals("GD"))
if (number.Substring(0, 2).Equals("HD") || number.Substring(0, 2).Equals("GD"))
{
var subs = await _erpService.BillQueryForSubStock(code);
foreach (var s in subs.Data)
var subs = await _erpService.BillQueryForSubStock(number);
foreach (var s in subs.Data.Where(w=> EF.Functions.Like(w.Name, "%" + name + "%")))
{
list.Add(new UcStockResponse()
{
@@ -152,6 +154,42 @@ namespace WMS.Web.Api.Controllers
return Result<List<UcStockResponse>>.ReSuccess(list);
}
/// <summary>
/// 获取出库单客户下拉列表
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("GetCustomers")]
public async Task<Result<List<PullDownStrResponse>>> GetCustomers()
{
var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
if (loginInfo == null || loginInfo.UserInfo == null)
return Result<List<PullDownStrResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
var customers = await _erpService.BillQueryForCustomer();
var orgs = await _erpService.BillQueryForOrg();
List<PullDownStrResponse> pullList = new List<PullDownStrResponse>();
foreach (var c in customers.Data)
{
pullList.Add(new PullDownStrResponse()
{
Id = "c_" + c.Id,
Name = c.Name,
Code = c.Number
});
}
foreach (var o in orgs.Data)
{
pullList.Add(new PullDownStrResponse()
{
Id = "o_" + o.Id,
Name = o.Name,
Code = o.Number
});
}
return Result<List<PullDownStrResponse>>.ReSuccess(pullList);
}
/// <summary>
/// 获取仓位：模糊名称
/// </summary>

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

@@ -283,11 +283,18 @@
<param name="id">仓库id</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.Int32)">
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetErp_SubUcStock(System.String,System.String)">
<summary>
根据仓库获取金蝶子仓库
</summary>
<param name="id">仓库id</param>
<param name="number">仓库编码</param>
<param name="name">模糊匹配</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetCustomers">
<summary>
获取出库单客户下拉列表
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Api.Controllers.SysConfigController.GetSubUcStockByName(System.String)">

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

@@ -465,9 +465,24 @@
单据类型
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.EnumStatusResponse.ShelfMethod">
<member name="T:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto">
<summary>
非采购上架方式
客户
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Id">
<summary>
ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Number">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto.Name">
<summary>
名称
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpBillQueryDto">
@@ -780,6 +795,26 @@
含税单价 取对应发货通知单对应物料编码行的 含税单价
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.PullDownStrResponse">
<summary>
key为string 下拉列表对象
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Code">
<summary>
编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.PullDownStrResponse.Name">
<summary>
名字
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Purchase.ErpPurchaseInStockResultDto">
<summary>
erp-采购入库-返回数据源
@@ -1535,36 +1570,6 @@
同步成功或者失败
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest">
<summary>
非采购单上架请求对象-按箱
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskId">
<summary>
单据ID(等同-入库任务单ID)
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.ShelfMethod">
<summary>
上架方式
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Boxs">
<summary>
箱集合
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.TaskDetails">
<summary>
入库任务单明细
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest.Details">
<summary>
入库单明细
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.InStock.PurchaseShelfRequest">
<summary>
采购上架-请求对象

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

@@ -459,12 +459,6 @@
</summary>
<param name="creatorId"></param>
</member>
<member name="M:WMS.Web.Domain.Entitys.InStockTask.NoPurchaseShelf(System.Int32)">
<summary>
非采购上架
</summary>
<param name="creatorId"></param>
</member>
<member name="T:WMS.Web.Domain.Entitys.InStockTaskBox">
<summary>
erp入库任务单的对应box箱信息表
@@ -757,7 +751,7 @@
明细
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.OutStock.Create(System.Int32,System.Int32,WMS.Web.Domain.Values.OutStockType)">
<member name="M:WMS.Web.Domain.Entitys.OutStock.Create(System.Int32,WMS.Web.Domain.Entitys.OutStockTask)">
<summary>
创建
</summary>
@@ -1536,14 +1530,6 @@
<param name="loginInfo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.ShelfNoPurchase(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,WMS.Web.Core.Dto.Login.LoginInDto)">
<summary>
上架-非采购订单
</summary>
<param name="dto"></param>
<param name="loginInDto"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.GetInfoByBox(System.String)">
<summary>
获取任务单：根据箱号信息
@@ -1551,7 +1537,7 @@
<param name="boxBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.IInStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Nullable{System.Boolean},System.Boolean,System.Boolean)">
<member name="M:WMS.Web.Domain.IService.IInStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
<summary>
修改-入库任务信息
</summary>
@@ -1652,6 +1638,14 @@
<param name="supplierId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetCustomerName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto},System.Int32)">
<summary>
获取客户名称
</summary>
<param name="erpCustomers"></param>
<param name="customerId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
<summary>
获取仓库名称
@@ -1736,6 +1730,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForCustomer">
<summary>
客户
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForStock">
<summary>
获取仓库信息
@@ -1823,7 +1823,7 @@
出库任务
</summary>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.SsynDeliveryNoticeOutStock(System.Boolean,System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.BillQueryForDeliveryNoticeOutStock(System.Boolean,System.Collections.Generic.List{System.String})">
<summary>
采购发货通知单
</summary>
@@ -1854,6 +1854,13 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IOutStockTaskService.Ssyn(System.Collections.Generic.List{System.String})">
<summary>
同步金蝶数据 不传源订单号则更新所有
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.IService.Public.ISingleDataService">
<summary>
单点数据返回服务接口
@@ -2336,14 +2343,6 @@
<param name="loginInfo"></param>
<returns></returns>
</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>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.GetInfoByBox(System.String)">
<summary>
获取任务单：根据箱号信息
@@ -2351,7 +2350,7 @@
<param name="boxBillNo"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.ShelfSave(WMS.Web.Core.Dto.InStock.PurchaseShelfRequest,WMS.Web.Domain.Values.InstockType,System.Int32,System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockService.Save(WMS.Web.Core.Dto.InStock.PurchaseShelfRequest,WMS.Web.Domain.Values.InstockType,System.Int32,System.Boolean)">
<summary>
采购上架-保存
</summary>
@@ -2360,16 +2359,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.ShelfNoPurchaseSave(WMS.Web.Core.Dto.InStock.NoPurchaseShelfRequest,System.Int32,System.Boolean)">
<summary>
非采购上架-按箱-保存
</summary>
<param name="dto"></param>
<param name="staffId"></param>
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.InStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Nullable{System.Boolean},System.Boolean,System.Boolean)">
<member name="M:WMS.Web.Domain.Services.InStockService.Update(WMS.Web.Core.Dto.InStockTask.UpdateInStockTaskRequest,System.Int32,System.Boolean,System.Boolean)">
<summary>
修改-入库任务信息
</summary>
@@ -2455,7 +2445,7 @@
<param name="isTransaction"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.SsynDeliveryNoticeOutStock(System.Boolean,System.Collections.Generic.List{System.String})">
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.BillQueryForDeliveryNoticeOutStock(System.Boolean,System.Collections.Generic.List{System.String})">
<summary>
发货通知单同步数据
</summary>
@@ -2494,6 +2484,13 @@
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.OutStockTaskService.Ssyn(System.Collections.Generic.List{System.String})">
<summary>
同步金蝶数据 不传源订单号则更新所有
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService">
<summary>
erp基础数据：扩展服务
@@ -2547,6 +2544,14 @@
<param name="supplierId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetCustomerName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.Customer.ErpCustomerDto},System.Int32)">
<summary>
获取客户名称
</summary>
<param name="erpCustomers"></param>
<param name="customerId"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpBasicDataExtendService.GetStockName(System.Collections.Generic.List{WMS.Web.Core.Dto.Erp.ErpStockDto},System.Int32)">
<summary>
获取仓库名称
@@ -2606,6 +2611,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForCustomer">
<summary>
客户
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForStock">
<summary>
erp:仓库
@@ -3146,6 +3157,11 @@
分布式调出单
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.Erp.FormIdParam.BD_Customer">
<summary>
客户
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.InstockStatus">
<summary>
入库状态
@@ -3371,21 +3387,6 @@
序列号操作类型
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.ShelfMethod">
<summary>
非采购上架方式
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.ShelfMethod.Box">
<summary>
按箱上架
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.ShelfMethod.Product">
<summary>
按产品上架
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.Single.SingleAction">
<summary>
对接单点的接口方法-枚举