修改了仓位

This commit is contained in:
2026-08-04 16:09:43 +08:00
parent 09e57a4aca
commit 538ff8932b
3 changed files with 10 additions and 7 deletions

View File

@@ -1,7 +1,12 @@
using AutoMapper; using AutoMapper;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
using NPOI.HSSF.Record.Chart;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel.Design;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@@ -22,10 +27,6 @@ using WMS.Web.Domain.IService.Public;
using WMS.Web.Domain.Services.Public; using WMS.Web.Domain.Services.Public;
using WMS.Web.Domain.Values; using WMS.Web.Domain.Values;
using WMS.Web.Domain.Values.Single; 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 namespace WMS.Web.Domain.Services
{ {
@@ -669,7 +670,9 @@ namespace WMS.Web.Domain.Services
BoxWeight = b.BoxWeight, BoxWeight = b.BoxWeight,
Qty = b.Qty, Qty = b.Qty,
position_code = b.SubStockCode, 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), SerialNumbers = string.Join(",", b.SerialNumbers),
SerialNumberList = b.SerialNumbers, SerialNumberList = b.SerialNumbers,
Method = outStock.Method.GetRemark(), Method = outStock.Method.GetRemark(),

View File

@@ -208,8 +208,8 @@ namespace WMS.Web.Repositories
ReceiveQty = x.detail.Qty, ReceiveQty = x.detail.Qty,
ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"), ShelfTime = x.order.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
shelfSpaceCode= x.order.SubStockCode, shelfSpaceCode= 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), //shelfSpace = _boxRepositories.Getuc_warehouse_position(postionList, x.order.SubStockCode),
Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId), Shelfer = _singleDataService.GetSingleData(SingleAction.Staffs, companyId, x.order.CreatorId),
Receiver = "", Receiver = "",
ReceiveTime = "", ReceiveTime = "",