| Tiger.Api.sln | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.Api/Controllers/WMS/T100ToWMS/MaterialInfoController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.Api/Tiger.Api.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.Business/WMS/T100ToWMS/MaterialInfoBusiness.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.Business/WMS/Transaction/OutNoBillcode.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.IBusiness/Tiger.IBusiness.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Tiger.IBusiness/WMS/T100ToWMS/IMaterialInfoBusiness.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Tiger.Api.sln
@@ -24,8 +24,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "05-框架方法", "05-框架方法", "{CF29B377-FE5A-488A-AF99-DF9D9C6FCA95}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{481A5C9B-5836-4A2C-80DD-52395F844950}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -66,14 +64,6 @@ {60FA322B-9B03-4380-803C-63B1F240E453}.Release|Any CPU.Build.0 = Release|Any CPU {60FA322B-9B03-4380-803C-63B1F240E453}.Release|x86.ActiveCfg = Release|x86 {60FA322B-9B03-4380-803C-63B1F240E453}.Release|x86.Build.0 = Release|x86 {481A5C9B-5836-4A2C-80DD-52395F844950}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Debug|Any CPU.Build.0 = Debug|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Debug|x86.ActiveCfg = Debug|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Debug|x86.Build.0 = Debug|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Release|Any CPU.ActiveCfg = Release|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Release|Any CPU.Build.0 = Release|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Release|x86.ActiveCfg = Release|Any CPU {481A5C9B-5836-4A2C-80DD-52395F844950}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -83,7 +73,6 @@ {2689560A-10E8-4E28-BCA4-37F697628F77} = {A994D516-643A-4543-B781-540E81F1DE55} {E7540FE4-F284-4F66-A11C-24D846C4B558} = {FF44BF62-08C5-4B52-B24F-54CD79E96848} {60FA322B-9B03-4380-803C-63B1F240E453} = {70881CAB-17ED-4C46-895A-62F2CE39A607} {481A5C9B-5836-4A2C-80DD-52395F844950} = {CF29B377-FE5A-488A-AF99-DF9D9C6FCA95} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {797A1D83-9F3C-4AEC-8A83-E3468102DBD1} Tiger.Api/Controllers/WMS/T100ToWMS/MaterialInfoController.cs
@@ -9,7 +9,6 @@ using Tiger.Model; using Tiger.Model.Entitys.WMS.DTOS; using Tiger.Model.Minsun; using Web.Core.Entities.Response; namespace Tiger.Api.Controllers.WMS.T00ToWMS { @@ -242,15 +241,5 @@ return Ok(response); } /// <summary> /// 获取超期物料 /// </summary> /// <returns></returns> [HttpPost] [Route("[Controller]/[Action]")] public async Task<PageListModel<MaterialInfoDTO>> GetExtendedMaterial(PageInput<NullDTO> input) { return await _materialBus.GetExtendedMaterialAsync(input); } } } Tiger.Api/Tiger.Api.csproj
@@ -74,7 +74,6 @@ <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" /> </ItemGroup> <ItemGroup> Tiger.Business/WMS/T100ToWMS/MaterialInfoBusiness.cs
@@ -15,8 +15,6 @@ using Tiger.Model.DTO; using Tiger.Model.Entitys.MES; using Tiger.Model.Entitys.WMS.DTOS; using Web.Core.Entities.Response; using Web.Core.DataBase; namespace Tiger.Business { @@ -2009,63 +2007,5 @@ return num; } /// <summary> /// 获取超期物料信息 /// </summary> /// <param name="input"></param> /// <returns></returns> /// <exception cref="NotImplementedException"></exception> public async Task<PageListModel<MaterialInfoDTO>> GetExtendedMaterialAsync(PageInput<NullDTO> input) { var DB = Biz.DataSource["WMS57"].Client; #region 获取所有的条码有效期信息 var data = await DB.Queryable<WMS_ITEM, BAS_ITEM>((a, b) => new object[] { JoinType.Left, a.ITEM_CODE == b.ITEM_CODE }).Where((a, b) => b.VALIDITY_DAYS != 0 && a.STATUS <= 40) .OrderByDescending((a, b) => a.CREATE_TIME) .Select((a, b) => new MaterialInfoDTO() { AUTH_ORG = a.AUTH_ORG, SN = a.SN, Item_Code = a.ITEM_CODE, PROD_DATE = a.PROD_DATE, VALIDITY_DAYS = b.VALIDITY_DAYS, DepositDays = b.DepositDays, PostponeDays = a.PostponeDays, CreateTime = a.CREATE_TIME }).ToListAsync(); #endregion 获取所有的条码有效期信息 var msg = new List<MaterialInfoDTO>(); foreach (var item in data) { // 生产日期 + 有效期 + 延期时长 超过了当前日期，就表示已超期 if (item.PROD_DATE?.AddDays(item.VALIDITY_DAYS.ToDouble()).AddDays(item.PostponeDays.ToDouble()) <= DateTime.Now) { var days = (DateTime.Now - item.PROD_DATE?.AddDays(item.VALIDITY_DAYS.ToDouble()).AddDays(item.PostponeDays.ToDouble())).Value.Days;// 计算剩余有效期天数 item.OverdueDays = days; msg.Add(item); } } #region 手动分页 input.PageIndex = input.PageIndex < 1 ? 0 : input.PageIndex - 1; var pagelist = msg.Skip(input.PageIndex * input.PageRows).Take(input.PageRows).ToList();// 获取分页数据 #endregion 手动分页 var model = new PageListModel<MaterialInfoDTO>() { PageList = pagelist, Total = msg.Count() }; return model; } } } Tiger.Business/WMS/Transaction/OutNoBillcode.cs
@@ -10,11 +10,6 @@ using System.Threading.Tasks; using Tiger.Model; using Tiger.IBusiness; using Tiger.Model.Sharetronic.Shelf; using Tiger.Business.WMS.Sharetronic.Shelf; using Org.BouncyCastle.Ocsp; using static Tiger.Business.WMS.Sharetronic.Shelf.Api; using System.Drawing.Drawing2D; namespace Tiger.Business.WMS.Transaction { Tiger.IBusiness/Tiger.IBusiness.csproj
@@ -23,7 +23,6 @@ </ItemGroup> <ItemGroup> <ProjectReference Include="..\Core\Core.csproj" /> <ProjectReference Include="..\Tiger.Model.Net\Tiger.Model.Net.csproj" /> </ItemGroup>
@@ -1,6 +1,5 @@ using Rhea.Common; using Tiger.Model.Entitys.WMS.DTOS; using Web.Core.Entities.Response; namespace Tiger.IBusiness { @@ -115,10 +114,5 @@ /// <returns></returns> int GetOrderStatus(OrderStatusDTO input); /// <summary> /// 获取超期物料 /// </summary> /// <returns></returns> Task<PageListModel<MaterialInfoDTO>> GetExtendedMaterialAsync(PageInput<NullDTO> input); } }
