Merge branch 'htq20251215' of http://115.159.85.185:8098/r/ZhongRui/ALDbany...

647556386

2026-01-06 61654768aa92e6c3fd288344c0c895ba4d19d127

 ÏîÄ¿´úÂë/WMSÎÞ²Ö´¢°æ/WIDESEA_WMSServer/WIDESEA_BasicService/BasicService.cs

@@ -40,50 +40,55 @@
        }

        #region

        static object lockObj = new object();
        public string CreateCodeByRule(string ruleCode)
        {
            string code = string.Empty;
            DateTime dataTime = DateTime.Now;
            DateTime now = DateTime.Now;

            try
            lock (lockObj)
            {
                Dt_CodeRuleConfig ruleConfig = _unitOfWorkManage.Db.Queryable<Dt_CodeRuleConfig>().Where(x => x.RuleCode == ruleCode).First();
                if (ruleConfig.ModifyDate != null)
                {
                    dataTime = ruleConfig.ModifyDate.Value;
                }
                else
                {
                    dataTime = ruleConfig.CreateDate;
                }
                string code = string.Empty;
                DateTime dataTime = DateTime.Now;
                DateTime now = DateTime.Now;

                if (now.Year == dataTime.Year && now.Month == dataTime.Month && now.Day == dataTime.Day)
                try
                {
                    now = dataTime;
                    ruleConfig.CurrentVal = Convert.ToInt32(ruleConfig.CurrentVal) + 1;
                    Dt_CodeRuleConfig ruleConfig = _unitOfWorkManage.Db.Queryable<Dt_CodeRuleConfig>().Where(x => x.RuleCode == ruleCode).First();
                    if (ruleConfig.ModifyDate != null)
                    {
                        dataTime = ruleConfig.ModifyDate.Value;
                    }
                    else
                    {
                        dataTime = ruleConfig.CreateDate;
                    }

                    if (now.Year == dataTime.Year && now.Month == dataTime.Month && now.Day == dataTime.Day)
                    {
                        now = dataTime;
                        ruleConfig.CurrentVal = Convert.ToInt32(ruleConfig.CurrentVal) + 1;
                    }
                    else
                    {
                        ruleConfig.CurrentVal = 1;
                    }

                    ruleConfig.ModifyDate = DateTime.Now;

                    code = ruleConfig.Format;
                    code = code.Replace($"[{CodeFormatTypeEnum.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
                    code = code.Replace($"[{CodeFormatTypeEnum.MM}]", now.Month.ToString().PadLeft(2, '0'));
                    code = code.Replace($"[{CodeFormatTypeEnum.DD}]", now.Day.ToString().PadLeft(2, '0'));
                    code = code.Replace($"[{CodeFormatTypeEnum.ST}]", ruleConfig.StartStr.ToString());
                    code = code.Replace($"[{CodeFormatTypeEnum.NUM}]", ruleConfig.CurrentVal.ToString().PadLeft(ruleConfig.Length, '0'));

                    _unitOfWorkManage.Db.Updateable(ruleConfig).ExecuteCommand();
                }
                else
                catch (Exception ex)
                {
                    ruleConfig.CurrentVal = 1;
                    throw new Exception(ex.Message);
                }

                ruleConfig.ModifyDate = DateTime.Now;

                code = ruleConfig.Format;
                code = code.Replace($"[{CodeFormatTypeEnum.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
                code = code.Replace($"[{CodeFormatTypeEnum.MM}]", now.Month.ToString().PadLeft(2, '0'));
                code = code.Replace($"[{CodeFormatTypeEnum.DD}]", now.Day.ToString().PadLeft(2, '0'));
                code = code.Replace($"[{CodeFormatTypeEnum.ST}]", ruleConfig.StartStr.ToString());
                code = code.Replace($"[{CodeFormatTypeEnum.NUM}]", ruleConfig.CurrentVal.ToString().PadLeft(ruleConfig.Length, '0'));

                _unitOfWorkManage.Db.Updateable(ruleConfig).ExecuteCommand();
                return code;
            }
            catch (Exception ex)
            {

            }
            return code;
        }
        #endregion

@@ -109,29 +114,32 @@
                throw new Exception($"转换后单位不能为空");
            }

            decimal ratio = 0;

            if (fromUnit.Trim().ToLower() == toUnit.Trim().ToLower())
            Dt_MaterielInfo materielInfo = MaterielInfoService.Repository.QueryFirst(x => x.MaterielCode == materialCode);
            if (materielInfo == null)
            {
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
                throw new Exception("单位转换时物料信息未找到");
            }
            decimal ratio = 1;

            Dt_MaterialUnit materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == fromUnit && x.ToUom == toUnit);
            if (materialUnit != null)
            if (materielInfo.inventoryUOM.Trim().ToLower() == fromUnit.Trim().ToLower())
            {
                ratio = materialUnit.Ratio;
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
            }
            else
            {
                materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == toUnit && x.ToUom == fromUnit);
                if (materialUnit == null)
                Dt_MaterialUnit materialUnit = MaterialUnitService.Repository.QueryFirst(x => x.ItemNo == materialCode && x.FromUom == fromUnit);
                if (materialUnit != null)
                {
                    throw new Exception($"未找到单位转换关系，物料编号：{materialCode}，转换前单位：{fromUnit}，转换后单位：{toUnit}");
                    toUnit = materialUnit.ToUom;
                    ratio = materialUnit.Ratio;
                    return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
                }
                ratio = materialUnit.Ratio;
                return new UnitConvertResultDTO(materialCode, fromUnit, toUnit, quantity, ratio);
                else
                {
                    throw new Exception($"未找到单位转换关系，物料编号：{materialCode}，转换前单位：{fromUnit}");
                }
            }
              
        }

        /// <summary>