From 8090ea999c5b3d4211b5cda0d5d80f13252edd82 Mon Sep 17 00:00:00 2001
From: 18923810322 <1666941798@qq.com>
Date: Fri, 31 Jul 2026 16:24:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8D=95=E6=8D=AE?=
=?UTF-8?q?=E7=BC=96=E7=A0=81=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml | 15 +++++++++++++++
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml | 8 ++++++++
.../Dto/Erp/Material/ErpMaterialDto.cs | 18 ++++++++++++++++++
.../Public/IErpBasicDataExtendService.cs | 2 ++
src/WMS.Web.Domain/Services/InStockService.cs | 6 +++++-
.../Public/ErpBasicDataExtendService.cs | 19 +++++++++++++++++++
.../InStockTaskRepositories.cs | 6 +++++-
7 files changed, 72 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 eecbff78..4df4a9fd 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
@@ -1267,6 +1267,21 @@
物料规格型号
+
+
+ Id
+
+
+
+
+ 编码
+
+
+
+
+ 名称
+
+
对应金蝶，物料信息
diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 073a9d53..dce3b923 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -6212,6 +6212,14 @@
+
+
+ 获取物料规格型号
+
+
+
+
+
获取物料名称
diff --git a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
index d1a7ea7d..82163059 100644
--- a/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
+++ b/src/WMS.Web.Core/Dto/Erp/Material/ErpMaterialDto.cs
@@ -15,6 +15,24 @@ namespace WMS.Web.Core.Dto.Erp
///
public string Specifications { get; set; }
}
+ public class uc_warehouse_position
+ {
+ ///
+ /// Id
+ ///
+ public int Id { get; set; }
+
+ ///
+ /// 编码
+ ///
+ public string position_code { get; set; }
+
+
+ ///
+ /// 名称
+ ///
+ public string position { get; set; }
+ }
///
/// 对应金蝶，物料信息
///
diff --git a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
index dbdeb0dc..cc8fa97e 100644
--- a/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/IService/Public/IErpBasicDataExtendService.cs
@@ -86,6 +86,8 @@ namespace WMS.Web.Domain.IService.Public
///
string GetMaterialSpecifications(List erpMaterials, string materialNumber);
+ string Getuc_warehouse_position(List warehouse_position, string positionCode);
+
///
/// 获取物料基本单位名称
///
diff --git a/src/WMS.Web.Domain/Services/InStockService.cs b/src/WMS.Web.Domain/Services/InStockService.cs
index deb232c5..9dd8a807 100644
--- a/src/WMS.Web.Domain/Services/InStockService.cs
+++ b/src/WMS.Web.Domain/Services/InStockService.cs
@@ -1197,9 +1197,10 @@ namespace WMS.Web.Domain.Services
_logger.LogInformation($"入库单->保存失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{res_s.Message}");
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, "", purchaseInStock.Details[0].DetailId);
}
+
//提交
- _logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}");
+ _logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId},提交的数据{res_s.Data}");
ErpOperateDto o_dto = new ErpOperateDto(formId, res_s.Data);//res_s.Data
var resSubmit = await sc_erpService.Submit(o_dto, formId);
if (!resSubmit.IsSuccess)
@@ -1343,6 +1344,9 @@ namespace WMS.Web.Domain.Services
_logger.LogInformation($"入库单->保存失败 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId} 错误:{res_s.Message}");
return (Result.ReFailure(res_s.Message, res_s.Status), SyncStatus.SubmitFail, currentDet.OrderId, det.DetailId);
}
+ List list = new List();
+ list.Add(res_s.Data.ToString());
+ o_dto.Numbers = list;
//提交
_logger.LogInformation($"入库单->保存成功 开始提交 单号:{billNo} erp明细Id:{erpDetail.ErpDetailId}");
diff --git a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
index 84c74d25..202dc9a4 100644
--- a/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
+++ b/src/WMS.Web.Domain/Services/Public/ErpBasicDataExtendService.cs
@@ -98,6 +98,25 @@ namespace WMS.Web.Domain.Services.Public
return mat.Specifications;
}
+
+ ///
+ /// 获取物料规格型号
+ ///
+ ///
+ ///
+ ///
+ public string Getuc_warehouse_position(List warehouse_position, string positionCode)
+ {
+ if (warehouse_position == null || warehouse_position.Count == 0)
+ return "";
+ var mat = warehouse_position.Where(x => x.position_code == positionCode).FirstOrDefault();
+ if (mat == null)
+ {
+ return "";
+ }
+ return mat.position;
+ }
+
///
/// 获取物料名称
///
diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
index 9c6d6321..3fd985ad 100644
--- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs
+++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs
@@ -22,6 +22,7 @@ using WMS.Web.Domain.Mappers;
using WMS.Web.Domain.Values;
using WMS.Web.Domain.Values.Single;
using WMS.Web.Repositories.Configuration;
+using uc_warehouse_position = WMS.Web.Core.Dto.Erp.uc_warehouse_position;
namespace WMS.Web.Repositories
{
@@ -142,7 +143,9 @@ namespace WMS.Web.Repositories
//取仓位
+ var positions = new List();
var postionList = await _boxRepositories.Getuc_warehouse_position();
+ //positions = postionList
//1.获取物料集合和组织集合和供应商的集合
var materials = new List();
@@ -204,7 +207,8 @@ namespace WMS.Web.Repositories
RealityQty = x.detail.Qty,
ReceiveQty = x.detail.Qty,
ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
- shelfSpaceCode=x.order.SubStockCode,
+ shelfSpaceCode= _erpBasicDataExtendService.Getuc_warehouse_position(positions, x.order.SubStockCode),
+
shelfSpace = x.order.SubStockCode,
Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
Receiver = "",