From 092f6e9efb6e4c2bc401ec134391ab0a25773b47 Mon Sep 17 00:00:00 2001
From: wankeda <Administrator@DESKTOP-HAU3ST3>
Date: 星期五, 21 二月 2025 16:41:38 +0800
Subject: [PATCH] PP仓提升机侧输送线流程
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/MaterielInfoService.cs | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 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 17c4dbe..578c271 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"
@@ -8,6 +8,7 @@
using WIDESEA_Common.MaterielEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
+using WIDESEA_Core.Helper;
using WIDESEA_DTO.Basic;
using WIDESEA_DTO.ERP;
using WIDESEA_IBasicRepository;
@@ -58,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>
@@ -67,36 +80,31 @@
{
try
{
- Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
- if (warehouse == null)
- {
- return WebResponseContent.Instance.Error($"鏈壘鍒颁粨搴撲俊鎭�");
- }
-
- if (model.OperateType == 0)
+ Dt_Warehouse? warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
+ if (model.OperateType.ObjToInt() == 0)
{
Dt_MaterielInfo materielInfo = new Dt_MaterielInfo()
{
- IsCheck = (WhetherEnum)model.IsCheck,
+ IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck,
MaterielCode = model.Code,
MaterielInvOrgId = model.InvOrgId,
MaterielLength = model.Length,
MaterielModel = model.Model,
MaterielName = model.Name,
MaterielSize = model.Size,
- MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
- MaterielSpec = model.StandType,
- MaterielState = (EnableEnum)model.State,
+ MaterielSourceType = (MaterielSourceTypeEnum)(model.ItemSourceType.ObjToInt()),
+ MaterielSpec = warehouse == null ? "绌�" : model.StandType,
+ MaterielState = (EnableEnum)(model.State.ObjToInt()),
MaterielThickness = model.Thickness,
- MaterielType = (MaterielTypeEnum)model.ItemType,
- MaterielUnit = model.Unit,
+ MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
+ MaterielUnit = model.Unit == null ? "" : model.Unit,
MaterielVersion = model.MaterialVersion,
MaterielWide = model.Wide,
- WarehouseId = warehouse.WarehouseId,
+ WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
};
BaseDal.AddData(materielInfo);
}
- else if (model.OperateType == 1)
+ else if (model.OperateType.ObjToInt() == 1)
{
Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
if (materielInfo == null)
@@ -104,25 +112,25 @@
return WebResponseContent.Instance.Error($"鏈壘鍒扮墿鏂欎俊鎭�");
}
- materielInfo.IsCheck = (WhetherEnum)model.IsCheck;
+ materielInfo.IsCheck = warehouse == null ? 0 : (WhetherEnum)model.IsCheck;
materielInfo.MaterielCode = model.Code;
materielInfo.MaterielInvOrgId = model.InvOrgId;
materielInfo.MaterielLength = model.Length;
materielInfo.MaterielModel = model.Model;
materielInfo.MaterielName = model.Name;
materielInfo.MaterielSize = model.Size;
- materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType;
- materielInfo.MaterielSpec = model.StandType;
- materielInfo.MaterielState = (EnableEnum)model.State;
+ materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType.ObjToInt();
+ materielInfo.MaterielSpec = warehouse == null ? "" : model.StandType;
+ materielInfo.MaterielState = (EnableEnum)model.State.ObjToInt();
materielInfo.MaterielThickness = model.Thickness;
- materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
- materielInfo.MaterielUnit = model.Unit;
+ materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType.ObjToInt();
+ materielInfo.MaterielUnit = model.Unit == null ? "" : model.Unit;
materielInfo.MaterielVersion = model.MaterialVersion;
materielInfo.MaterielWide = model.Wide;
- materielInfo.WarehouseId = warehouse.WarehouseId;
+ materielInfo.WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId;
BaseDal.UpdateData(materielInfo);
}
- else if (model.OperateType == 2)
+ else if (model.OperateType.ObjToInt() == 2)
{
Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
if (materielInfo == null)
@@ -136,7 +144,7 @@
}
catch (Exception ex)
{
- return WebResponseContent.Instance.Error(ex.Message);
+ return WebResponseContent.Instance.OK(ex.Message);
}
}
}
--
Gitblit v1.9.3