|
|
@@ -243,7 +243,7 @@ namespace Business.ResourceExamineManagement
|
|
|
public async Task<PschedDto> ReceiveResult(SeorderentryDto input)
|
|
|
{
|
|
|
//数据库快照-同步mysql库数据到mongoDB中
|
|
|
- await SyncData();
|
|
|
+ await SyncData(769202);
|
|
|
//生成当前计算bangid
|
|
|
//SnowFlake snow = new SnowFlake();
|
|
|
//long bangid = snow.NextId();
|
|
|
@@ -258,10 +258,10 @@ namespace Business.ResourceExamineManagement
|
|
|
/// 数据库快照
|
|
|
/// </summary>
|
|
|
/// <returns></returns>
|
|
|
- public async Task SyncData()
|
|
|
+ public async Task SyncData(long factoryId)
|
|
|
{
|
|
|
//同步物料库存数据
|
|
|
- var icitemStokc = _mysql_ic_item_stock.GetQueryableAsync().Result.ToListAsync().Result;
|
|
|
+ var icitemStokc = _mysql_ic_item_stock.WithDetailsAsync( p => p.factory_id == factoryId).Result.ToListAsync().Result;
|
|
|
if (icitemStokc.Count > 0)
|
|
|
{
|
|
|
await _ic_item_stock.InsertMany(icitemStokc);
|
|
|
@@ -784,7 +784,9 @@ namespace Business.ResourceExamineManagement
|
|
|
returnlist = returnlist.OrderBy(s => s.num).ToList();
|
|
|
//取物料库存记录
|
|
|
FilterDefinition<ic_item_stock> filter = Builders<ic_item_stock>.Filter.In(s => s.icitem_id, returnlist.Select(c => c.item_id).ToList());
|
|
|
- var stocklist = _ic_item_stock.GetManyByIds(filter).Result;
|
|
|
+ var stockListAll = _ic_item_stock.GetManyByIds(filter).Result;
|
|
|
+ //获取当前工厂下物料库存数据
|
|
|
+ var stocklist = stockListAll.Where(p=>p.factory_id == factoryid).ToList();
|
|
|
//取当前订单的物料库存占用记录
|
|
|
var occupylist = _ic_item_stockoccupy.GetManyByCondition(p => p.bang_id == bangid && p.order_id == orderid).Result;
|
|
|
//计算剩余库存
|