From 3a3f17f0890d721d97b139f88dde7df5c13ba688 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 06 一月 2025 18:51:21 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
index 4bb9f4c..e360f6f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs"
@@ -59,6 +59,18 @@
return BaseDal.QueryData(x => materielCodes.Contains(x.MaterielCode));
}
+ public WebResponseContent GetWarehouseMaterielInfos(int warehouseId)
+ {
+ try
+ {
+ List<Dt_MaterielInfo> materielInfos = BaseDal.QueryData(x => x.WarehouseId == warehouseId);
+ return WebResponseContent.Instance.OK(data: materielInfos);
+ }
+ catch (Exception ex)
+ {
+ return WebResponseContent.Instance.Error(ex.Message);
+ }
+ }
/// <summary>
/// 鎺ユ敹ERP鐗╂枡淇℃伅
/// </summary>
@@ -68,11 +80,11 @@
{
try
{
- Dt_Warehouse? warehouse =null;
+ Dt_Warehouse? warehouse = null;
if (model.ItemType == MaterielTypeEnum.RawMateriel.ObjToInt())
{
warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
- if (warehouse==null)
+ if (warehouse == null)
{
return WebResponseContent.Instance.Error("鏈壘鍒颁粨搴撲俊鎭�");
}
@@ -81,7 +93,7 @@
{
Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
{
- IsCheck = warehouse == null ? 0:(WhetherEnum)model.IsCheck,
+ IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck,
MaterielCode = model.Code,
MaterielInvOrgId = model.InvOrgId,
MaterielLength = model.Length,
@@ -89,14 +101,14 @@
MaterielName = model.Name,
MaterielSize = model.Size,
MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
- MaterielSpec = warehouse == null ?"绌�":model.StandType,
+ MaterielSpec = warehouse == null ? "绌�" : model.StandType,
MaterielState = (EnableEnum)model.State,
MaterielThickness = model.Thickness,
MaterielType = (MaterielTypeEnum)model.ItemType,
MaterielUnit = model.Unit == null ? "" : model.Unit,
MaterielVersion = model.MaterialVersion,
MaterielWide = model.Wide,
- WarehouseId = warehouse==null?0:warehouse.WarehouseId,
+ WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
};
BaseDal.AddData(materielInfo);
}
@@ -120,7 +132,7 @@
materielInfo.MaterielState = (EnableEnum)model.State;
materielInfo.MaterielThickness = model.Thickness;
materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
- materielInfo.MaterielUnit = model.Unit==null?"": model.Unit;
+ materielInfo.MaterielUnit = model.Unit == null ? "" : model.Unit;
materielInfo.MaterielVersion = model.MaterialVersion;
materielInfo.MaterielWide = model.Wide;
materielInfo.WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId;
--
Gitblit v1.9.3