|
|
@@ -145,11 +145,11 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <summary>
|
|
|
/// 销售工单
|
|
|
/// </summary>
|
|
|
- private readonly IRepository<crm_seorder> _crm_seorder;
|
|
|
+ private readonly IRepository<crm_seorder> _mysql_crm_seorder;
|
|
|
/// <summary>
|
|
|
/// 销售工单
|
|
|
/// </summary>
|
|
|
- private readonly IRepository<crm_seorderentry> _crm_seorderentry;
|
|
|
+ private readonly IRepository<crm_seorderentry> _mysql_crm_seorderentry;
|
|
|
#endregion
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -203,8 +203,8 @@ namespace Business.ResourceExamineManagement
|
|
|
_mysql_ic_item = mysql_ic_item;
|
|
|
_mysql_ic_bom = mysql_ic_bom;
|
|
|
_mysql_ic_bom_child = mysql_ic_bom_child;
|
|
|
- _crm_seorder = mysql_crm_seorder;
|
|
|
- _crm_seorderentry = mysql_crm_seorderentry;
|
|
|
+ _mysql_crm_seorder = mysql_crm_seorder;
|
|
|
+ _mysql_crm_seorderentry = mysql_crm_seorderentry;
|
|
|
_mysql_mes_technique = mysql_mes_technique;
|
|
|
_mysql_ic_item_stock = mysql_ic_item_stock;
|
|
|
}
|
|
|
@@ -277,7 +277,9 @@ namespace Business.ResourceExamineManagement
|
|
|
//long bangid = snow.NextId();
|
|
|
|
|
|
//产能检查
|
|
|
- await ProductiveExamine(1733221167209762816, 100);
|
|
|
+ //await ProductiveExamine(1733221167209762816, 100);
|
|
|
+
|
|
|
+ await GenerateMorder(14);
|
|
|
return null;
|
|
|
throw new NotImplementedException();
|
|
|
}
|
|
|
@@ -294,6 +296,8 @@ namespace Business.ResourceExamineManagement
|
|
|
{
|
|
|
await _ic_item_stock.InsertMany(icitemStokc);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
|
@@ -395,7 +399,7 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <param name="BomNumber">Bom编码</param>
|
|
|
/// <param name="Quantity">需要数量</param>
|
|
|
/// <param name="DeliverDate">交付日期</param>
|
|
|
- /// <param name="seorderentry_id">销售订单ID</param>
|
|
|
+ /// <param name="seorderentry_id">销售订单子表ID</param>
|
|
|
/// <returns></returns>
|
|
|
public async Task GenerateMorder(long seorderentry_id)
|
|
|
{
|
|
|
@@ -403,9 +407,9 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
//2.每一个销售订单行对应一个工单。
|
|
|
//查询销售订单子表数据
|
|
|
- var seorderentry = await _crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
|
|
|
+ var seorderentry = _mysql_crm_seorderentry.GetListAsync(x => x.Id == seorderentry_id).Result.FirstOrDefault();
|
|
|
//获取销售订单信息
|
|
|
- var seorder = await _crm_seorder.FindAsync(x => x.Id == seorderentry.seorder_id);
|
|
|
+ var seorder = await _mysql_crm_seorder.FindAsync(x => x.Id == seorderentry.seorder_id);
|
|
|
//物料BOM
|
|
|
var ic_bom = _ic_bom.GetManyByCondition(x => x.bom_number == seorderentry.bom_number && x.tenant_id == seorderentry.tenant_id).Result.FirstOrDefault();
|
|
|
|
|
|
@@ -486,7 +490,7 @@ namespace Business.ResourceExamineManagement
|
|
|
public async Task<bool> CheckFinishedProductInventory(long seorderentry_id)
|
|
|
{
|
|
|
//获取销售订单子表
|
|
|
- var seorderentry = await _crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
|
|
|
+ var seorderentry = await _mysql_crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
|
|
|
if (string.IsNullOrEmpty(seorderentry.bom_number))
|
|
|
{
|
|
|
return false;
|
|
|
@@ -522,7 +526,7 @@ namespace Business.ResourceExamineManagement
|
|
|
}
|
|
|
//获取销售订单信息
|
|
|
//var seorder = await _crm_seorder.FindAsync(x => x.Id == OrderId);
|
|
|
- var seorderentry = await _crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
|
|
|
+ var seorderentry = await _mysql_crm_seorderentry.FindAsync(x => x.Id == seorderentry_id);
|
|
|
//根据Bom编码查询出对应工单并且状态不为完成、关闭，非委外工单。
|
|
|
//TODO:工单类型；
|
|
|
var morderList = await _mes_morder.GetManyByCondition(x => x.bom_number == bomNumber && (x.morder_state != "完成" || x.morder_state != "关闭"
|
