222

schangxiang@126.com

2024-12-09 f2f4ecd04b2987f6aed8216442e82a81009c2366

222

 CC/iWareCommon/Common/Globle/SysGloble.cs

@@ -32,7 +32,7 @@

        public static string LogDir = "d://log";

        public const string WCSSystem = "WCS";
        public const string WCSSystem = "调度系统";

        /// <summary>
        /// 当前配置的堆叠顺序排序方式

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/CommonHelper/SysHelper.cs

@@ -5,6 +5,28 @@
    /// </summary>
    public class SysHelper
    {
        /// <summary>
        /// 获取设备报警的db地址
        /// </summary>
        /// <param name="_DeviceAreaCode"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public static string GetDBForDeviceWarning(string _DeviceAreaCode)
        {
            switch (_DeviceAreaCode)
            {
                case "分拣区":
                    return "5000";
                case "码包区":
                    return "5001";
                case "合包区":
                    return "5002";
                case "封箱区":
                    return "5003";
                default:
                    throw new Exception("不支持的区域");
            }
        }

        ///// <summary>
        ///// 获取登录人的昵称

 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsSystemConfig/WmsConfigDeviceWarning/WmsConfigDeviceWarningService.cs

@@ -144,6 +144,9 @@
    {
        var details = new List<WmsConfigDeviceWarning>();
        int index = dataStartLine;//模版列名开始行
        decimal offset = 0.0M;
        decimal intValue = 0.0M;
        string my_DeviceAreaCode = "";
        foreach (System.Data.DataRow row in dataTable.Rows)
        {
            index++;
@@ -165,6 +168,11 @@
                           _WarningContent = row["报警内容"]?.ToString() ;
                          #endregion
                          
            if (!string.IsNullOrEmpty(my_DeviceAreaCode) && _DeviceAreaCode != my_DeviceAreaCode)
            {
                throw Oops.Oh($"第{index}行一次只能导入一个设备区域！");
            }
            my_DeviceAreaCode = _DeviceAreaCode;
                          
                          #region 验证
                          
@@ -207,15 +215,25 @@
                              }
                          
                           }
                          if(!string.IsNullOrEmpty(_WarningCode))
                          {
                                addItem.WarningCode = (string)(_WarningCode.Trim());
                           }

                          if(!string.IsNullOrEmpty(_WarningContent))
                          {
                                addItem.WarningContent = (string)(_WarningContent.Trim());
                           }
                          #endregion

            addItem.WarningCode = SysHelper.GetDBForDeviceWarning(_DeviceAreaCode) + "|" + intValue.ToString("0.0");

            if (offset == 0.7M)
            {
                offset = 0.0M;
                intValue += 0.3M;
            }
            else
            {
                offset += 0.1M;
                intValue += 0.1M;
            }
                          

            details.Add(addItem);
@@ -329,7 +347,8 @@
          
           //根据单独校验验证表格中中是否已存在相同数据  
                   var existExcelItemForSingle_WarningCode = inputs.GroupBy(g => new { g.WarningCode}).Where(g => g.Count() > 1).ToList();
                   if(existExcelItemForSingle_WarningCode != null && existExcelItemForSingle_WarningCode.Count > 0){
        if (existExcelItemForSingle_WarningCode != null && existExcelItemForSingle_WarningCode.Count > 0)
        {
                        var item= existExcelItemForSingle_WarningCode.First().ToList().First();
                        throw Oops.Oh($"验证失败,导入的表格中,报警代码[" + item.WarningCode + "]已重复存在");
                   }