更新版本

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs

@@ -243,6 +243,17 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         _lst.AddRange(_lsAry.ToArray());
                     }
                 }
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+
+                var error = from itm1 in outPutDetail
+                            join itm2 in _lst on
+                            new { itm1.MaterialCode}
+                            equals
+                            new { itm2.MaterialCode}
+                            select itm1;
+                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+                if (errList.Count() == 0)
+                {
                     foreach (var itm in _lst)
                     {
                         itm.BillNum = _billNum;
@@ -262,6 +273,24 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                         job.FileName = _billNum;
                         await _job.UpdateAsync(job);
                     }
+
+                }
+                else
+                {
+                    StringBuilder _buffer = new StringBuilder();
+                    foreach (var itm in errList)
+                    {
+                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
+                    }
+                    var _errinfo = _buffer.ToString();
+
+                    foreach (var job in _joblist)
+                    {
+                        job.FileName = _errinfo;
+                        await _job.UpdateAsync(job);
+                    }
+                }
+
             }
             
             return ApplicationConsts.SuccessStr;

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs

@@ -276,6 +276,17 @@ into temp1
                         _lst.AddRange(_lsAry.ToArray());
                     }
                 }
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+
+                var error = from itm1 in outPutDetail
+                            join itm2 in _lst on
+                            new { itm1.MaterialCode }
+                            equals
+                            new { itm2.MaterialCode }
+                            select itm1;
+                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+                if (errList.Count() == 0)
+                {
                     foreach (var itm in _lst)
                     {
                         itm.BillNum = _billNum;
@@ -285,16 +296,35 @@ into temp1
                     if (_count == 0)
                     {
                         var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
-
                         await _wmsVersionRepository.InsertAsync(_version, true);
 
                     }
-
                     foreach (var job in _joblist)
                     {
                         job.FileName = _billNum;
                         await _job.UpdateAsync(job);
                     }
+                }
+                else
+                {
+                    StringBuilder _buffer = new StringBuilder();
+                    foreach (var itm in errList)
+                    {
+                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
+                    }
+                    var _errinfo = _buffer.ToString();
+
+                    foreach (var job in _joblist)
+                    {
+                        job.FileName = _errinfo;
+                        await _job.UpdateAsync(job);
+                    }
+                }
+
+
+
+
+               
             }
             //return _billNum;
             //else

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs

@@ -227,6 +227,19 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         _lst.AddRange(_lsAry.ToArray());
                     }
                 }
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+
+                var error = from itm1 in outPutDetail
+                            join itm2 in _lst on
+                            new { itm1.MaterialCode }
+                            equals
+                            new { itm2.MaterialCode }
+                            select itm1;
+                var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+
+
+                if (errList.Count() == 0)
+                {
                     foreach (var itm in _lst)
                     {
                         itm.BillNum = _billNum;
@@ -247,6 +260,22 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                         await _job.UpdateAsync(job);
                     }
                 }
+                else
+                {
+                    StringBuilder _buffer = new StringBuilder();
+                    foreach (var itm in errList)
+                    {
+                        _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
+                    }
+                    var _errinfo = _buffer.ToString();
+
+                    foreach (var job in _joblist)
+                    {
+                        job.FileName = _errinfo;
+                        await _job.UpdateAsync(job);
+                    }
+                }
+            }
             //return _billNum;
             //else
             //{