更新版本

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

@@ -280,7 +280,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     _lst.AddRange(_list.ToArray());
                 }
           
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync();
 
                 var error = from itm1 in outPutDetail
                             join itm2 in _lst on
@@ -516,7 +516,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
 
 
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+            var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State != 4 ).ToListAsync();
 
 
             var error = from itm1 in outPutDetail

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

@@ -141,7 +141,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
 
 
             var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+            var outPutDetail = await _wmsRepository.Where(p => p.Version == version  && p.State!=4).ToListAsync();
 
 
             var error = from itm1 in outPutDetail
@@ -415,7 +415,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     _lst.AddRange(_lsCopy.ToArray());
                 }
                 var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State != 4 ).ToListAsync();
 
                 var error = from itm1 in outPutDetail
                             join itm2 in _ls1 on

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

@@ -320,7 +320,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                     _lst.AddRange(_list.ToArray());
                 }
               //  var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync();
 
                 var error = from itm1 in outPutDetail
                             join itm2 in _lst on
@@ -399,11 +399,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 List<WmsKanbanOutPutDetial> _ls = new List<WmsKanbanOutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version ==input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p =>  p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p =>  p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 if (_ls.Count() > 0)
                 {
@@ -457,6 +457,78 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
             }
             return true;
         }
+
+        /// <summary>
+        ///出库界面功能， 撤销核准出库
+        /// </summary>
+        /// <param name="ids"></param>
+        /// <param name="version"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("Regenerate")]
+        public async Task<bool> WmsKanbanOutPutRegenerate(WmsJitRequestDto input)
+        {
+            if (input.Guids != null && input.Guids.Count() > 0)
+            {
+                List<string> _ls = new List<string>();
+
+                var _lst = _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.State == 4);
+
+
+                List<WmsKanbanOutPutDetial> _detail = new List<WmsKanbanOutPutDetial>();
+                foreach (var itm in _lst.ToList())
+                {
+                    
+                    
+                }
+
+
+
+
+                await _wmsRepository.BatchDeleteAsync();
+
+
+
+
+                //foreach (var itm in input.Guids)
+                //{
+                //    _ls.Add(string.Format("{0}", itm));
+                //}
+
+                //string str = string.Join(",", _ls.ToArray());
+
+                //var sql = "DECLARE	@return_value int\n" +
+                //          "EXEC	@return_value = [dbo].[p_wms_output_cancel]\n" +
+                //          "     @Guids ='{0}', \n" +
+                //          "		@billnum = N'{1}',\n" +
+                //          "		@type = 1,\n" +
+                //          "     @accountdate = N'{2}'\n" +
+                //          "SELECT	'Return Value' = @return_value";
+
+                //sql = string.Format(sql, str, input.BillNum, input.AccountDate.ToShortDateString());
+
+                //await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+                //   sql
+                // );
+
+            }
+            return true;
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         /// <summary>
         /// 出库界面功能删除
         /// </summary>

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

@@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
         public async Task<bool> WmsSharePartUpdate(WmsWithOutKanbanOutPutDetial detial)
         {
-            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId).ToList();
+            var _entityList = _wmsRepository.Where(p => p.Id == detial.BranchId && p.State != 4 ).ToList();
             if (_entityList.Count() > 0)
             {
                 foreach (var itm in _entityList)
@@ -246,7 +246,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
         public async Task<string> WmsKanbanOutPut(WmsJitRequestDto input)
         {
 
-            var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version);
+            var _count1 = _wmsVersionRepository.Count(p => p.Version == input.Version );
             if (_count1 > 0)
             {
                 var checkList = new List<ErrorExportDto>();

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

@@ -283,7 +283,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                     }
                 }
 
-                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+                var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.State!=4).ToListAsync();
 
                 var error = from itm1 in outPutDetail
                             join itm2 in _lst on
@@ -379,11 +379,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 List<WmsSharePart90OutPutDetial> _ls = new List<WmsSharePart90OutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
                 }
                 if (_ls.Count() > 0)
                 {

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

@@ -519,11 +519,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
                 List<WmsSharePartOutPutDetial> _ls = new List<WmsSharePartOutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 if (_ls.Count() > 0)
                 {

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

@@ -319,11 +319,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 List<WmsHQCarOutPutDetial> _ls = new List<WmsHQCarOutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 if (_ls.Count() > 0)
                 {
@@ -482,7 +482,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
 
 
 
-            var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+            var outPutDetail = await _wmsRepository.Where(p => p.Version == version && p.State!=4).ToListAsync();
 
             var error = from itm1 in outPutDetail
                         join itm2 in _lst on

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

@@ -356,11 +356,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 List<WmsHQWithOutKanbanOutPutDetial> _ls = new List<WmsHQWithOutKanbanOutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2  && p.State!=4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 &&  p.State!=4).ToListAsync();
                 }
                 //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
                 //var checkList = new List<ErrorExportDto>();

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

@@ -288,11 +288,11 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
                 List<WmsOneTimeSaleOutPutDetial> _ls = new List<WmsOneTimeSaleOutPutDetial>();
                 if (input.Guids.Count() > 0)
                 {
-                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State!=4).ToListAsync();
                 }
                 else
                 {
-                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+                    _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2 && p.State != 4).ToListAsync();
                 }
                 //_ls = _ls.Where(p => p.SockQty < p.OutputQty || p.Qty < p.OutputQty).ToList();
                 //var checkList = new List<ErrorExportDto>();