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

金蝶同步wms

Browse Source
This commit is contained in:
18942506660
2023-11-06 11:43:29 +08:00
parent 8d6ca8104f
commit 729119abf7
15 changed files with 417 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/WMS.Web.Domain/Entitys/OutStockTask.cs
View File

@@ -63,6 +63,11 @@ namespace WMS.Web.Domain.Entitys
[Column("OperateTime")]
public DateTime? OperateTime { get; set; }
/// <summary>
/// 创建时间（erp那边的创建时间）
///</summary>
[Column("CreateTime")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<OutStockTaskDetails> Details = new List<OutStockTaskDetails>();
@@ -76,7 +81,7 @@ namespace WMS.Web.Domain.Entitys
if (this.Id.ToString().Length >= 8)
{
this.BillNo = "CKZL" + this.Id.ToString();
this.BillNo = "CKRW" + this.Id.ToString();
return;
}

6
src/WMS.Web.Domain/Entitys/OutStockTaskDetails.cs
View File

@@ -61,11 +61,7 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("Remark")]
public string Remark { get; set; }
/// <summary>
/// 创建时间（erp那边的创建时间）
///</summary>
[Column("CreateTime")]
public DateTime? CreateTime { get; set; }
/// <summary>
/// 出库 反写 任务单

5
src/WMS.Web.Domain/IService/IOutStockService.cs
View File

@@ -19,9 +19,6 @@ namespace WMS.Web.Domain.IService
Task<Result> Save(SaveOutStockRequest dto, LoginInDto loginInfo);
// 同步金蝶
Task<Result> Sync(OperateRequest dto);
//出库任务作废
Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo);
//出库任务作废
Task<Result> merge(OperateRequest dto, LoginInDto loginInfo);
}
}

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

@@ -4,6 +4,7 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.OutStock;
using WMS.Web.Core.Dto.Erp.Purchase;
using WMS.Web.Core.Internal.Results;
using WMS.Web.Domain.Entitys;
@@ -17,6 +18,12 @@ namespace WMS.Web.Domain.IService.Public
/// </summary>
/// <returns></returns>
Task<ResultList<ErpPurchaseInStockResultDto>> BillQueryForPurchaseInStock();
/// <summary>
/// erp:单据查询-采购入库单
/// </summary>
/// <returns></returns>
Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForDeliveryNoticeOutStock(List<string> sourceBillNos = null);
/// <summary>
/// erp:单据查询-物料
@@ -39,6 +46,6 @@ namespace WMS.Web.Domain.IService.Public
Task<Result> Sync<T>(T dto, string formId);
//下推
Task<Result> Push(ErpPushDto dto);
}
}

27
src/WMS.Web.Domain/IService/Public/IOutStockTaskService.cs Normal file
View File

@@ -0,0 +1,27 @@
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.Public
{
/// <summary>
/// 出库任务
/// </summary>
public interface IOutStockTaskService
{
/// <summary>
/// 采购发货通知单
/// </summary>
/// <param name="isTransaction"></param>
/// <returns></returns>
Task<Result> SsynDeliveryNoticeOutStock(bool isTransaction);
//出库任务作废
Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo);
//出库任务作废
Task<Result> merge(OperateRequest dto, LoginInDto loginInfo);
}
}

45
src/WMS.Web.Domain/Services/OutStockService.cs
View File

@@ -92,50 +92,5 @@ namespace WMS.Web.Domain.Services
{
return Task.FromResult(Result.ReSuccess());
}
/// <summary>
/// 出库任务作废
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo)
{
var list = await _outStockTaskRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
//作废
entity.Repeal(loginInfo.UserInfo.StaffId);
}
var isSuccess = await _outStockTaskRepositories.EditEntityList(list, true);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 出库任务合并
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<Result> merge(OperateRequest dto, LoginInDto loginInfo)
{
var list = await _outStockTaskRepositories.GetEntityList(dto.Ids);
// 2:符合合并数据逻辑:出库状态为”待拣货”+出库类型为:销售出库+发货组织一致+收货客户一致+发货仓库一致
OutStockTask entity = new OutStockTask();
var res = entity.Merge(list, loginInfo.UserInfo.StaffId);
if (!res.IsSuccess) return res;
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _outStockTaskRepositories.Add(entity, false);
if (entity == null) isRollback = true;
isSuccess = await _outStockTaskRepositories.DeleteEntityList(list.Select(s => s.Id).ToList(), false);
if (isSuccess == false) isRollback = true;
//提交事务
isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
}
}

104
src/WMS.Web.Domain/Services/OutStockTaskService.cs Normal file
View File

@@ -0,0 +1,104 @@
using AutoMapper;
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.Purchase;
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 OutStockTaskService: IOutStockTaskService
{
private readonly IMapper _mapper;
private readonly IErpService _erpService;
private readonly ILoginService _loginService;
private readonly ITransactionRepositories _transactionRepositories;
private readonly IOutStockRepositories _outStockRepositories;
private readonly IOutStockTaskRepositories _outStockTaskRepositories;
public OutStockTaskService(IMapper mapper, IErpService erpService, ILoginService loginService,
ITransactionRepositories transactionRepositories,
IOutStockRepositories outStockRepositories, IOutStockTaskRepositories outStockTaskRepositories)
{
_mapper = mapper;
_erpService = erpService;
_loginService = loginService;
_transactionRepositories = transactionRepositories;
_outStockRepositories = outStockRepositories;
_outStockTaskRepositories = outStockTaskRepositories;
}
/// <summary>
/// 出库任务作废
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<Result> Repeal(OperateRequest dto, LoginInDto loginInfo)
{
var list = await _outStockTaskRepositories.GetEntityList(dto.Ids);
foreach (var entity in list)
{
//作废
entity.Repeal(loginInfo.UserInfo.StaffId);
}
var isSuccess = await _outStockTaskRepositories.EditEntityList(list, true);
if (!isSuccess) return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 出库任务合并
/// </summary>
/// <param name="dto"></param>
/// <returns></returns>
public async Task<Result> merge(OperateRequest dto, LoginInDto loginInfo)
{
var list = await _outStockTaskRepositories.GetEntityList(dto.Ids);
// 2:符合合并数据逻辑:出库状态为”待拣货”+出库类型为:销售出库+发货组织一致+收货客户一致+发货仓库一致
OutStockTask entity = new OutStockTask();
var res = entity.Merge(list, loginInfo.UserInfo.StaffId);
if (!res.IsSuccess) return res;
IDbContextTransaction _transaction = _transactionRepositories.GetTransaction();
bool isRollback = false;
bool isSuccess = true;
entity = await _outStockTaskRepositories.Add(entity, false);
if (entity == null) isRollback = true;
isSuccess = await _outStockTaskRepositories.DeleteEntityList(list.Select(s => s.Id).ToList(), false);
if (isSuccess == false) isRollback = true;
//提交事务
isSuccess = _transactionRepositories.CommitTransaction(isRollback, _transaction);
if (!isSuccess)
return Result.ReFailure(ResultCodes.DateWriteError);
return Result.ReSuccess();
}
/// <summary>
/// 发货通知单同步数据
/// </summary>
/// <param name="isTransaction"></param>
/// <returns></returns>
public async Task<Result> SsynDeliveryNoticeOutStock(bool isTransaction)
{
//1.获取金蝶数据：采购订单数据
var erp_result = await _erpService.BillQueryForPurchaseInStock();
if (!erp_result.IsSuccess)
return Result.ReFailure(erp_result.Message, erp_result.Status);
var erp_list = erp_result.Data;
return Result.ReSuccess();
}
}
}

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

@@ -13,6 +13,7 @@ using System.Text;
using System.Threading.Tasks;
using WMS.Web.Core.Dto.Erp;
using WMS.Web.Core.Dto.Erp.Org;
using WMS.Web.Core.Dto.Erp.OutStock;
using WMS.Web.Core.Dto.Erp.Purchase;
using WMS.Web.Core.Dto.Erp.TakeStock;
using WMS.Web.Core.Internal.Results;
@@ -95,12 +96,12 @@ namespace WMS.Web.Domain.Services.Public
{
try
{
var stocks= await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if(stocks.Count==0)
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpPurchaseInStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = stocks.Select(x => x.Code).ToList();
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -134,7 +135,7 @@ namespace WMS.Web.Domain.Services.Public
else
str = str + $"'{scode}'" + ",";
}
param.FilterString = param.FilterString +str+ ")";
param.FilterString = param.FilterString + str + ")";
query.Data = JsonConvert.SerializeObject(param);
var json = JsonConvert.SerializeObject(query);
@@ -156,8 +157,8 @@ namespace WMS.Web.Domain.Services.Public
lis.FMaterialId = Convert.ToInt32(item[5]);
lis.FSOSTOCKID = Convert.ToInt32(item[6]);
lis.FQty = Convert.ToDecimal(item[7]);
lis.FEntryNote = item[8];
lis.FCreateDate =Convert.ToDateTime(item[9]);
lis.FEntryNote = item[8];
lis.FCreateDate = Convert.ToDateTime(item[9]);
lis.FCHUCHANGPRICE = Convert.ToDecimal(item[10]);
lis.StockFNumber = item[11];
lis.FStockInQty = Convert.ToDecimal(item[12]);
@@ -179,7 +180,7 @@ namespace WMS.Web.Domain.Services.Public
/// erp:单据查询-物料
/// </summary>
/// <returns></returns>
public async Task<ResultList<ErpMaterialDto>> BillQueryForMaterial()
public async Task<ResultList<ErpMaterialDto>> BillQueryForMaterial()
{
//1.先登录金蝶-拿到token
var token_result = await this.Init();
@@ -206,8 +207,8 @@ namespace WMS.Web.Domain.Services.Public
var beginTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
_logger.LogInformation($"开始时间：{beginTime}");
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
//4.请求查询接口
var result_json = await _client.ExecuteBillQueryAsync(json);
var result = JsonConvert.DeserializeObject<List<List<string>>>(result_json);
var endTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
@@ -219,7 +220,7 @@ namespace WMS.Web.Domain.Services.Public
var lis = new ErpMaterialDto();
lis.MaterialId = Convert.ToInt32(item[0]);
lis.MaterialName = item[1];
lis.MaterialNumber =item[2];
lis.MaterialNumber = item[2];
lis.Specifications = item[3];
lis.Status = item[4];
lis.UseOrgId = item[5];
@@ -313,7 +314,7 @@ namespace WMS.Web.Domain.Services.Public
/// <param name="dto"></param>
/// <param name="formId"></param>
/// <returns></returns>
public async Task<Result> Sync<T>(T dto,string formId)
public async Task<Result> Sync<T>(T dto, string formId)
{
try
{
@@ -357,5 +358,88 @@ namespace WMS.Web.Domain.Services.Public
return Result.ReSuccess();
}
public async Task<ResultList<ErpDeliveryNoticeOutStockResultDto>> BillQueryForDeliveryNoticeOutStock(List<string> sourceBillNos = null)
{
try
{
var stocks = await _basicsRepositories.GetUcStockAsync(ManagementSystemCode.GLXT0004.ToString(), "", _appOptions.CompanyId);
if (stocks.Count == 0)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.ErpStockNoData);
var stocks_codes = stocks.Select(x => x.Id).ToList();
//1.先登录金蝶-拿到token
var token_result = await this.Init();
if (!token_result.IsSuccess)
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(token_result);
//2.时间条件：可能还有其它条件
var beginTime = DateTime.Now.AddDays(-2000).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.SAL_DELIVERYNOTICE.ToString());
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID,FStockLocID,FQty,FNoteEntry,FCreateDate";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
//2.审核状态：已审核
//3.未出库数量>0
//4.日期>=系统上线之日
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
param.FilterString = "FCreateDate>='" + beginTime + "' and FCreateDate<='" + endTime + "' and FDocumentStatus='C' and FRemainOutQty>=0";
//string srt = JsonConvert.SerializeObject(stocks_codes);
//param.FilterString = param.FilterString + " and FStockID in (" + srt.Substring(1, srt.Length - 1) + ")";
//param.FilterString = param.FilterString + " and FSOSTOCKID.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)
{
var srt = JsonConvert.SerializeObject(sourceBillNos);
param.FilterString = param.FilterString + " and FBillNo in (" + srt.Substring(1, srt.Length - 1) + ")";
}
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<ErpDeliveryNoticeOutStockResultDto>();
foreach (var item in result)
{
var lis = new ErpDeliveryNoticeOutStockResultDto();
lis.SourceBillNo = item[0];
lis.SaleBillNo = item[1];
lis.DeliveryOrgId = Convert.ToInt32(item[2]);
lis.ReceiptCustomerId = Convert.ToInt32(item[3]);
lis.MaterialId = Convert.ToInt32(item[4]);
lis.StockId = Convert.ToInt32(item[5]);
lis.SubStockId = Convert.ToInt32(item[6]);
lis.AccruedQty = Convert.ToDecimal(item[7]);
lis.Remark = item[8];
lis.CreateTime = Convert.ToDateTime(item[9]);
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
}
catch (Exception ex)
{
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReFailure(ResultCodes.Erp_BillQuery_Error);
}
}
}
}

26
src/WMS.Web.Domain/Values/Erp/FormIdParam.cs
View File

@@ -12,15 +12,15 @@ namespace WMS.Web.Domain.Values.Erp
/// <summary>
/// 采购订单
/// </summary>
PUR_PurchaseOrder=1,
PUR_PurchaseOrder = 1,
/// <summary>
/// 采购入库单
/// </summary>
STK_InStock=2,
STK_InStock = 2,
/// <summary>
/// 其他入库单
/// </summary>
STK_MISCELLANEOUS=3,
STK_MISCELLANEOUS = 3,
/// <summary>
/// 直接调拨单-里面包含出和入
/// </summary>
@@ -28,34 +28,38 @@ namespace WMS.Web.Domain.Values.Erp
/// <summary>
/// 分步式调入单
/// </summary>
STK_TRANSFERIN=5,
STK_TRANSFERIN = 5,
/// <summary>
/// 组装拆卸单：里面包含出和入
/// </summary>
STK_AssembledApp=6,
STK_AssembledApp = 6,
/// <summary>
/// 组织
/// </summary>
ORG_Organizations=7,
ORG_Organizations = 7,
/// <summary>
/// 供应商
/// </summary>
BD_Supplier=8,
BD_Supplier = 8,
/// <summary>
/// 仓库
/// </summary>
BD_STOCK=9,
BD_STOCK = 9,
/// <summary>
/// 盘盈单
/// </summary>
STK_StockCountGain,
STK_StockCountGain = 10,
/// <summary>
/// 盘亏单
/// </summary>
STK_StockCountLoss,
STK_StockCountLoss = 11,
/// <summary>
/// 物料
/// </summary>
BD_MATERIAL,
BD_MATERIAL = 12,
/// <summary>
/// 销售发货通知单
/// </summary>
SAL_DELIVERYNOTICE = 13
}
}