From 43a052bc80ac6205be2c1b85835b6c88c310e72f Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Tue, 5 Mar 2024 11:30:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8A=A0orgcode?=
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 +++++
src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs | 5 +++++
src/WMS.Web.Domain/Entitys/Materials.cs | 7 ++++++-
src/WMS.Web.Domain/Services/Public/ErpService.cs | 5 ++++-
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index b5b29a9c..7e6f5987 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1107,6 +1107,11 @@
组织ID
+
+
+ 组织编码
+
+
物料ID
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index c394d788..16ecc535 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1282,6 +1282,11 @@
+
+ 组织Id
+
+
+
组织编码
diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
index 55510f39..96c56a3b 100644
--- a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
@@ -14,6 +14,11 @@ namespace WMS.Web.Core.Dto.Erp
///
public int OrgId { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 物料ID
///
diff --git a/src/WMS.Web.Domain/Entitys/Materials.cs b/src/WMS.Web.Domain/Entitys/Materials.cs
index 3000d83e..aa7c281b 100644
--- a/src/WMS.Web.Domain/Entitys/Materials.cs
+++ b/src/WMS.Web.Domain/Entitys/Materials.cs
@@ -19,10 +19,15 @@ namespace WMS.Web.Domain.Entitys
public override int Id { get; set; }
///
- /// 组织编码
+ /// 组织Id
///
public int OrgId { get; set; }
+ ///
+ /// 组织编码
+ ///
+ public string OrgCode { get; set; }
+
///
/// 物料ID
///
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index c4760614..5a71f281 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -834,6 +834,7 @@ namespace WMS.Web.Domain.Services.Public
lis.BaseUnitNumber = item.BaseUnitNumber;
lis.BarCode = item.BarCode;
lis.OrgId = item.OrgId;
+ lis.OrgCode = item.OrgCode;
erp_materials_list.Add(lis);
}
_memoryCache.Set(_erpOptions.cache_materail_key, erp_materials_list, new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(DateTimeUtil.GetTotalMinutesTimeSpan())));
@@ -904,7 +905,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";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -951,6 +952,8 @@ 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];
erp_materials_list.Add(lis);
}
//4.6页面的叠加