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

出库任务单增加调入仓库

Browse Source
This commit is contained in:
18942506660
2024-09-20 17:18:25 +08:00
parent 01e7b1da36
commit c8e60d3fa6
10 changed files with 80 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,5 +49,10 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("RealityQty")]
public decimal RealityQty { get; set; }
/// <summary>
/// 调入仓库编码
/// </summary>
[Column("InStockCode")]
public string InStockCode { get; set; } = null;
}
}

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

@@ -219,6 +219,11 @@ namespace WMS.Web.Domain.Services
isUpdate = true;
erpDetail.AccruedQty = erp.AccruedQty;
}
if (erpDetail.InStockCode != erp.InStockCode)
{
isUpdate = true;
erpDetail.InStockCode = erp.InStockCode;
}
}
detail.AccruedQty = detail.ErpDetails.Sum(s => s.AccruedQty);

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

@@ -1911,7 +1911,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.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber";
param.FieldKeys = "FBillNo,'',FStockOutOrgId,FStockOrgId,FMaterialID.FNumber,FSrcStockId.FNumber,FSrcStockLocId,FQty,FNoteEntry,FCreateDate,FBillEntry_FEntryID,FStockOutOrgId.FNumber,FDestStockId.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -1973,6 +1973,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Type = (int)OutStockType.Stkdirecttransfers;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
lis.InStockCode = item[12];
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);
@@ -2011,7 +2012,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.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber";
param.FieldKeys = "FBillNo,'',FStockOrgID,FStockInOrgID,FMaterialID.FNumber,FSrcStockID.FNumber,FSrcStockLocId,FQty,FEntryNote,FCreateDate,FSTKTRSOUTENTRY_FEntryID,FStockOrgID.FNumber,FDestStockID.FNumber";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -2073,6 +2074,7 @@ namespace WMS.Web.Domain.Services.Public
lis.Type = (int)OutStockType.StktransferInst;
lis.Erp_DetailId = Convert.ToInt32(item[10]);
lis.OrgCode = item[11];
lis.InStockCode = item[12];//v1.0.8 分步式调出单和直接调拨出库单 拉取调入仓库
erp_list.Add(lis);
}
return ResultList<ErpDeliveryNoticeOutStockResultDto>.ReSuccess(erp_list);