647556386
2026-01-08 a23a6adeb4d2c20ee00cbaf57af8ad95620eb777
Revert "1"

This reverts commit d5ac97bab548d213fea89b312ddce79a8a6371a2.
已修改1个文件
29 ■■■■■ 文件已修改
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs
@@ -114,32 +114,29 @@
                throw new Exception($"转换后单位不能为空");
            }
            Dt_MaterielInfo materielInfo = MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == materialCode);
            if (materielInfo == null)
            {
                throw new Exception("单位转换时物料信息未找到");
            }
            decimal ratio = 1;
            if (materielInfo.inventoryUOM.Trim().ToLower() == fromUnit.Trim().ToLower())
            if (fromUnit.Trim().ToLower() == toUnit.Trim().ToLower())
            {
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
            }
            Dt_MaterialUnit materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == fromUnit && x.ToUom == toUnit);
            if (materialUnit != null)
            {
                ratio = materialUnit.Ratio;
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
            }
            else
            {
                Dt_MaterialUnit materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == fromUnit);
                if (materialUnit != null)
                materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == toUnit && x.ToUom == fromUnit);
                if (materialUnit == null)
                {
                    toUnit = materialUnit.ToUom;
                    ratio = materialUnit.Ratio;
                    return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
                    throw new Exception($"未找到单位转换关系,物料编号:{materialCode},转换前单位:{fromUnit},转换后单位:{toUnit}");
                }
                else
                {
                    throw new Exception($"未找到单位转换关系,物料编号:{materialCode},转换前单位:{fromUnit}");
                }
                ratio = materialUnit.Ratio;
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
            }
        }
        /// <summary>