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

Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

Browse Source
This commit is contained in:
tongfei
2023-11-22 11:43:53 +08:00
parent cf427d1216 d6def9fa82
commit 6f82cae437
11 changed files with 74 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -435,6 +435,11 @@
目标箱子ID
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.SubStockId">
<summary>
仓位
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.ChangeBoxRecord.SaveChangeBoxRecordRequest.Details">
<summary>
明细
@@ -800,6 +805,11 @@
发货组织
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.OutStock.ErpDeliveryNoticeOutStockResultDto.ReceiptCustomerId">
<summary>
收货客户

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

@@ -989,6 +989,11 @@
发货组织
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStock.ReceiptCustomerId">
<summary>
收货客户
@@ -1152,6 +1157,11 @@
发货组织
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTask.OrgCode">
<summary>
组织编码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.OutStockTask.ReceiptCustomerId">
<summary>
收货客户

20
src/WMS.Web.Core/Dto/ChangeBoxRecord/SaveChangeBoxRecordRequest.cs
View File

@@ -20,6 +20,26 @@ namespace WMS.Web.Core.Dto.ChangeBoxRecord
[Required(ErrorMessage = "目标箱子不能为空")]
public int DestBoxId { get; set; }
/// <summary>
/// 目标箱的仓库(可为空：当目标箱不需要上架时候)
/// </summary>
[Required(ErrorMessage = "仓库不能为空")]
public string StockCode { get; set; }
/// <summary>
/// 仓位
///</summary>
[Required(ErrorMessage = "仓位不能为空")]
public string SubStockId { get; set; }
/// <summary>
/// 原箱组织编码
/// </summary>
[Required(ErrorMessage = "原箱组织不能为空")]
public string SrcBoxOrgCode { get; set; }
/// <summary>
/// 目标箱组织编码
/// </summary>
[Required(ErrorMessage = "目标箱组织不能为空")]
public string DestBoxOrgCode { get; set; }
/// <summary>
/// 明细
/// </summary>
public List<SaveChangeBoxRecordDetailsRequest> Details { get; set; } = new List<SaveChangeBoxRecordDetailsRequest>();

4
src/WMS.Web.Core/Dto/Erp/OutStock/ErpDeliveryNoticeOutStockResultDto.cs
View File

@@ -22,6 +22,10 @@ namespace WMS.Web.Core.Dto.Erp.OutStock
///</summary>
public int DeliveryOrgId { get; set; }
/// <summary>
/// 组织编码
///</summary>
public string OrgCode { get; set; }
/// <summary>
/// 收货客户
///</summary>
public int ReceiptCustomerId { get; set; }

5
src/WMS.Web.Domain/Entitys/OutStock.cs
View File

@@ -42,6 +42,11 @@ namespace WMS.Web.Domain.Entitys
[Column("DeliveryOrgId")]
public int DeliveryOrgId { get; set; }
/// <summary>
/// 组织编码
///</summary>
[Column("OrgCode")]
public string OrgCode { get; set; }
/// <summary>
/// 收货客户
///</summary>
[Column("ReceiptCustomerId")]

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

@@ -34,6 +34,11 @@ namespace WMS.Web.Domain.Entitys
[Column("DeliveryOrgId")]
public int DeliveryOrgId { get; set; }
/// <summary>
/// 组织编码
///</summary>
[Column("OrgCode")]
public string OrgCode { get; set; }
/// <summary>
/// 收货客户
///</summary>
[Column("ReceiptCustomerId")]
@@ -72,10 +77,11 @@ namespace WMS.Web.Domain.Entitys
/// 明细
/// </summary>
public List<OutStockTaskDetails> Details = new List<OutStockTaskDetails>();
public void Create(OutStockType type,string stockCode, int deliveryOrgId, int receiptCustomerId, DateTime createTime)
public void Create(OutStockType type,string stockCode,string orgCode, int deliveryOrgId, int receiptCustomerId, DateTime createTime)
{
this.Type = type;
this.StockCode = stockCode;
this.OrgCode = orgCode;
this.DeliveryOrgId = deliveryOrgId;
this.ReceiptCustomerId = receiptCustomerId;
this.CreateTime = createTime;

4
src/WMS.Web.Domain/Mappers/ChangeBoxRecordMapper.cs
View File

@@ -19,7 +19,9 @@ namespace WMS.Web.Domain.Mappers
CreateMap<SaveChangeBoxRecordRequest, BoxInventoryChangeGenerateDto>()
.ForMember(x => x.BoxId, ops => ops.MapFrom(x => x.SrcBoxId))
.ForMember(x => x.TargetBoxId, ops => ops.MapFrom(x => x.DestBoxId));
.ForMember(x => x.TargetBoxId, ops => ops.MapFrom(x => x.DestBoxId))
.ForMember(x => x.BoxOrgCode, ops => ops.MapFrom(x => x.SrcBoxOrgCode))
.ForMember(x => x.TargetBoxOrgCode, ops => ops.MapFrom(x => x.DestBoxOrgCode));
CreateMap<SaveChangeBoxRecordDetailsRequest, BoxInventoryDetailsChangeGenerateDto>();
}
}

2
src/WMS.Web.Domain/Services/OutStockTaskService.cs
View File

@@ -160,7 +160,7 @@ namespace WMS.Web.Domain.Services
var eList = erp_list.Where(f => f.SourceBillNo == item.SourceBillNo && f.StockCode == item.StockCode).ToList();
var e = eList.First();
var entity = new OutStockTask();
entity.Create((OutStockType)e.Type, e.StockCode, e.DeliveryOrgId, e.ReceiptCustomerId, (DateTime)e.CreateTime);
entity.Create((OutStockType)e.Type, e.StockCode,e.OrgCode, e.DeliveryOrgId, e.ReceiptCustomerId, (DateTime)e.CreateTime);
//找到当前对应来源单据编号的集合数据
var mIds = eList.GroupBy(g => g.MaterialId).Select(s => s.Key).ToList();

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

@@ -1385,7 +1385,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.SAL_DELIVERYNOTICE.ToString());
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FQty,FNoteEntry,FCreateDate,FEntity_FEntryID";//FEntryID
param.FieldKeys = "FBillNo,FOrderNo,FDeliveryOrgID,FCustomerID,FMaterialID,FStockID.FNumber,FStockLocID,FQty,FNoteEntry,FCreateDate,FEntity_FEntryID,FDeliveryOrgID.FNumber";//FEntryID
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1429,6 +1429,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Sal;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode= item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1465,7 +1466,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TransferDirect.ToString());
param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID";
param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1508,6 +1509,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Stkdirecttransfers;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1544,7 +1546,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_TRANSFEROUT.ToString());
param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID";
param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1587,6 +1589,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.StktransferInst;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1623,7 +1626,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,'','0','0',FMaterialID,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID";
param.FieldKeys = "FBillNo,'','0','0',FMaterialID,FStockID.FNumber,FStockLocId,FQty,FDescription,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1666,6 +1669,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Assembled;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1702,7 +1706,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_MisDelivery.ToString());
param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID";
param.FieldKeys = "FBillNo,'',FStockOrgId,FPickOrgId,FMaterialId,FStockId.FNumber,FStockLocId ,FQty,FEntryNote,FCreateDate,FEntity_FEntryID,FStockOrgId.FNumber";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1745,6 +1749,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Miscellaneous;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -1781,7 +1786,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.STK_AssembledApp.ToString());
param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID";
param.FieldKeys = "FBillNo,'',FSubProOwnerIdH,FOwnerIdHead,FMaterialIDSETY,FStockIDSETY.FNumber,FStockLocIdSETY,FQtySETY,FDescriptionSETY,FCreateDate,FSubEntity_FDetailID,FStockOrgId.FNumber";
param.Limit = 10;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1824,6 +1829,7 @@ namespace WMS.Web.Domain.Services.Public
lis.CreateTime = Convert.ToDateTime(item[9]);
lis.Type = (int)OutStockType.Assembled;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);

2
src/WMS.Web.Repositories/OutStockRepositories.cs
View File

@@ -159,7 +159,7 @@ namespace WMS.Web.Repositories
Creator = _singleDataService.GetSingleData(SingleAction.Staffs, _loginRepositories.CompanyId, s.order.CreatorId),
CreateTime = s.order.CreateTime.DateToStringSeconds(),
SuccessSync = s.order.SuccessSync == true ? "成功" : "失败",
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),

2
src/WMS.Web.Repositories/OutStockTaskRepositories.cs
View File

@@ -291,7 +291,7 @@ namespace WMS.Web.Repositories
CreateTime = s.order.OperateTime.DateToStringSeconds(),
OutStockBeginTime = s.detail.OutStockBeginTime.DateToStringSeconds(),
OutStockEndTime = s.detail.OutStockEndTime.DateToStringSeconds(),
Stock = _singleDataService.GetSingleData(SingleAction.Stocks, _loginRepositories.CompanyId, s.order.StockCode),
Stock = _singleDataService.GetSingleData(SingleAction.StocksJoinOrgCode, _loginRepositories.CompanyId, s.order.StockCode+s.order.OrgCode),
SourceBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SourceBillNo)),
SaleBillNo = string.Join(",", s.detail.ErpDetails.Select(s => s.SaleBillNo)),
DeliveryOrg = _erpBasicDataExtendService.GetOrgName(orgs, s.order.DeliveryOrgId),