From 41ef8ff89bc443a3bb2c095b82ccfa7a5847e2ec Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Tue, 15 Jul 2025 10:35:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=90=8C=E6=AD=A5?=
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 | 6 ++++++
src/WMS.Web.Domain/Entitys/Materials.cs | 5 +++++
src/WMS.Web.Domain/Services/Public/ErpService.cs | 3 ++-
.../Services/Public/MaterialService.cs | 16 ++++++++++++++--
6 files changed, 37 insertions(+), 3 deletions(-)
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
index 5661d9f6..1424905f 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1372,6 +1372,11 @@
产品分组(3级)名称
+
+
+ 物料32进制
+
+
金蝶组织-基本信息
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index fafbaab4..b6137769 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -1579,6 +1579,11 @@
产品分组(3级)名称
+
+
+ 物料32进制Id
+
+
wms移箱记录
diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
index 4b599f4a..d1a7ea7d 100644
--- a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
@@ -115,5 +115,11 @@ namespace WMS.Web.Core.Dto.Erp
public string FMaterialGroupFName { get; set; }
+ ///
+ /// 物料32进制
+ ///
+ public string FProductIDS { get; set; }
+
+
}
}
diff --git a/src/WMS.Web.Domain/Entitys/Materials.cs b/src/WMS.Web.Domain/Entitys/Materials.cs
index 97c1c601..1a6e836e 100644
--- a/src/WMS.Web.Domain/Entitys/Materials.cs
+++ b/src/WMS.Web.Domain/Entitys/Materials.cs
@@ -103,6 +103,11 @@ namespace WMS.Web.Domain.Entitys
///
public string FMaterialGroupFName { get; set; }
+ ///
+ /// 物料32进制Id
+ ///
+ public string FProductIDS { get; set; }
+
diff --git a/src/WMS.Web.Domain/Services/Public/ErpService.cs b/src/WMS.Web.Domain/Services/Public/ErpService.cs
index 430f755e..b1527391 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpService.cs
@@ -1154,7 +1154,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,FIsBatchManage,FProductLines1,FProductCATs1,FMaterialGroup,F_Product,FModifyDate,FCreateDate,FProductLines1.FName,FProductCATs1.FName,FMaterialGroup.FName";
+ param.FieldKeys = "FMATERIALID,FName,FNumber,FSpecification,FBaseUnitId,FBaseUnitId.FName,FBaseUnitId.FNumber,FBARCODE,FUseOrgId,FUseOrgId.FNumber,FIsBatchManage,FProductLines1,FProductCATs1,FMaterialGroup,F_Product,FModifyDate,FCreateDate,FProductLines1.FName,FProductCATs1.FName,FMaterialGroup.FName,FProductIDS";
param.Limit = 10000;
//查询条件：备注其中的条件值以金蝶的值为准！！！
@@ -1214,6 +1214,7 @@ namespace WMS.Web.Domain.Services.Public
lis.FProductLines1FName=item[17];
lis.FProductCATs1FName = item[18];
lis.FMaterialGroupFName = item[19];
+ lis.FProductIDS = item[20];
erp_materials_list.Add(lis);
}
diff --git a/src/WMS.Web.Domain/Services/Public/MaterialService.cs b/src/WMS.Web.Domain/Services/Public/MaterialService.cs
index fa09400d..34238dd5 100644
--- a/src/WMS.Web.Domain/Services/Public/MaterialService.cs
+++ b/src/WMS.Web.Domain/Services/Public/MaterialService.cs
@@ -92,7 +92,7 @@ namespace WMS.Web.Domain.Services
//修改有更新的数据
if (mats.Count != 0)
{
- var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate>=DateTime.Now.AddDays(-10)).Select(x =>new { MaterialNumber= x.MaterialNumber, Specifications=x.Specifications }).ToList();
+ var isFModifyDateMatNumbs = mats.Where(x => x.FModifyDate>=DateTime.Now.AddDays(-5)).Select(x =>new { MaterialNumber= x.MaterialNumber, Specifications=x.Specifications, MaterialName =x.MaterialName, BarCode =x.BarCode, OrgId = x.OrgId, FProductLines1 =x.FProductLines1 , FProductCATs1 =x.FProductCATs1 , FMaterialGroup =x.FMaterialGroup , F_Product =x.F_Product , FProductLines1FName =x.FProductLines1FName , FProductCATs1FName =x.FProductCATs1FName , FMaterialGroupFName =x.FMaterialGroupFName , MaterialId =x.MaterialId , FProductIDS =x.FProductIDS }).ToList();
//
_logger.LogInformation("取到需要同步的金蝶修改物料规格yzh：" + isFModifyDateMatNumbs.Count+"个");
@@ -112,9 +112,21 @@ namespace WMS.Web.Domain.Services
// entity.Specifications = mats_result[];
foreach (var mat in isFModifyDateMatNumbs)
{
- if (entity.MaterialNumber== mat.MaterialNumber)
+ if (entity.MaterialNumber== mat.MaterialNumber )
{
entity.Specifications = mat.Specifications;
+ entity.MaterialName = mat.MaterialName;
+ entity.BarCode = mat.BarCode;
+ //entity.OrgId = mat.OrgId;
+ entity.FProductLines1 = mat.FProductLines1;
+ entity.FProductCATs1 = mat.FProductCATs1;
+ entity.FMaterialGroup = mat.FMaterialGroup;
+ entity.F_Product = mat.F_Product;
+ entity.FProductLines1FName = mat.FProductLines1FName;
+ entity.FProductCATs1FName = mat.FProductCATs1FName;
+ entity.FMaterialGroupFName = mat.FMaterialGroupFName;
+ entity.MaterialId = mat.MaterialId;
+ entity.FProductIDS = mat.FProductIDS;
continue;
}
}