Merge branch 'master' of http://dev.ccwin-in.com:3000/zhibinlv/FIS1.5

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/MsgCheck/Services/M100CheckDomainService.cs

@@ -389,16 +389,16 @@ namespace WY.NewJit.MsgCheck
                 else
                 {
                     #region 更新不可打印标志
-                    List<BillM100> canNotPrintLst = _billM100Repository.Where(itm =>
-                        itm.ProductLine == m100Bill.ProductLine
-                        && itm.HostSN == m100Bill.HostSN
-                        && (itm.CanNotPrint == null || itm.CanNotPrint == false) ).ToList();
-                    foreach (BillM100 canNotPrintObj in canNotPrintLst)
-                    {
-                        canNotPrintObj.CanNotPrint = true;
-                        //_billM100Repository.UpdateAsync(canNotPrintObj, true).GetAwaiter().GetResult();
-                        _m100DomainService.UpdateM100(canNotPrintObj, true).GetAwaiter().GetResult();
-                    }
+                    //List<BillM100> canNotPrintLst = _billM100Repository.Where(itm =>
+                    //    itm.ProductLine == m100Bill.ProductLine
+                    //    && itm.HostSN == m100Bill.HostSN
+                    //    && (itm.CanNotPrint == null || itm.CanNotPrint == false) ).ToList();
+                    //foreach (BillM100 canNotPrintObj in canNotPrintLst)
+                    //{
+                    //    canNotPrintObj.CanNotPrint = true;
+                    //    //_billM100Repository.UpdateAsync(canNotPrintObj, true).GetAwaiter().GetResult();
+                    //    _m100DomainService.UpdateM100(canNotPrintObj, true).GetAwaiter().GetResult();
+                    //}
                     #endregion
 
                     if (ConfigDic.CurrentVersion == ConfigDicVersionOption.派格)

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Job.ConsoleApp/Messages/MsgTransmissionService.cs

@@ -303,103 +303,6 @@ namespace WY.NewJit.Job.ConsoleApp.Messages
 
         #region 私有方法
 
-        //private PathConfigInfo ReadConfig()
-        //{
-        //    PathConfigInfo ret = new PathConfigInfo("", "", "", "", "");
-        //    #region 取目录配置
-        //    try
-        //    {
-        //        string receiveDir = _configuration["ConfigDic:PathRead:接收目录"];
-        //        string workDir = _configuration["ConfigDic:PathRead:工作目录"];
-        //        string bakDir = _configuration["ConfigDic:PathRead:备份目录"];
-        //        string errorDir = _configuration["ConfigDic:PathRead:错误目录"];
-        //        string waitDir = _configuration["ConfigDic:PathRead:等待目录"];
-
-        //        string pathReadType = _configuration["ConfigDic:PathReadType"];
-        //        if (pathReadType != null && pathReadType == "绝对")
-        //        {
-        //            ret = new PathConfigInfo(receiveDir, workDir, bakDir, errorDir, waitDir);
-        //        }
-        //        else
-        //        {
-        //            ret = new PathConfigInfo(
-        //                GetAbsPath(receiveDir),
-        //                GetAbsPath(workDir),
-        //                GetAbsPath(bakDir),
-        //                GetAbsPath(errorDir),
-        //                GetAbsPath(waitDir)
-        //                );
-        //        }
-
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        string errorMsg = "文件传输-取目录配置时出错：" + ex.Message;
-        //        throw new Exception(errorMsg);
-        //    }
-        //    #endregion
-
-        //    #region 创建目录
-        //    try
-        //    {
-        //        if (!Directory.Exists(ret.ReceivePath))
-        //        {
-        //            Directory.CreateDirectory(ret.ReceivePath);
-        //        }
-        //        if (!Directory.Exists(ret.WorkPath))
-        //        {
-        //            Directory.CreateDirectory(ret.WorkPath);
-        //        }
-        //        if (!Directory.Exists(ret.BakPath))
-        //        {
-        //            Directory.CreateDirectory(ret.BakPath);
-        //        }
-        //        if (!Directory.Exists(ret.ErrorPath))
-        //        {
-        //            Directory.CreateDirectory(ret.ErrorPath);
-        //        }
-        //        if (!Directory.Exists(ret.WaitPath))
-        //        {
-        //            Directory.CreateDirectory(ret.WaitPath);
-        //        }
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        string errorMsg = "文件传输-创建目录出错：" + ex.Message;
-        //        throw new Exception(errorMsg);
-        //    }
-        //    #endregion
-
-        //    #region 取报文过滤关键字
-        //    try
-        //    {
-        //        string fileFilterKeyword = _configuration["ConfigDic:FileFilterKeyword"];
-        //        ret.SetFileFilterKeyword(fileFilterKeyword);
-        //    }
-        //    catch (Exception ex)
-        //    {
-        //        string errorMsg = "文件传输-取报文过滤关键字配置时出错或没有配置数据：" + ex.Message;
-        //        throw new Exception(errorMsg);
-        //    }
-        //    #endregion
-        //    return ret;
-        //}
-
-        //private string GetAbsPath(string sourcePath)
-        //{
-        //    if (sourcePath.Trim().StartsWith("."))
-        //    {
-        //        string childPath = sourcePath.Trim().Replace("/", "\\").Replace(".\\", "");
-        //        string rootPath = System.Environment.CurrentDirectory;
-        //        string ret = Path.Combine(rootPath, childPath);
-        //        return ret;
-        //    }
-        //    else
-        //    {
-        //        return sourcePath;
-        //    }
-        //}
-
         /// <summary>
         /// 刷新报文解析缓存
         /// </summary>