1

647556386

2026-03-30 5189c42ee1b15ba8c54fd258102b4c7262a2e6c7

1

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/InboundService.cs

@@ -152,7 +152,7 @@

                if(inboundOrder.BusinessType != "11")
                {
                    var warehouseType = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => x.Barcode == palletDto.Barcode || x.OutBoxbarcodes == palletDto.Barcode).Select(x => x.WarehouseCode).First();
                    var warehouseType = _inboundOrderDetailRepository.Db.Queryable<Dt_InboundOrderDetail>().Where(x => (x.Barcode == palletDto.Barcode || x.OutBoxbarcodes == palletDto.Barcode)&& x.OrderDetailStatus == OrderDetailStatusEnum.New.ObjToInt()).Select(x => x.WarehouseCode).First();

                    if (string.IsNullOrEmpty(warehouseType))
                    {

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_OutboundService/OutboundService.cs

@@ -1376,9 +1376,18 @@

                        Func<Dt_OutStockLockInfo, bool> wareWhere = x => string.IsNullOrEmpty(outboundOrderDetails.First().WarehouseCode) ? true : x.WarehouseCode == outboundOrderDetails.First().WarehouseCode;

                        List<Dt_OutStockLockInfo> stockLockInfos = _outboundLockInfoRepository.QueryData(x =>
                                x.OrderNo == request.OrderNo &&
                                x.MaterielCode == stockInfoDetail.MaterielCode).Where(supWhere).Where(wareWhere).ToList();
                        var idStr = outboundOrderDetails.First().Id.ToString();

                        var stockLockInfos = _outboundLockInfoRepository.QueryData(x =>
                            (x.OrderDetailIds == idStr ||
                             x.OrderDetailIds.StartsWith(idStr + ",") ||
                             x.OrderDetailIds.EndsWith("," + idStr) ||
                             x.OrderDetailIds.Contains("," + idStr + ",")) &&
                            x.OrderNo == request.OrderNo &&
                            x.MaterielCode == stockInfoDetail.MaterielCode)
                            .Where(supWhere)
                            .Where(wareWhere)
                            .ToList();
                        if (stockLockInfos != null && stockLockInfos.Any())
                        {
                            _outboundLockInfoRepository.DeleteAndMoveIntoHty(stockLockInfos, WIDESEA_Core.Enums.OperateTypeEnum.鑷姩鍒犻櫎);
@@ -1804,9 +1813,18 @@

                        Func<Dt_OutStockLockInfo, bool> wareWhere = x => string.IsNullOrEmpty(outboundOrderDetails.First().WarehouseCode) ? true : x.WarehouseCode == outboundOrderDetails.First().WarehouseCode;

                        List<Dt_OutStockLockInfo> stockLockInfos = _outboundLockInfoRepository.QueryData(x =>
                                x.OrderNo == request.OrderNo &&
                                x.MaterielCode == stockDetail.MaterielCode).Where(supWhere).Where(wareWhere).ToList();
                        var idStr = outboundOrderDetails.First().Id.ToString();

                        var stockLockInfos = _outboundLockInfoRepository.QueryData(x =>
                            (x.OrderDetailIds == idStr ||
                             x.OrderDetailIds.StartsWith(idStr + ",") ||
                             x.OrderDetailIds.EndsWith("," + idStr) ||
                             x.OrderDetailIds.Contains("," + idStr + ",")) &&
                            x.OrderNo == request.OrderNo &&
                            x.MaterielCode == stockDetail.MaterielCode)
                            .Where(supWhere)
                            .Where(wareWhere)
                            .ToList();
                        if (stockLockInfos != null && stockLockInfos.Any())
                        {
                            _outboundLockInfoRepository.DeleteAndMoveIntoHty(stockLockInfos, WIDESEA_Core.Enums.OperateTypeEnum.鑷姩鍒犻櫎);

 项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskService.cs

@@ -308,7 +308,7 @@
                }
            }
            stockInfo.LocationCode = task.TargetAddress;
            stockInfo.StockStatus = StockStatusEmun.鍏ュ簱纭.ObjToInt();
            stockInfo.StockStatus = StockStatusEmun.鍏ュ簱瀹屾垚.ObjToInt();
            stockInfo.Details.ForEach(x =>
            {
                x.Status = StockStatusEmun.鍏ュ簱纭.ObjToInt();
@@ -391,7 +391,7 @@
                            allocatefeedmodel.Details = groupedData;

                            var response = responseModel(inboundOrder, 3, null, allocatefeedmodel);
                            if (response != null && response.IsSuccess)
                            if (response != null && response.IsSuccess && response.Data.Code =="200")
                            {
                                var detailStatusList = _inboundOrderDetailService.Db.Queryable<Dt_InboundOrderDetail>()
                                .Where(it => it.OrderId == inboundOrder.Id)
@@ -496,7 +496,7 @@

                            var response= responseModel(inboundOrder,2, feedmodel);

                            if (response != null && response.IsSuccess)
                            if (response != null && response.IsSuccess && response.Data.Code == "200")
                            {
                                var detailStatusList = _inboundOrderDetailService.Db.Queryable<Dt_InboundOrderDetail>()
                                .Where(it => it.OrderId == inboundOrder.Id)
@@ -2234,7 +2234,7 @@
        /// <summary>
        /// 鐩樼偣鍑哄簱瀹屾垚
        /// </summary>
        public WebResponseContent OutInventoryTaskCompleted(Dt_Task task)
        public async Task<WebResponseContent> OutInventoryTaskCompleted(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -2285,7 +2285,7 @@
            catch (Exception ex)
            {
                _unitOfWorkManage.RollbackTran();
                content.Error(ex.Message);
                return await Task.FromResult(WebResponseContent.Instance.Error(ex.Message));
            }
            return content;
        }