ICM-WCS/wcs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加盘点模式

Browse Source
This commit is contained in:
hehaibing-1996
2024-05-09 09:43:28 +08:00
parent 311a695498
commit cb6090bf0b
43 changed files with 2909 additions and 423 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
WCS.BLL/Services/IService/IGenerateService.cs
View File

@ -13,5 +13,7 @@ namespace WCS.BLL.Services.IService
public Task<ResponseCommon<List<MatInfo>>> generateMatInfo(GenerateMatInfoRequest request);
public Task<string> generateStockTakingNumber();
public Task<string> generateOutOrderNumber();
}
}

19
WCS.BLL/Services/IService/IInOutRecordService.cs Normal file
View File

@ -0,0 +1,19 @@

using WCS.BLL.DbModels;
using WCS.Model;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.InOutRecord;
using WCS.Model.ApiModel.MatInventoryDetail;
using WCS.Model.ApiModel.User;
namespace WCS.BLL.Services.IService
{
public interface IInOutRecordService
{
public Task<PageQueryResponse<InOutRecord>> getInOutRecord(GetInOutRecordRequest request);
public Task<PageQueryResponse<InOutRecord>> exportInOutRecord(GetInOutRecordRequest request);
}
}

2
WCS.BLL/Services/IService/IStockTakingService.cs
View File

@ -18,6 +18,8 @@ namespace WCS.BLL.Services.IService
public Task<PageQueryResponse<StockTakingOrder>> getStockTakingOrders(GetStockTakingOrdersRequest request);
public Task<PageQueryResponse<StockTakingOrder>> getStockTakingOrdersByStatus(GetStockTakingOrdersRequest request);
public Task<ResponseBase> getStockTakingOrderMatDetail(GetStockTakingOrderMatDetailRequest request);
public Task<ResponseBase> startStockTakingOrder(GetStockTakingOrderMatDetailRequest request);

9
WCS.BLL/Services/Service/GenerateService.cs
View File

@ -124,5 +124,14 @@ namespace WCS.BLL.Services.Service
return "PD" + DateTime.Now.ToString("yyMMddHHmmssfff");
}
}
public async Task<string> generateOutOrderNumber()
{
lock (stockTakingFlag)
{
Thread.Sleep(1);
return "CK" + DateTime.Now.ToString("yyMMddHHmmssfff");
}
}
}
}

126
WCS.BLL/Services/Service/InOutRecordService.cs Normal file
View File

@ -0,0 +1,126 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using TouchSocket.Core;
using WCS.BLL.DbModels;
using WCS.BLL.Services.IService;
using WCS.DAL.Db;
using WCS.Model;
using WCS.BLL.DbModels;
using WCS.Model.ApiModel;
using WCS.Model.ApiModel.InOutRecord;
using WCS.Model.ApiModel.MatInventoryDetail;
using WCS.Model.ApiModel.User;
using WCS.DAL.DbModels;
namespace WCS.BLL.Services.Service
{
public class InOutRecordService : IInOutRecordService
{
public async Task<PageQueryResponse<InOutRecord>> getInOutRecord(GetInOutRecordRequest request)
{
try
{
var recordsQueryable = DbHelp.db.Queryable<InOutRecord>()
.LeftJoin<StoreInfo>((id, si) => id.StoreId == si.Id)
.WhereIF(!string.IsNullOrEmpty(request.MatSN), (id, si) => id.MatSN.Contains(request.MatSN))
.WhereIF(!string.IsNullOrEmpty(request.MatCode), (id, si) => id.MatCode.Contains(request.MatCode))
.WhereIF(!string.IsNullOrEmpty(request.MatName), (id, si) => id.MatName.Contains(request.MatName))
.WhereIF(!string.IsNullOrEmpty(request.MatBatch), (id, si) => id.MatBatch.Contains(request.MatBatch))
.WhereIF(!string.IsNullOrEmpty(request.MatSpec), (id, si) => id.MatSpec.Contains(request.MatSpec))
.WhereIF(!string.IsNullOrEmpty(request.MatSupplier), (id, si) => id.MatSpec.Contains(request.MatSupplier))
.WhereIF(!string.IsNullOrEmpty(request.MatCustomer), (id, si) => id.MatSpec.Contains(request.MatCustomer))
.WhereIF(request.StoreId != 0, (id, si) => id.StoreId == request.StoreId)
.WhereIF(!string.IsNullOrEmpty(request.StoreCode), (id, si) => id.StoreCode.Contains(request.StoreCode))
;
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
.Skip((request.PageNumber - 1) * request.PageSize).Take(request.PageSize)
.Select<InOutRecord>()
.ToListAsync();
//生成序号
for (int i = 0; i < records.Count; i++)
{
records[i].RowNumber = (request.PageNumber - 1) * 10 + i + 1;
}
return new PageQueryResponse<InOutRecord>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<InOutRecord>()
{
TotalCount = totalCount,
MaxPage = request.PageSize == 0 ? 0 : (int)Math.Ceiling((decimal)totalCount / request.PageSize),
Count = records.Count,
Lists = records.ToList()
}
};
}
catch (Exception ex)
{
return new PageQueryResponse<InOutRecord>()
{
Code = 300,
Message = $"操作失败:{ex.Message}",
};
}
}
public async Task<PageQueryResponse<InOutRecord>> exportInOutRecord(GetInOutRecordRequest request)
{
try
{
var recordsQueryable = DbHelp.db.Queryable<InOutRecord>()
.LeftJoin<StoreInfo>((id, si) => id.StoreId == si.Id)
.WhereIF(!string.IsNullOrEmpty(request.MatSN), (id, si) => id.MatSN.Contains(request.MatSN))
.WhereIF(!string.IsNullOrEmpty(request.MatCode), (id, si) => id.MatCode.Contains(request.MatCode))
.WhereIF(!string.IsNullOrEmpty(request.MatName), (id, si) => id.MatName.Contains(request.MatName))
.WhereIF(!string.IsNullOrEmpty(request.MatBatch), (id, si) => id.MatBatch.Contains(request.MatBatch))
.WhereIF(!string.IsNullOrEmpty(request.MatSpec), (id, si) => id.MatSpec.Contains(request.MatSpec))
.WhereIF(!string.IsNullOrEmpty(request.MatSupplier), (id, si) => id.MatSpec.Contains(request.MatSupplier))
.WhereIF(!string.IsNullOrEmpty(request.MatCustomer), (id, si) => id.MatSpec.Contains(request.MatCustomer))
.WhereIF(request.StoreId != 0, (id, si) => id.StoreId == request.StoreId)
.WhereIF(!string.IsNullOrEmpty(request.StoreCode), (id, si) => id.StoreCode.Contains(request.StoreCode))
;
var records = await recordsQueryable
.Skip((request.PageNumber - 1) * request.PageSize).Take(request.PageSize)
.Select<InOutRecord>()
.ToListAsync();
//生成序号
var index = 1;
records.ForEach(r =>
{
r.RowNumber = index++;
});
return new PageQueryResponse<InOutRecord>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<InOutRecord>()
{
Lists = records
}
};
}
catch (Exception ex)
{
return new PageQueryResponse<InOutRecord>()
{
Code = 300,
Message = $"操作失败:{ex.Message}",
};
}
}
}
}

10
WCS.BLL/Services/Service/InstoreService.cs
View File

@ -153,7 +153,7 @@ namespace WCS.BLL.Services.Service
}
#region 获取物料数据 //调用接口或者直接查询数据库
//TODO做成配置 调用接口
if (1 == 1)
if (1 != 1)
{
#region 调用Mes接口获取物料信息
try
@ -169,10 +169,10 @@ namespace WCS.BLL.Services.Service
Data = new List<queryByBarResponse>() {new queryByBarResponse()
{
materialBar = request.MatSn,
materialCode = "111222",
materialCode = "100200300",
materialName = "电阻",
materialQty = 1000,
}
}
}
};
//查询到物料信息
@ -341,6 +341,10 @@ namespace WCS.BLL.Services.Service
{
Code = 201,
Message = $"超时未入库！请重新扫码后入库！",
Data = new
{
StoreCode = string.Empty,
}
};
}
}

86
WCS.BLL/Services/Service/OutstoreService.cs
View File

@ -33,12 +33,6 @@ namespace WCS.BLL.Services.Service
Message = "单据同步失败：缺少需要出库的物料类型！"
};
}
//判断是否有单据号 没有单据号系统自动生成一个
if (string.IsNullOrEmpty(request.OrderNumber))
{
request.OrderNumber = GenerateOrderNumber();
}
Console.WriteLine(DateTime.Now);
//保存数据
await DbHelp.db.BeginTranAsync();
try
@ -132,12 +126,6 @@ namespace WCS.BLL.Services.Service
};
}
//判断是否有单据号 没有单据号系统自动生成一个
if (string.IsNullOrEmpty(request.OrderNumber))
{
request.OrderNumber = GenerateOrderNumber();
}
#region 保存数据
//锁库存
@ -205,7 +193,6 @@ namespace WCS.BLL.Services.Service
}
public async Task<ResponseBase> GetOutOrderList(GetOutOrderListRequest request)
{
//直接查询
@ -254,7 +241,7 @@ namespace WCS.BLL.Services.Service
};
}
//直接查询
var recordsQueryable = DbHelp.db.Queryable<OutOrder>();
var recordsQueryable = DbHelp.db.Queryable<OutOrder>().Where(t => request.OrderExeStatus.Contains(t.OutOrderExeStatus));
var totalCount = await recordsQueryable.CountAsync();
var records = await recordsQueryable
@ -396,12 +383,6 @@ namespace WCS.BLL.Services.Service
};
}
private string GenerateOrderNumber()
{
var orderNumber = "PD" + DateTime.Now.ToString("yyyyMMddHHmmss");
return orderNumber;
}
public async Task<ResponseBase> GoInOutstore(GetOutOrderDetailRequest request)
{
try
@ -421,6 +402,7 @@ namespace WCS.BLL.Services.Service
};
}
//如果是按物料编码出库 需要计算物料明细、并进行物料锁定
if (order.SyncType == SyncTypeEnum.ByMatCode)
{
@ -442,10 +424,17 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"出库单据{request.OrderNumber}物料已全部出库！",
Message = $"出库单据{request.OrderNumber}物料已全部完成出库！",
Data = null
};
}
if (request.IsStart)//&& order.OutOrderExeStatus != OutOrderExeStatus.发料完成
{
order.OutOrderExeStatus = OutOrderExeStatus.开始发料;
DbHelp.db.Updateable(order).ExecuteCommand();
}
//按货架分组 按物料找到对应的货架
var shelfIds = outOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
.Distinct()
@ -488,14 +477,13 @@ namespace WCS.BLL.Services.Service
//对应的货架对应位置 进入出库模式 亮灯
shelfs.ForEach(shelf =>
{
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInOutstore(matDetails, order);
shelf.OrderNumber = order.OrderNumber;
});
{
var matDetails = outOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInOutstore(matDetails, order);
shelf.OrderNumber = order.OrderNumber;
});
//返回
return new ResponseCommon()
@ -507,11 +495,11 @@ namespace WCS.BLL.Services.Service
}
catch (Exception ex)
{
await GoInOutstore(request);
await GoOutOutstore(request);
throw ex;
}
}
//计算、加锁
private ResponseBase CaculateOutOrderMatDetails(OutOrder order)
{
try
@ -546,7 +534,7 @@ namespace WCS.BLL.Services.Service
List<OutOrderMatDetail> outOrderMatDetails = new List<OutOrderMatDetail>();
foreach (var outOrderDetail in outOrderDetails)
{
//2.1筛选 满足 图号 批次的库存
//2.1筛选 满足 物料编码、批次的库存
var matInventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => t.MatCode == outOrderDetail.MatCode)
.WhereIF(!string.IsNullOrEmpty(outOrderDetail.MatBatch), t => t.MatBatch == outOrderDetail.MatBatch)
@ -561,8 +549,8 @@ namespace WCS.BLL.Services.Service
{
outOrderMatDetails.Add(new OutOrderMatDetail()
{
OrderId = outOrderDetail.Id,
OrderNumber = outOrderDetail.OrderNumber,
OrderId = order.Id,
OrderNumber = order.OrderNumber,
OutOrderDetailId = outOrderDetail.Id,
InventoryDetailId = matInventoryDetails[i].Id,
StoreId = matInventoryDetails[i].StoreId,
@ -589,8 +577,8 @@ namespace WCS.BLL.Services.Service
outOrderMatDetails.Add(new OutOrderMatDetail()
{
OrderId = outOrderDetail.Id,
OrderNumber = outOrderDetail.OrderNumber,
OrderId = order.Id,
OrderNumber = order.OrderNumber,
OutOrderDetailId = outOrderDetail.Id,
InventoryDetailId = matInventoryDetails[i].Id,
StoreId = matInventoryDetails[i].StoreId,
@ -631,6 +619,7 @@ namespace WCS.BLL.Services.Service
}
}
//解锁
private ResponseBase CancelOutOrderMatDetails(OutOrder order)
{
try
@ -638,7 +627,9 @@ namespace WCS.BLL.Services.Service
DbHelp.db.BeginTran();
var outOrderMatDetails = DbHelp.db.Queryable<OutOrderMatDetail>()
.Where(t => t.OrderId == order.Id)
.Where(t => t.IsSended == false)
.ToList();
var inventoryIds = outOrderMatDetails.Select(t => t.Id).ToList();
var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => inventoryIds.Contains(t.Id))
@ -646,6 +637,7 @@ namespace WCS.BLL.Services.Service
inventoryDetails.ForEach(t => { t.IsLocked = false; });
DbHelp.db.Deleteable(outOrderMatDetails).ExecuteCommand();
DbHelp.db.Updateable(inventoryDetails).ExecuteCommand();
DbHelp.db.CommitTran();
return new ResponseCommon()
{
@ -666,6 +658,7 @@ namespace WCS.BLL.Services.Service
public async Task<ResponseBase> GoOutOutstore(GetOutOrderDetailRequest request)
{
//获取出库单
var order = await DbHelp.db.Queryable<OutOrder>()
.WhereIF(request.OrderId != 0, t => t.Id == request.OrderId)
@ -681,10 +674,28 @@ namespace WCS.BLL.Services.Service
};
}
//执行状态改为暂停
if (request.IsPause && order.OutOrderExeStatus != OutOrderExeStatus.发料完成)
{
order.OutOrderExeStatus = OutOrderExeStatus.暂停发料;
DbHelp.db.Updateable(order).ExecuteCommand();
}
//找到正在出对应出库单的货架
var shelves = ShelfManager.Shelves.Where(t => t.OrderNumber == request.OrderNumber)
.Where(t => t.CurrentMode == HardWare.Mode.出库模式)
.ToList();
if (shelves == null || shelves.Count == 0)
{
return new ResponseCommon()
{
Code = 201,
Message = $"单据【{request.OrderNumber}】不在出库中！",
Data = null
};
}
//退出出库模式
shelves.ForEach(t =>
{
@ -695,12 +706,15 @@ namespace WCS.BLL.Services.Service
if (order.SyncType == SyncTypeEnum.ByMatCode)
CancelOutOrderMatDetails(order);
return new ResponseCommon()
{
Code = 200,
Message = "Success",
Data = null
};
}
}
}

345
WCS.BLL/Services/Service/StockTakingService.cs
View File

@ -10,6 +10,7 @@ using WCS.BLL.Services.IService;
using WCS.DAL.Db;
using WCS.DAL.DbModels;
using WCS.Model;
using WCS.Model.ApiModel.InOutRecord;
using WCS.Model.ApiModel.Stocktaking;
namespace WCS.BLL.Services.Service
@ -114,6 +115,7 @@ namespace WCS.BLL.Services.Service
StoreId = inventoryDetail.StoreId,
StoreCode = inventoryDetail.StoreCode,
InventoryDetailId = inventoryDetail.Id,
MatSN = inventoryDetail.MatSN,
MatCode = inventoryDetail.MatCode,
MatName = inventoryDetail.MatName,
@ -193,6 +195,7 @@ namespace WCS.BLL.Services.Service
StoreId = inventoryDetail.StoreId,
StoreCode = inventoryDetail.StoreCode,
InventoryDetailId = inventoryDetail.Id,
MatSN = inventoryDetail.MatSN,
MatCode = inventoryDetail.MatCode,
MatName = inventoryDetail.MatName,
@ -272,6 +275,7 @@ namespace WCS.BLL.Services.Service
StoreId = inventoryDetail.StoreId,
StoreCode = inventoryDetail.StoreCode,
InventoryDetailId = inventoryDetail.Id,
MatSN = inventoryDetail.MatSN,
MatCode = inventoryDetail.MatCode,
MatName = inventoryDetail.MatName,
@ -313,7 +317,7 @@ namespace WCS.BLL.Services.Service
var recordsQueryable = DbHelp.db.Queryable<StockTakingOrder>()
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderNumber), t => t.StocktakingOrderNumber.Contains(request.StocktakingOrderNumber))
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderSource), t => t.StocktakingOrderSource!=null && t.StocktakingOrderSource.Contains(request.StocktakingOrderSource));
.WhereIF(!string.IsNullOrEmpty(request.StocktakingOrderSource), t => t.StocktakingOrderSource != null && t.StocktakingOrderSource.Contains(request.StocktakingOrderSource));
switch (request.StocktakingOrderStatus)
{
@ -368,6 +372,55 @@ namespace WCS.BLL.Services.Service
}
}
public async Task<PageQueryResponse<StockTakingOrder>> getStockTakingOrdersByStatus(GetStockTakingOrdersRequest request)
{
try
{
var recordsQueryable = DbHelp.db.Queryable<StockTakingOrder>();
switch (request.StocktakingOrderStatus)
{
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.未盘点:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.未盘点);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.部分盘点:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.部分盘点);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.已提交:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.已提交);
break;
case Model.ApiModel.Stocktaking.StocktakingOrderStatus.盘点完成:
recordsQueryable = recordsQueryable.Where(t => t.StocktakingOrderStatus == StocktakingOrderStatus.盘点完成);
break;
default:
break;
}
var records = await recordsQueryable
.OrderByDescending(t => t.CreateTime)
.Take(40)
.ToListAsync();
return new PageQueryResponse<StockTakingOrder>()
{
Code = 200,
Message = $"success",
Data = new PageQueryResponseData<StockTakingOrder>()
{
Lists = records.ToList()
}
};
}
catch (Exception ex)
{
return new PageQueryResponse<StockTakingOrder>()
{
Code = 300,
Message = $"操作失败:{ex.Message}",
};
}
}
public async Task<ResponseBase> getStockTakingOrderMatDetail(GetStockTakingOrderMatDetailRequest request)
{
#region 查询盘点单
@ -380,7 +433,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"查询失败：不存在Id为{request.StockTakingOrderId}的出库单！",
Message = $"查询失败：不存在Id为{request.StockTakingOrderId}的盘点单！",
};
}
}
@ -393,7 +446,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"查询失败：不存在单据号为{request.StockTakingOrderNumber}的出库单！",
Message = $"查询失败：不存在单据号为{request.StockTakingOrderNumber}的盘点单！",
};
}
}
@ -411,7 +464,11 @@ namespace WCS.BLL.Services.Service
var stockTakingOrderMatDetail = await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
.Where(t => t.StocktakingOrderId == order.Id)
.ToListAsync();
//生成序号
for (int i = 0; i < stockTakingOrderMatDetail.Count; i++)
{
stockTakingOrderMatDetail[i].RowNumber = i + 1;
}
return new ResponseCommon<List<StockTakingOrderMatDetail>>()
{
Code = 200,
@ -434,7 +491,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的出库单！",
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的盘点单！",
};
}
}
@ -447,7 +504,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的出库单！",
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的盘点单！",
};
}
}
@ -461,26 +518,62 @@ namespace WCS.BLL.Services.Service
}
#endregion
#region 查询物料明细
#region 查询需要盘点的物料明细
//查询物料明细
var stockTakingOrderMatDetail = await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
var stockTakingOrderMatDetails = await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
.Where(t => t.StocktakingOrderId == order.Id)
//.Where(t => t.IsStocktaking == false)
.Includes(t => t.StoreInfo)
.ToListAsync();
//TO DO 货架按物料进入盘点模式
var shelf = ShelfManager.Shelves.First();
shelf.GoInStocktaking();
shelf.OrderNumber = order.StocktakingOrderNumber;
if (stockTakingOrderMatDetails == null || stockTakingOrderMatDetails.Count == 0)
{
return new ResponseCommon()
{
Code = 201,
Message = $"盘点单据{order.StocktakingOrderNumber}物料已全部盘点！",
Data = null
};
}
#endregion
#region 按货架进入盘点模式
var shelfIds = stockTakingOrderMatDetails.Select(t => t.StoreInfo.ShelfId)
.Distinct()
.ToList();
var shelfs = ShelfManager.Shelves.Where(t => shelfIds.Contains(t.ShelfId)).ToList(); ;
var outherModeShelfs = shelfs.Where(t => t.CurrentMode != HardWare.Mode.待机模式).Select(t => t.ShelfCode).ToList();
if (outherModeShelfs != null && outherModeShelfs.Count > 0)
{
return new ResponseCommon()
{
Code = 201,
Message = $"进入盘点模式失败：货架{string.Join("", outherModeShelfs)}不在待机模式",
Data = null
};
}
//对应的货架对应位置 进入盘点模式 亮灯
shelfs.ForEach(shelf =>
{
var matDetails = stockTakingOrderMatDetails.Where(t => t.StoreInfo.ShelfCode == shelf.ShelfCode)
.Distinct()
.ToList();
shelf.GoInStocktaking(matDetails, order);
shelf.OrderNumber = order.StocktakingOrderNumber;
});
//返回
return new ResponseCommon()
{
Code = 200,
Message = $"success",
Data = shelf.ShelfCode
Message = "Success",
Data = null
};
#endregion
}
catch (Exception ex)
{
await endStockTakingOrder(request);
return new ResponseCommon()
{
Code = 300,
@ -503,7 +596,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的出库单！",
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的盘点单！",
};
}
}
@ -516,7 +609,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的出库单！",
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的盘点单！",
};
}
}
@ -530,7 +623,7 @@ namespace WCS.BLL.Services.Service
}
#endregion
#region 查询当前盘点盘已启动的货架
#region 查询当前盘点单 已启动的货架
var shelfs = ShelfManager.Shelves.Where(t => t.CurrentMode == HardWare.Mode.盘点模式 && t.OrderNumber == order.StocktakingOrderNumber).ToList();
shelfs.ForEach(t =>
{
@ -556,32 +649,43 @@ namespace WCS.BLL.Services.Service
}
public async Task<ResponseBase> queryMatInfoInStocktakingOrder(QueryMatInfoInStocktakingOrderRequest request)
{
//判断是否有这个物料
var storeInfo = await DbHelp.db.Queryable<InventoryDetail>()
.LeftJoin<StoreInfo>((id,si)=>id.StoreId == si.Id)
{
//判断库存中是否有这个物料
var inventoryDetail = await DbHelp.db.Queryable<InventoryDetail>()
.LeftJoin<StoreInfo>((id, si) => id.StoreId == si.Id)
.Where((id, si) => id.MatSN == request.MatSN)
.Select((id, si) => si)
.FirstAsync();
if (storeInfo == null)
if (inventoryDetail == null)
{
return new ResponseCommon()
{
Code = 201,
Message = $"不存在物料[{request.MatSN}]",
Message = $"库存中不存在物料[{request.MatSN}]",
};
}
//判断货架是否进入入库模式
var shelf = ShelfManager.Shelves.Where(t => t.ShelfCode == storeInfo.ShelfCode).FirstOrDefault();
//判断货架是否已进入盘点模式
var shelf = ShelfManager.Shelves
.Where(t => t.ShelfCode == inventoryDetail.ShelfCode)
.FirstOrDefault(); ;
if (shelf == null)
{
return new ResponseCommon()
{
Code = 201,
Message = $"物料[{request.MatSN}不是本次需要盘点的物料！！！]",
Message = $"货架{inventoryDetail.ShelfCode}不存在！",
};
}
//进入入库模式的那个单据是否有对应的单据明细
else if (shelf.CurrentMode != HardWare.Mode.盘点模式)
{
return new ResponseCommon()
{
Code = 201,
Message = $"货架{inventoryDetail.ShelfCode}不在盘点模式！",
};
}
var stockTakingOrder = await DbHelp.db.Queryable<StockTakingOrder>()
.Where(t => t.StocktakingOrderNumber == shelf.OrderNumber)
.FirstAsync();
@ -599,38 +703,89 @@ namespace WCS.BLL.Services.Service
.Where(t => t.MatSN == request.MatSN)
.FirstAsync();
return new ResponseCommon<StockTakingOrderMatDetail>()
{
{
Code = 200,
Message = "success",
Data = stockTakinbgOrder
};
}
public async Task<ResponseBase> confirmStocktakingOrder(ConfirmStocktakingOrderRequest request)
{
//获取盘点物料明细
var stockTakingMatDetail =await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
.Where(t => t.Id == request.Id)
.FirstAsync();
if (stockTakingMatDetail == null)
try
{
//获取盘点物料明细
var stockTakingMatDetail = await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
.Where(t => t.Id == request.Id)
.Includes(t => t.StoreInfo)
.FirstAsync();
if (stockTakingMatDetail == null)
{
return new ResponseCommon()
{
Code = 201,
Message = $"不存在的盘点明细",
};
}
DbHelp.db.BeginTran();
//修改盘点物料明细的数量
stockTakingMatDetail.StocktakingQty = request.Qty;
stockTakingMatDetail.IsStocktaking = true;
DbHelp.db.Updateable(stockTakingMatDetail)
.ExecuteCommand();
#region 发送指令 对应货架对应模组确认盘点
//判断货架是否已进入盘点模式
var shelf = ShelfManager.Shelves
.Where(t => t.ShelfCode == stockTakingMatDetail.StoreInfo.ShelfCode)
.FirstOrDefault(); ;
if (shelf == null)
{
DbHelp.db.RollbackTran();
return new ResponseCommon()
{
Code = 201,
Message = $"货架{stockTakingMatDetail.StoreInfo.ShelfCode}不存在！",
};
}
else if (shelf.CurrentMode != HardWare.Mode.盘点模式)
{
DbHelp.db.RollbackTran();
return new ResponseCommon()
{
Code = 201,
Message = $"货架{stockTakingMatDetail.StoreInfo.ShelfCode}不在盘点模式！",
};
}
if (shelf.OrderNumber != request.StocktakingOrderNumber)
{
return new ResponseCommon()
{
Code = 201,
Message = $"盘点单据{request.StocktakingOrderNumber}不在盘点模式！",
};
}
shelf.ConfirmStocktakingSingle(stockTakingMatDetail.StoreInfo.BoardId, stockTakingMatDetail.StoreInfo.LightNumber);
#endregion
DbHelp.db.CommitTran();
return new ResponseCommon()
{
Code = 200,
Message = $"success",
};
}
catch (Exception ex)
{
DbHelp.db.RollbackTran();
return new ResponseCommon()
{
Code = 201,
Message = $"不存在的盘点明细",
Message = $"确认盘点失败：{ex.Message}",
};
}
//修改盘点吗明细数量
stockTakingMatDetail.StocktakingQty = request.Qty;
stockTakingMatDetail.IsStocktaking = true;
await DbHelp.db.Updateable(stockTakingMatDetail).ExecuteCommandAsync();
return new ResponseCommon()
{
Code = 200,
Message = $"success",
};
}
public async Task<ResponseBase> commitStockTakingOrder(GetStockTakingOrderMatDetailRequest request)
@ -647,7 +802,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的出库单！",
Message = $"操作失败：不存在Id为{request.StockTakingOrderId}的盘点单！",
};
}
}
@ -660,7 +815,7 @@ namespace WCS.BLL.Services.Service
return new ResponseCommon()
{
Code = 201,
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的出库单！",
Message = $"操作失败：不存在单据号为{request.StockTakingOrderNumber}的盘点单！",
};
}
}
@ -675,7 +830,7 @@ namespace WCS.BLL.Services.Service
#endregion
#region 判断单据状态
if (order.StocktakingOrderStatus != StocktakingOrderStatus.已提交)
if (order.StocktakingOrderStatus == StocktakingOrderStatus.已提交)
{
return new ResponseCommon()
{
@ -683,16 +838,102 @@ namespace WCS.BLL.Services.Service
Message = $"单据已提交，请勿重复提交！",
};
}
else if (order.StocktakingOrderStatus != StocktakingOrderStatus.盘点完成)
//else if (order.StocktakingOrderStatus != StocktakingOrderStatus.盘点完成)
//{
// return new ResponseCommon()
// {
// Code = 201,
// Message = $"单据未盘点完成！！！",
// };
//}
#endregion
#region 查询盘点明细
var stockTakingOrderMatDetails = await DbHelp.db.Queryable<StockTakingOrderMatDetail>()
.Where(t => t.StocktakingOrderId == order.Id && t.IsStocktaking)
.ToListAsync();
if (stockTakingOrderMatDetails == null || stockTakingOrderMatDetails.Count == 0)
{
return new ResponseCommon()
{
Code = 201,
Message = $"单据未盘点完成！！！",
Message = $"不存在已盘点的物料！",
};
}
#endregion
#region 提交盘点 修改数量 生成记录
try
{
DbHelp.db.BeginTran();
var inventoryDetailIds = stockTakingOrderMatDetails.Select(t => t.InventoryDetailId)
.ToList();
//查询对应的库存数据
var inventoryDetails = DbHelp.db.Queryable<InventoryDetail>()
.Where(t => inventoryDetailIds.Contains(t.Id))
.ToList();
inventoryDetails.ForEach(inventoryDetail =>
{
//对应的盘点明细
var stockTakingOrderMatDetail = stockTakingOrderMatDetails.Where(t => t.InventoryDetailId == inventoryDetail.Id).FirstOrDefault();
if (stockTakingOrderMatDetail == null)
{
//这个分支应该是不用管的哦
}
else
{
//比对数量变化
var changedQty = stockTakingOrderMatDetail.StocktakingQty - inventoryDetail.MatQty;
if (changedQty != 0)
{
//库存表修改数量
inventoryDetail.MatQty = stockTakingOrderMatDetail.StocktakingQty;
//出入库记录表生成记录
var inOutRecord = new InOutRecord()
{
StoreCode = inventoryDetail.StoreCode,
StoreId = inventoryDetail.StoreId,
MatSN = inventoryDetail.MatSN,
MatCode = inventoryDetail.MatCode,
MatName = inventoryDetail.MatName,
MatBatch = inventoryDetail.MatBatch,
MatQty = changedQty,
MatSpec = inventoryDetail.MatSpec,
MatCustomer = inventoryDetail.MatCustomer,
MatSupplier = inventoryDetail.MatSupplier,
Direction = DirectionEnum.盘点,
OperateUser = request.UserName
};
DbHelp.db.Updateable(inventoryDetail).ExecuteCommand();
DbHelp.db.Insertable(inOutRecord).ExecuteCommand();
}
//数量相等的情况 暂时不用管 不动库存数据也不生成记录
else
{
}
}
});
order.StocktakingOrderStatus = StocktakingOrderStatus.已提交;
DbHelp.db.Updateable(order).ExecuteCommand();
DbHelp.db.CommitTran();
}
catch (Exception ex)
{
DbHelp.db.RollbackTran();
return new ResponseCommon()
{
Code = 300,
Message = $"操作失败，{ex.Message}",
};
}
#endregion
//To do 进行提交！
return new ResponseCommon()
{
@ -709,5 +950,7 @@ namespace WCS.BLL.Services.Service
};
}
}
}
}