代码提交

MicroServices/Business/Business.Application/ResourceExamineManagement/CalcBomViewAppService.cs

@@ -266,7 +266,7 @@ namespace Business.ResourceExamineManagement
                         var LeadTime = 0.00m;
                         if (plan != null)
                         {
-                            LeadTime = Day + plan.self_inspection_date.Value + plan.Shipping_date.Value + plan.Warehousing_date.Value;
+                            LeadTime = Day + plan.self_inspection_date.Value + plan.Warehousing_date.Value;
                         }
                         else
                         {

MicroServices/Business/Business.Application/ResourceExamineManagement/MorderAppService.cs

@@ -253,7 +253,7 @@ namespace Business.ResourceExamineManagement
 
             //首先满足需求数量工单其次判断是否满足交付日期、当数量不满足时继续查找最早交付日期订单 工单数量累加。
             //当前工单计划日期-1天 小于交付日期 && 计算生产数量-入库数据并且大于需求产品数量。
-            var morderDataList = mo_Mes_Morders.Where(x => x.bom_number == bomNumber && x.moentry_sys_etime.GetValueOrDefault().AddDays(-1) < DeliverDate &&
+            var morderDataList = mo_Mes_Morders.Where(x => x.bom_number == bomNumber && x.morder_type == MorderEnum.JhMorder && x.moentry_sys_etime.GetValueOrDefault().AddDays(-1) < DeliverDate &&
             (x.morder_production_number - x.inventory_number - mes_mooccupyList.Where(p => p.moo_moid.GetValueOrDefault() == x.mysql_id)?.Sum(m => m.moo_qty)) > Quantity)
              .OrderByDescending(x => x.planner_end_date).ToList();
 

MicroServices/Business/Business.Application/ResourceExamineManagement/PurchaseOrderAppService.cs

@@ -21,23 +21,23 @@ namespace Business.ResourceExamineManagement
     public class PurchaseOrderAppService : ApplicationService
     {
         #region 服务
-        /// <summary>
-        /// 采购订单
-        /// </summary>
-        private readonly IMongoDB<mo_srm_po_main> _mo_srm_po_main;
-        /// <summary>
-        /// 采购订单明细详情
-        /// </summary>
-        private readonly IMongoDB<mo_srm_po_list> _mo_srm_po_list;
+        ///// <summary>
+        ///// 采购订单
+        ///// </summary>
+        ////private readonly IMongoDB<mo_srm_po_main> _mo_srm_po_main;
+        ///// <summary>
+        ///// 采购订单明细详情
+        ///// </summary>
+        ////private readonly IMongoDB<mo_srm_po_list> _mo_srm_po_list;
 
-        /// <summary>
-        /// 采购订单占用详情
-        /// </summary>
-        private readonly IMongoDB<mo_srm_po_occupy> _mo_srm_po_occupy;
-        /// <summary>
-        /// 采购申请单
-        /// </summary>
-        private readonly IMongoDB<mo_srm_pr_main> _mo_srm_pr_main;
+        ///// <summary>
+        ///// 采购订单占用详情
+        ///// </summary>
+        ////private readonly IMongoDB<mo_srm_po_occupy> _mo_srm_po_occupy;
+        ///// <summary>
+        ///// 采购申请单
+        ///// </summary>
+        ////private readonly IMongoDB<mo_srm_pr_main> _mo_srm_pr_main;
         /// <summary>
         ///  雪花算法
         /// </summary>
@@ -59,16 +59,16 @@ namespace Business.ResourceExamineManagement
         /// <param name="icitem"></param>
         /// <param name="icbom"></param>
         public PurchaseOrderAppService(
-            IMongoDB<mo_srm_po_main> mo_srm_po_main,
-            IMongoDB<mo_srm_po_list> mo_srm_po_list,
-            IMongoDB<mo_srm_po_occupy> mo_srm_po_occupy,
-            IMongoDB<mo_srm_pr_main> mo_srm_pr_main
+        //    IMongoDB<mo_srm_po_main> mo_srm_po_main,
+        //    IMongoDB<mo_srm_po_list> mo_srm_po_list,
+        //    IMongoDB<mo_srm_po_occupy> mo_srm_po_occupy,
+        //    IMongoDB<mo_srm_pr_main> mo_srm_pr_main
             )
         {
-            _mo_srm_po_main = mo_srm_po_main;
-            _mo_srm_po_list = mo_srm_po_list;
-            _mo_srm_po_occupy = mo_srm_po_occupy;
-            _mo_srm_pr_main = mo_srm_pr_main;
+            //_mo_srm_po_main = mo_srm_po_main;
+            //_mo_srm_po_list = mo_srm_po_list;
+            //_mo_srm_po_occupy = mo_srm_po_occupy;
+            //_mo_srm_pr_main = mo_srm_pr_main;
         }
         #endregion
         /// <summary>
@@ -146,8 +146,8 @@ namespace Business.ResourceExamineManagement
             srm_Po_Occupy.bill_no = seorderentry.seorder_id;
             srm_Po_Occupy.entry_id = seorderentry.entry_seq.GetValueOrDefault();
             srm_Po_Occupy.qty = number;
-            srm_Po_Occupy.type = "";//TODO:类型未知
-            srm_Po_Occupy.stime = DateTime.Now.Date;
+            srm_Po_Occupy.type = MorderEnum.Zyjc_Type;//TODO:类型未知
+            srm_Po_Occupy.stime = srm_po_list.create_time;
             srm_Po_Occupy.etime = srm_po_list.rarrdate;
             srm_Po_Occupy.state = 1;
             srm_Po_Occupy.tenant_id = seorderentry.tenant_id;//取销售子表企业ID