diff --git a/Tnb.Server.sln b/Tnb.Server.sln index 7d6c0e17..f7d31d69 100644 --- a/Tnb.Server.sln +++ b/Tnb.Server.sln @@ -94,6 +94,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "12-ProductionMgr", "12-ProductionMgr", "{ABE58B5E-610B-4159-BFF0-8B04BF700B3C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "13-WarehouseMgr", "13-WarehouseMgr", "{D90E2789-189A-4F05-B081-27F2FABB2E7E}" + ProjectSection(SolutionItems) = preProject + WmsSignForDeliveryService.txt = WmsSignForDeliveryService.txt + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "14-QcMgr", "14-QcMgr", "{D65B00D5-F40C-4FF2-8F8D-870772FAAA56}" EndProject @@ -131,11 +134,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.ProductionMgr.Entities" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "16-PerMgr", "16-PerMgr", "{74AB6486-1090-4CC9-9D1A-F1245E3ECFC3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tnb.PerMgr", "PerMgr\Tnb.PerMgr\Tnb.PerMgr.csproj", "{D41946CF-09C6-4CA4-A1F4-42E7E1538BF7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.PerMgr", "PerMgr\Tnb.PerMgr\Tnb.PerMgr.csproj", "{D41946CF-09C6-4CA4-A1F4-42E7E1538BF7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tnb.PerMgr.Entities", "PerMgr\Tnb.PerMgr.Entities\Tnb.PerMgr.Entities.csproj", "{42AD083D-D199-4B09-ADD8-89251011C959}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.PerMgr.Entities", "PerMgr\Tnb.PerMgr.Entities\Tnb.PerMgr.Entities.csproj", "{42AD083D-D199-4B09-ADD8-89251011C959}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tnb.PerMgr.Interfaces", "PerMgr\Tnb.PerMgr.Interfaces\Tnb.PerMgr.Interfaces.csproj", "{F3656494-27D3-4BD7-B831-8D909DFBD7B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tnb.PerMgr.Interfaces", "PerMgr\Tnb.PerMgr.Interfaces\Tnb.PerMgr.Interfaces.csproj", "{F3656494-27D3-4BD7-B831-8D909DFBD7B9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs new file mode 100644 index 00000000..de7ea36b --- /dev/null +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmsSignForDeliveryService.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using JNPF.Common.Enums; +using JNPF.FriendlyException; +using Microsoft.AspNetCore.Mvc; +using Microsoft.CodeAnalysis.Operations; +using SqlSugar; +using Tnb.WarehouseMgr.Entities; +using Tnb.WarehouseMgr.Entities.Consts; + +namespace Tnb.WarehouseMgr +{ + /// + /// 出库签收 + /// + public class WmsSignForDeliveryService : BaseWareHouseService + { + private readonly ISqlSugarClient _db; + + public WmsSignForDeliveryService(ISqlSugarRepository repository) + { + _db = repository.AsSugarClient(); + } + /// + /// 根据载具ID获取,对应的执行任务记录 + /// + /// + /// + [HttpGet] + public async Task GetDisTasksByCarryId([FromRoute] string carryId) + { + var items = await _db.Queryable().Where(it => it.carry_id == carryId && it.status == WmsWareHouseConst.BILLSTATUS_COMPLETE_ID && it.is_sign == 0).ToArrayAsync(); + return items; + } + [HttpPost] + public async Task SaveData() + { + + } + } +} diff --git a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs index d7ad3862..c0f47e8d 100644 --- a/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs +++ b/WarehouseMgr/Tnb.WarehouseMgr/WmskittingOutService.cs @@ -131,9 +131,9 @@ namespace Tnb.WarehouseMgr var locs = await _db.Queryable().Where(it => it.id == koGrp.Key && it.is_use == "0" && it.is_lock == 0).ToListAsync(); if (locs?.Count > 0) { + var arr = koGrp.ToArray(); - Index start = ^arr.Length; - var ko = arr[start]; + var ko = arr[^arr.Length]; var carry = await _db.Queryable().SingleAsync(it => it.id == ko.carry_id); if (carry != null) { diff --git a/WmsSignForDeliveryService.txt b/WmsSignForDeliveryService.txt new file mode 100644 index 00000000..e69de29b