1

wangxinhui

2025-07-11 11293e5c5f7accc2437034bba594b15fb0df0387

 ´úÂë¹ÜÀí/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,65 +80,79 @@
        {
            try
            {
                Dt_Warehouse? warehouse =null;
                if (model.ItemType == MaterielTypeEnum.RawMateriel.ObjToInt())
                {
                    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 = warehouse == null ? 0:(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 = warehouse == null ?"空":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,
                        MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
                        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);
                }
                else if (model.OperateType == 1)
                else if (model.OperateType.ObjToInt() == 1)
                {
                    Dt_MaterielInfo materielInfo = BaseDal.QueryFirst(x => x.MaterielCode == model.Code);
                    if (materielInfo == null)
                    {
                        return WebResponseContent.Instance.Error($"未找到物料信息");
                        Dt_MaterielInfo materielInfoAddNew = new Dt_MaterielInfo()
                        {
                            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.ObjToInt()),
                            MaterielSpec = warehouse == null ? "空" : model.StandType,
                            MaterielState = (EnableEnum)(model.State.ObjToInt()),
                            MaterielThickness = model.Thickness,
                            MaterielType = (MaterielTypeEnum)(model.ItemType.ObjToInt()),
                            MaterielUnit = model.Unit == null ? "" : model.Unit,
                            MaterielVersion = model.MaterialVersion,
                            MaterielWide = model.Wide,
                            WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId,
                        };
                        BaseDal.AddData(materielInfoAddNew);
                    }

                    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 = warehouse == null ? "" : model.StandType;
                    materielInfo.MaterielState = (EnableEnum)model.State;
                    materielInfo.MaterielThickness = model.Thickness;
                    materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType;
                    materielInfo.MaterielUnit = model.Unit==null?"": model.Unit;
                    materielInfo.MaterielVersion = model.MaterialVersion;
                    materielInfo.MaterielWide = model.Wide;
                    materielInfo.WarehouseId = warehouse == null ? 0 : warehouse.WarehouseId;
                    BaseDal.UpdateData(materielInfo);
                    else
                    {
                        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.ObjToInt();
                        materielInfo.MaterielSpec = warehouse == null ? "" : model.StandType;
                        materielInfo.MaterielState = (EnableEnum)model.State.ObjToInt();
                        materielInfo.MaterielThickness = model.Thickness;
                        materielInfo.MaterielType = (MaterielTypeEnum)model.ItemType.ObjToInt();
                        materielInfo.MaterielUnit = model.Unit == null ? "" : model.Unit;
                        materielInfo.MaterielVersion = model.MaterialVersion;
                        materielInfo.MaterielWide = model.Wide;
                        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)
@@ -140,7 +166,7 @@
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
                return WebResponseContent.Instance.OK(ex.Message);
            }
        }
    }