From 538ff8932b83039adc68cc152021c2250ecc4119 Mon Sep 17 00:00:00 2001 From: 18923810322 <1666941798@qq.com> Date: Tue, 4 Aug 2026 16:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BB=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 | Bin 279313 -> 279313 bytes .../Services/OutStockTaskService.cs | 13 ++++++++----- .../InStockTaskRepositories.cs | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index ebbc33b0c38da306611947d8309730d7aa566b84..f24215ed30aea6e68621f349f03194ec486b71b2 100644 GIT binary patch delta 3013 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 diff --git a/src/WMS.Web.Domain/Services/OutStockTaskService.cs b/src/WMS.Web.Domain/Services/OutStockTaskService.cs index 152183e0..d6fa54a0 100644 --- a/src/WMS.Web.Domain/Services/OutStockTaskService.cs +++ b/src/WMS.Web.Domain/Services/OutStockTaskService.cs @@ -1,7 +1,12 @@ using AutoMapper; using Microsoft.EntityFrameworkCore.Storage; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; +using Newtonsoft.Json; +using NPOI.HSSF.Record.Chart; using System; using System.Collections.Generic; +using System.ComponentModel.Design; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -22,10 +27,6 @@ using WMS.Web.Domain.IService.Public; using WMS.Web.Domain.Services.Public; using WMS.Web.Domain.Values; using WMS.Web.Domain.Values.Single; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; -using NPOI.HSSF.Record.Chart; namespace WMS.Web.Domain.Services { @@ -669,7 +670,9 @@ namespace WMS.Web.Domain.Services BoxWeight = b.BoxWeight, Qty = b.Qty, position_code = b.SubStockCode, - position = postionList.FirstOrDefault(f=>f.position_code==b.SubStockCode)?.position??"", + position = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, b.SubStockCode+outStock.StockCode + outStock.OrgCode), + //shelfSpace = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, loginInfo.UserInfo.CompanyId, x.order.SubStockCode + x.order.StockCode + x.order.OrgCode), + // position = postionList.FirstOrDefault(f=>f.position_code==b.SubStockCode)?.position??"", SerialNumbers = string.Join(",", b.SerialNumbers), SerialNumberList = b.SerialNumbers, Method = outStock.Method.GetRemark(), diff --git a/src/WMS.Web.Repositories/InStockTaskRepositories.cs b/src/WMS.Web.Repositories/InStockTaskRepositories.cs index 9511f7a7..5ae038f9 100644 --- a/src/WMS.Web.Repositories/InStockTaskRepositories.cs +++ b/src/WMS.Web.Repositories/InStockTaskRepositories.cs @@ -208,8 +208,8 @@ namespace WMS.Web.Repositories ReceiveQty = x.detail.Qty, ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), shelfSpaceCode= x.order.SubStockCode, - - shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode), + shelfSpace = _singleDataService.GetSingleData(SingleAction.SubStocksJoinOrgCode, companyId, x.order.SubStockCode + x.order.StockCode + x.order.OrgCode), + //shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode), Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId), Receiver = "", ReceiveTime = "",