Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

wangxinhui

2025-01-10 4bc0e18b94a2bf17c1b7277910d63ef82fbe616a

 ´úÂë¹ÜÀí/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,17 +80,20 @@
        {
            try
            {
                Dt_Warehouse warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
                if (warehouse == null)
                Dt_Warehouse? warehouse = null;
                if (model.ItemType == MaterielTypeEnum.RawMateriel.ObjToInt())
                {
                    return WebResponseContent.Instance.Error($"未找到仓库信息");
                    warehouse = _basicRepository.WarehouseRepository.QueryFirst(x => x.WarehouseCode == model.WaId);
                    if (warehouse == null)
                    {
                        return WebResponseContent.Instance.Error("未找到仓库信息");
                    }
                }

                if (model.OperateType == 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,
@@ -85,14 +101,14 @@
                        MaterielName = model.Name,
                        MaterielSize = model.Size,
                        MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType,
                        MaterielSpec = model.StandType,
                        MaterielSpec = warehouse == null ? "空" : model.StandType,
                        MaterielState = (EnableEnum)model.State,
                        MaterielThickness = model.Thickness,
                        MaterielType = (MaterielTypeEnum)model.ItemType,
                        MaterielUnit = model.Unit,
                        MaterielUnit = model.Unit == null ? "" : model.Unit,
                        MaterielVersion = model.MaterialVersion,
                        MaterielWide = model.Wide,
                        WarehouseId = warehouse.WarehouseId,
                        WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
                    };
                    BaseDal.AddData(materielInfo);
                }
@@ -104,7 +120,7 @@
                        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;
@@ -112,14 +128,14 @@
                    materielInfo.MaterielName = model.Name;
                    materielInfo.MaterielSize = model.Size;
                    materielInfo.MaterielSourceType = (MaterielSourceTypeEnum)model.ItemSourceType;
                    materielInfo.MaterielSpec = model.StandType;
                    materielInfo.MaterielSpec = warehouse == null ? "" : model.StandType;
                    materielInfo.MaterielState = (EnableEnum)model.State;
                    materielInfo.MaterielThickness = model.Thickness;
                    materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
                    materielInfo.MaterielUnit = model.Unit;
                    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)