改大bug前

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/PrintTable/Dtos/AlreadyPrintDto.cs

@@ -139,6 +139,19 @@ namespace WY.NewJit.PrintTable
         [ImporterHeader(Name = "最后修改人")]
         public Guid? LastModifierId { get; set; }
 
+        /// <summary>
+        /// 规格说明：HSC0DRCC0001
+        /// </summary>
+        [ExporterHeader(DisplayName = "规格说明")]
+        [ImporterHeader(Name = "规格说明")]
+        public virtual string SpecExplain { get; set; }
+
+        /// <summary>
+        /// 颜色说明：车型描述后7位，石墨黑/云杉灰
+        /// </summary>
+        [ExporterHeader(DisplayName = "颜色说明")]
+        [ImporterHeader(Name = "颜色说明")]
+        public virtual string ColorExplain { get; set; }
 
     }
 }

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application.Contracts/WY.NewJit.Application.Contracts.xml

@@ -4265,6 +4265,16 @@
             最后修改人
             </summary>
         </member>
+        <member name="P:WY.NewJit.PrintTable.AlreadyPrintDto.SpecExplain">
+            <summary>
+            规格说明：HSC0DRCC0001
+            </summary>
+        </member>
+        <member name="P:WY.NewJit.PrintTable.AlreadyPrintDto.ColorExplain">
+            <summary>
+            颜色说明：车型描述后7位，石墨黑/云杉灰
+            </summary>
+        </member>
         <member name="P:WY.NewJit.PrintTable.Dtos.QueryWaitPrintDto.BusinessType">
             <summary>
             业务类型：1 门板 2 其它柱护板 3 柱护板

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Application/EdiReceive/ImportRecordAppService.cs

@@ -429,6 +429,8 @@ namespace WY.NewJit.EdiReceive
         /// <param name="forceExecute">校验出错时，是否强制执行</param>
         /// <returns>执行成功返回真</returns>
         [UnitOfWork(IsDisabled =true)]
+        //[UnitOfWork(isTransactional: false)] //[UnitOfWork(false)]
+        //[UnitOfWork]
         [HttpPost]
         [Route("import")]
         [DisableRequestSizeLimit]
@@ -470,7 +472,7 @@ namespace WY.NewJit.EdiReceive
                     return ret;
                 }
 
-                using (var uow = _unitOfWorkManager.Begin())
+                using (var uow = _unitOfWorkManager.Begin(requiresNew:true))
                 {
                     var srcLst = impResult.Data.AsEnumerable().ToList();
                     var tarLst = ObjectMapper.Map<List<ImportRecordDto>, List<ImportRecord>>(srcLst);

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

@@ -155,7 +155,7 @@ namespace WY.NewJit.EdiReceive.Services
         /// </summary>
         /// <param name="impRecLst">导入Excel内容</param>
         /// <param name="forceExecute">校验不通过时，是否强制执行通过</param>
-        public async Task<ObjectResultDto> ParseEdi(List<ImportRecord> input, bool forceExecute = false)
+        public virtual async Task<ObjectResultDto> ParseEdi(List<ImportRecord> input, bool forceExecute = false)
         {
             ObjectResultDto ret = new ObjectResultDto();
 
@@ -256,7 +256,7 @@ namespace WY.NewJit.EdiReceive.Services
                     var succObj1 = await _hqM100DomainServie.InsertM100(m100Obj, true);
 
                     //不匹配时，插入未知总成
-                    var succObj2 = await InsertUnknownAssembly(m100Obj);
+                    var succObj2 = await InsertUnknownAssembly(m100Obj, true);
                     _logger.LogDebug(_errorMessagePrefix + $"未匹配总成，插入未知总成完成：{orderItem.HostSN}");
                     ret.Status = (succObj1 != null && succObj2 != null);
                 }
@@ -287,7 +287,7 @@ namespace WY.NewJit.EdiReceive.Services
         /// <param name="specExplain"></param>
         /// <param name="colorExplain"></param>
         /// <returns></returns>
-        public async Task<ObjectResultDto<bool>> ReParsing(BillM100 m100Obj, string specExplain, string colorExplain)
+        public virtual async Task<ObjectResultDto<bool>> ReParsing(BillM100 m100Obj, string specExplain, string colorExplain)
         {
             ObjectResultDto<bool> ret = new ObjectResultDto<bool>();
             Group_Assembly groupAssemblyObj = HQ_CacheManagerDomainService._groupAssemblyList.FirstOrDefault(itm => itm.SpecExplain == specExplain && itm.ColorExplain == colorExplain);
@@ -514,7 +514,7 @@ namespace WY.NewJit.EdiReceive.Services
         /// 不匹配时，插入未知总成，写提醒日志
         /// </summary>
         /// <param name="bill"></param>
-        private async Task<UnknownAssembly> InsertUnknownAssembly(BillM100 bill)
+        private async Task<UnknownAssembly> InsertUnknownAssembly(BillM100 bill, bool autoSave = false)
         {
             UnknownAssembly ret = null;
             try
@@ -530,7 +530,7 @@ namespace WY.NewJit.EdiReceive.Services
                 //}
                 //var partNumSum = unknownAssemblyObj.UnknownAssemblyParts.Sum(itm => (int)itm.PartNum);
                 //unknownAssemblyObj.SetPartNum(partNumSum);
-                ret = await _unknownAssemblyRepository.InsertAsync(unknownAssemblyObj);
+                ret = await _unknownAssemblyRepository.InsertAsync(unknownAssemblyObj, autoSave);
                 return ret;
             }
             catch (Exception ex)

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Domain/PrintTable/Entitys/AlreadyPrint.cs

@@ -121,6 +121,18 @@ namespace WY.NewJit.PrintTable
             this.Id = id;
         }
 
+        /// <summary>
+        /// 规格说明：HSC0DRCC0001
+        /// </summary>
+        public virtual string SpecExplain { get; set; }
+
+        /// <summary>
+        /// 颜色说明：车型描述后7位，石墨黑/云杉灰
+        /// </summary>
+        public virtual string ColorExplain { get; set; }
+
+
+
     }
 }
 

src/Modules/新版JIT或JIS系统服务端/src/WY.NewJit.Web/appsettings.json

@@ -12,10 +12,10 @@
     //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
 
     "Default": "Server=dev.ccwin-in.com,6208;Database=ABP;User ID=sa;Password=ChangkeTec@2021;",
-    //"NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;",
+    "NewJitPG": "Server=dev.ccwin-in.com,6208;Database=NewJitPG_HQ;uid=sa;pwd=ChangkeTec@2021;",
-    //"WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
+    "WMS": "Server=dev.ccwin-in.com,6208;Database=CPAT_WMS;User ID=sa;Password=ChangkeTec@2021;"
-    "NewJitPG": "Server=192.168.0.68;Database=NewJitPG_HQ;uid=sa;pwd=Microsoft@2022;",
+    //"NewJitPG": "Server=192.168.0.68;Database=NewJitPG_HQ;uid=sa;pwd=Microsoft@2022;",
-    "WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
+    //"WMS": "Server=192.168.0.140;Database=CPAT_WMS_TEST;User ID=sa;Password=Microsoft2008;"
   },
   "AuthServer": {
     "Authority": "http://dev.ccwin-in.com:16077",