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

采购任务单加个销售字段

Browse Source
This commit is contained in:
tongfei
2024-03-27 16:42:44 +08:00
parent e3730f19ab
commit 04cd982b75
5 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1162,6 +1162,11 @@
条码
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Erp.ErpMaterialDto.IsBatchManage">
<summary>
是否启用批号管理
</summary>
</member>
<member name="T:WMS.Web.Core.Dto.Erp.Org.ErpOrgDto">
<summary>
金蝶组织-基本信息

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

@@ -1392,6 +1392,11 @@
条码
</summary>
</member>
<member name="P:WMS.Web.Domain.Entitys.Materials.IsBatchManage">
<summary>
是否启用批号管理
</summary>
</member>
<member name="T:WMS.Web.Domain.Entitys.MoveBoxRecord">
<summary>
wms移箱记录

5
src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
View File

@@ -55,5 +55,10 @@ namespace WMS.Web.Core.Dto.Erp
/// 条码
/// </summary>
public string BarCode { get; set; }
/// <summary>
/// 是否启用批号管理
/// </summary>
public bool IsBatchManage { get; set; }
}
}

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

@@ -64,5 +64,10 @@ namespace WMS.Web.Domain.Entitys
/// 条码
/// </summary>
public string BarCode { get; set; }
/// <summary>
/// 是否启用批号管理
/// </summary>
public bool IsBatchManage { get; set; }
}
}

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

@@ -183,7 +183,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶采购订单：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.PUR_PurchaseOrder.ToString());
param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId.FNumber,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FPurchaseOrgId.FNumber,FPOOrderEntry_FEntryID";
param.FieldKeys = "FBillNo,FSupplierId,FPurchaseOrgId,FMaterialId.FNumber,FSOSTOCKID,FQty,FEntryNote,FCreateDate,FCHUCHANGPRICE,FSOSTOCKID.FNumber,FStockInQty,FPurchaseOrgId.FNumber,FPOOrderEntry_FEntryID,FDEMANDBILLNO";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
//1.创建时间在两天前和当天时间之间
@@ -262,6 +262,7 @@ namespace WMS.Web.Domain.Services.Public
lis.DeliveredQty = Convert.ToDecimal(item[10]);
lis.OrgCode = item[11];
lis.ErpDetailId = Convert.ToInt32(item[12]);
lis.SaleBillNo = item[13];
lis.Type = (int)InstockType.Purchase;
erp_list.Add(lis);
}
@@ -414,7 +415,9 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核
//3.单据类型：标准直接调拨单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
param.FilterString = " FDocumentStatus='C' and FBillTypeID='ce8f49055c5c4782b65463a3f863bb4a'";
param.FilterString += " and FSrcStockId!=FDestStockId";
for (int i = 0; i < stocks.Count(); i++)
{
@@ -521,7 +524,9 @@ namespace WMS.Web.Domain.Services.Public
//2.审核状态：已审核
//3.单据类型：标准分步式调入单；这里要注意了-----------测试端的“单据类型ID”和线上的可能不一样；上线的时候要核对下
//5.仓库：wms系统的仓库值---现在这个没有加，因为还单点没有和金蝶同步
//当金蝶系统物料明细行调出仓库和调入仓库相同, 数据不需要拉取
param.FilterString = " FDocumentStatus='C' and FBillTypeID='e65a4f29743a44b7b67dc8145e1f9c92'";
param.FilterString += " and FSrcStockId!=FDestStockId";
for (int i = 0; i < stocks.Count(); i++)
{
if (i == 0)
@@ -940,7 +945,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶物料：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber";
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -989,6 +994,7 @@ namespace WMS.Web.Domain.Services.Public
lis.BarCode = item[7];
lis.OrgId = Convert.ToInt32(item[8]);
lis.OrgCode = item[9];
lis.IsBatchManage = Convert.ToBoolean(item[10]);
erp_materials_list.Add(lis);
}
//4.6页面的叠加
@@ -1025,7 +1031,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶物料：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE";
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -1064,6 +1070,9 @@ namespace WMS.Web.Domain.Services.Public
lis.BaseUnitName = item[5];
lis.BaseUnitNumber = item[6];
lis.BarCode = item[7];
lis.OrgId = Convert.ToInt32(item[8]);
lis.OrgCode = item[9];
lis.IsBatchManage = Convert.ToBoolean(item[10]);
erp_materials_list.Add(lis);
}
if (erp_materials_list.Count == 0)
@@ -1094,7 +1103,7 @@ namespace WMS.Web.Domain.Services.Public
//3.获取金蝶物料：拼接参数和条件
var query = new ErpBillQueryDto(token_result.Data);
var param = new ErpBillQueryParamDto(FormIdParam.BD_MATERIAL.ToString());
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE";
param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -1133,6 +1142,9 @@ namespace WMS.Web.Domain.Services.Public
lis.BaseUnitName = item[5];
lis.BaseUnitNumber = item[6];
lis.BarCode = item[7];
lis.OrgId = Convert.ToInt32(item[8]);
lis.OrgCode = item[9];
lis.IsBatchManage = Convert.ToBoolean(item[10]);
erp_materials_list.Add(lis);
}
if (erp_materials_list.Count == 0)