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

erp:其他入库单

Browse Source
This commit is contained in:
tongfei
2023-11-10 16:42:12 +08:00
parent 074b649faf
commit df787cd6dd
7 changed files with 306 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -54,7 +54,8 @@ namespace WMS.Web.Api.Controllers
[Route("tf")]
public async Task<string> TestTF()
{
var result = await this._erpService.BillQueryForOrg();
//var result = await this._erpService.BillQueryForOrg();
var result = await this._erpService.BillQueryForBillType();
if (!result.IsSuccess)
return "";
return JsonConvert.SerializeObject(result.Data);

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

@@ -550,6 +550,56 @@
表单所在的子系统内码，字符串类型（非必录）
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto">
<summary>
erp:其他入库单
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.Id">
<summary>
id
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.BillNo">
<summary>
单据编号
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockOrgId">
<summary>
库存组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.MaterialId">
<summary>
物料ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockId">
<summary>
收货仓库ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.StockCode">
<summary>
收货仓库-code
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.Qty">
<summary>
实收数量
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMiscellaneousDto.Remark">
<summary>
备注
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.ErpPushDto">
<summary>
下推

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

@@ -1755,6 +1755,13 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String})">
<summary>
erp:单据查询-其他入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.IService.Public.IErpService.BillQueryForDeliveryNoticeOutStock(System.Collections.Generic.List{System.String},System.Nullable{System.DateTime})">
<summary>
erp:单据查询-出库单
@@ -2698,6 +2705,12 @@
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForBillType">
<summary>
查单据类型的值
</summary>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForPurchaseInStock(System.Collections.Generic.List{System.String})">
<summary>
erp:单据查询-采购入库单
@@ -2706,6 +2719,13 @@
<param name="sourceBillNos">单据编号集合精确查找</param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMiscellaneous(System.Collections.Generic.List{System.String})">
<summary>
erp:单据查询-其他入库单
</summary>
<param name="sourceBillNos"></param>
<returns></returns>
</member>
<member name="M:WMS.Web.Domain.Services.Public.ErpService.BillQueryForMaterial">
<summary>
erp:单据查询-物料

15
src/WMS.Web.Core/Dto/Erp/ErpBaseDto.cs Normal file
View File

@@ -0,0 +1,15 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
public class ErpBaseDto
{
public string Id { get; set; }
public string Number { get; set; }
public string Name { get; set; }
}
}

54
src/WMS.Web.Core/Dto/Erp/ErpMiscellaneousDto.cs Normal file
View File

@@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Core.Dto.Erp
{
/// <summary>
/// erp:其他入库单
/// </summary>
public class ErpMiscellaneousDto
{
/// <summary>
/// id
/// </summary>
public int Id { get; set; }
/// <summary>
/// 单据编号
/// </summary>
public string BillNo { get; set; }
/// <summary>
/// 库存组织
/// </summary>
public int StockOrgId { get; set; }
/// <summary>
/// 物料ID
/// </summary>
public int MaterialId { get; set; }
/// <summary>
/// 收货仓库ID
/// </summary>
public int StockId { get; set; }
/// <summary>
/// 收货仓库-code
/// </summary>
public string StockCode { get; set; }
/// <summary>
/// 实收数量
/// </summary>
public decimal Qty { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
}

14
src/WMS.Web.Domain/IService/Public/IErpService.cs
View File

@@ -15,11 +15,25 @@ namespace WMS.Web.Domain.IService.Public
{
public interface IErpService
{
/// <summary>
/// 查单据类型的值
/// </summary>
/// <returns></returns>
Task<ResultList<ErpBaseDto>> BillQueryForBillType();
/// <summary>
/// erp:单据查询-采购入库单
/// </summary>
/// <returns></returns>
Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock(List<string> sourceBillNos = null);
/// <summary>
/// erp:单据查询-其他入库单
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
Task<ResultList<ErpMiscellaneousDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null);
/// <summary>
/// erp:单据查询-出库单
/// </summary>

151
src/WMS.Web.Domain/Services/Public/ErpService.cs
View File

@@ -86,6 +86,54 @@ namespace WMS.Web.Domain.Services.Public
}
}
/// <summary>
/// 查单据类型的值
/// </summary>
/// <returns></returns>
public async Task<ResultList<ErpBaseDto>> BillQueryForBillType()
{
try
{
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpBaseDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto("BOS_BillType");
param.FieldKeys = "FBILLTYPEID,FNumber,FName";
param.Limit = 10000;
param.FilterString = "";
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
var erp_list = new List<ErpBaseDto>();
foreach (var item in result)
{
var lis = new ErpBaseDto();
lis.Id = item[0];
lis.Number = item[1];
lis.Name =item[2];
erp_list.Add(lis);
}
return ResultList<ErpBaseDto>.ReSuccess(erp_list);
}
catch (Exception ex)
{
return ResultList<ErpBaseDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
/// <summary>
/// erp:单据查询-采购入库单
/// </summary>
@@ -199,6 +247,109 @@ namespace WMS.Web.Domain.Services.Public
}
}
/// <summary>
/// erp:单据查询-其他入库单
/// </summary>
/// <param name="sourceBillNos"></param>
/// <returns></returns>
public async Task<ResultList<ErpMiscellaneousDto>> BillQueryForMiscellaneous(List<string> sourceBillNos = null)
{
try
{
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpMiscellaneousDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = stocks.Select(x => x.Code).ToList();
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpMiscellaneousDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginTime = DateTime.Now.AddDays(-2).ToString("yyyy-MM-dd 00:00:00");
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
//3.获取金蝶其他入库订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_MISCELLANEOUS.ToString());
param.FieldKeys = "FID,FBillNo,FStockOrgId,FMATERIALID,FSTOCKID,FSTOCKID.FNumber,FQty,FCreateDate,FEntryNote";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
//2.审核状态：已审核
//3.单据类型：标准其他入库单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = " FDocumentStatus='C' and FBillTypeID='d772ead981e748d69dda1caac7583f8c'";//
param.FilterString = param.FilterString + " and FSTOCKID.FNumber in (";
var str = "";
int index = 0;
foreach (var scode in stocks_codes)
{
index++;
if (index == stocks_codes.Count)
str = str + $"'{scode}'";
else
str = str + $"'{scode}'" + ",";
}
param.FilterString = param.FilterString + str + ")";
//根据原订单号查询
if (sourceBillNos != null && sourceBillNos.Count() > 0)
{
param.FilterString = param.FilterString + " and FBillNo in (";
var bill_str = "";
int bill_index = 0;
//var srt_b = JsonConvert.SerializeObject(sourceBillNos);
foreach (var bill in sourceBillNos)
{
bill_index++;
if (bill_index == sourceBillNos.Count)
bill_str = bill_str + $"'{bill}'";
else
bill_str = bill_str + $"'{bill}'" + ",";
}
param.FilterString = param.FilterString + bill_str + ")";
}//注意：当有单据编号的查询的时候，时间条件去掉；不然就查不到数据了
else
{
param.FilterString = param.FilterString + " and FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "'";
}
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
//5.返回数据的组装
var erp_list = new List<ErpMiscellaneousDto>();
foreach (var item in result)
{
var lis = new ErpMiscellaneousDto();
lis.Id = Convert.ToInt32(item[0]);
lis.BillNo =item[1];
lis.StockOrgId = Convert.ToInt32(item[2]);
lis.MaterialId = Convert.ToInt32(item[3]);
lis.StockId = Convert.ToInt32(item[4]);
lis.StockCode = item[5];
lis.Qty = Convert.ToDecimal(item[6]);
lis.CreateTime = Convert.ToDateTime(item[7]);
lis.Remark = item[8];
erp_list.Add(lis);
}
return ResultList<ErpMiscellaneousDto>.ReSuccess(erp_list);
}
catch (Exception ex)
{
return ResultList<ErpMiscellaneousDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
/// <summary>
/// erp:单据查询-物料
/// </summary>