From 04cd982b75d589290c03078a6466e12d773d6004 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Wed, 27 Mar 2024 16:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=BB=E5=8A=A1=E5=8D=95?= =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E9=94=80=E5=94=AE=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 5 +++++ src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 5 +++++ .../Dto/Erp/Material/ErpMaterialDto.cs | 5 +++++ src/WMS.Web.Domain/Entitys/Materials.cs | 5 +++++ .../Services/Public/ErpService.cs | 20 +++++++++++++++---- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 03e4c98c..21699bfd 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -1162,6 +1162,11 @@ 条码 + + + 是否启用批号管理 + + 金蝶组织-基本信息 diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 91538029..76441049 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1392,6 +1392,11 @@ 条码 + + + 是否启用批号管理 + + wms移箱记录 diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs index 96c56a3b..c5a37e01 100644 --- a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs +++ b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs @@ -55,5 +55,10 @@ namespace WMS.Web.Core.Dto.Erp /// 条码 /// public string BarCode { get; set; } + + /// + /// 是否启用批号管理 + /// + public bool IsBatchManage { get; set; } } } diff --git a/src/WMS.Web.Domain/Entitys/Materials.cs b/src/WMS.Web.Domain/Entitys/Materials.cs index aa7c281b..b7e7ac2b 100644 --- a/src/WMS.Web.Domain/Entitys/Materials.cs +++ b/src/WMS.Web.Domain/Entitys/Materials.cs @@ -64,5 +64,10 @@ namespace WMS.Web.Domain.Entitys /// 条码 /// public string BarCode { get; set; } + + /// + /// 是否启用批号管理 + /// + public bool IsBatchManage { get; set; } } } diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs index 26d8c35a..06621781 100644 --- a/src/WMS.Web.Domain/Services/Public/ErpService.cs +++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs @@ -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)