|
|
@@ -77,11 +77,11 @@ namespace Business.ResourceExamineManagement
|
|
|
/// 物料BOM明细
|
|
|
/// </summary>
|
|
|
private readonly IMongoDB<ic_bom_child> _ic_bom_child;
|
|
|
+ private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
|
|
|
/// <summary>
|
|
|
/// 生产工单主表
|
|
|
/// </summary>
|
|
|
private readonly IMongoDB<mes_morder> _mes_morder;
|
|
|
- private IRepository<ic_bom_child, long> _mysql_ic_bom_child;
|
|
|
|
|
|
#endregion
|
|
|
|
|
|
@@ -160,16 +160,28 @@ namespace Business.ResourceExamineManagement
|
|
|
/// <param name="bomNumber">Bom编码</param>
|
|
|
/// <param name="Quantity">需要数量</param>
|
|
|
/// <returns></returns>
|
|
|
- public async Task CheckMorder(string bomNumber, int Quantity)
|
|
|
+ public async Task CheckMorder(string bomNumber, decimal? Quantity, DateTime EndDate)
|
|
|
{
|
|
|
if (string.IsNullOrEmpty(bomNumber) || Quantity < 0)
|
|
|
{
|
|
|
//TODO:入参异常;
|
|
|
//throw new NotImplementedException();
|
|
|
}
|
|
|
- //var morderList = _mes_morder.(a => a.Id == ObjectId.Parse(id)).ToList().FirstOrDefault();
|
|
|
+ var morderList = _mes_morder.GetAll();
|
|
|
+ var morderTypeList = morderList.Where(x => x.work_order_type == "备库工单" && x.morder_type == "计划工单" && x.bom_number == bomNumber && (x.morder_state == "初始" || x.morder_state == "下达")).ToList();
|
|
|
+
|
|
|
//查询生产工单类型为计划工单并且工单类型为备库工单 并且BOM编码一致数据
|
|
|
// 订单状态为 初始或下达工单
|
|
|
+ var SatisfyQuantityList = morderTypeList.Where(x => x.morder_production_number >= Quantity).
|
|
|
+ ToList().OrderBy(x => x.moentry_sys_etime).FirstOrDefault();
|
|
|
+ if (SatisfyQuantityList == null)
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+
|
|
|
+ }
|
|
|
// List =>数量满足Quantity && 生成工单结束日期最早
|
|
|
}
|
|
|
|
|
|
@@ -209,7 +221,7 @@ namespace Business.ResourceExamineManagement
|
|
|
|
|
|
var bom = bomlist.WhereIf(true, s => s.Id == dto.bom_id).FirstOrDefault();
|
|
|
var item = icitemlist.WhereIf(true, a => a.Id == bom.icitem_id).FirstOrDefault();
|
|
|
- if (bom == null || item==null)
|
|
|
+ if (bom == null || item == null)
|
|
|
{
|
|
|
|
|
|
}
|