代码提交

MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -383,11 +383,17 @@ namespace Business.ResourceExamineManagement
 
             //产能检查
             //await ProductiveExamine(1353957529328291842, 1000);
-            var id = Save(input.tenantId, input.factoryId);
-            await GenerateMorder(id);
+            //var id = Save(input.tenantId, input.factoryId);
+            await GenerateMorder(1736470478942093312);
             return null;
             throw new NotImplementedException();
         }
+        /// <summary>
+        /// 测试使用新增销售订单数据
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="factoryId"></param>
+        /// <returns></returns>
         public long Save(long tenantId, long factoryId)
         {
             //销售订单
@@ -714,6 +720,7 @@ namespace Business.ResourceExamineManagement
             mes_Morder.planner_num = seorderentry.planner_no;
             mes_Morder.planner_name = seorderentry.planner_name;
             mes_Morder.morder_date = DateTime.Now.Date;
+            //mes_Morder.morder_fstate = "计划";
             //TODO:目前没有取值位置
             mes_Morder.moentry_prd = null;
             mes_Morder.moentry_prdname = null;
@@ -738,12 +745,12 @@ namespace Business.ResourceExamineManagement
             mes_Moentry.need_number = seorderentry.qty;
             mes_Moentry.remaining_number = 0;
             mes_Moentry.factory_id = seorderentry.factory_id;
-            using (TransactionScope scope = new TransactionScope())
-            {
-                await _mes_morder.InsertOne(mes_Morder);
-                await _mes_moentry.InsertOne(mes_Moentry);
-                scope.Complete();
-            }
+            //using (TransactionScope scope = new TransactionScope())
+            // {
+            await _mes_morder.InsertOne(mes_Morder);
+            await _mes_moentry.InsertOne(mes_Moentry);
+            //scope.Complete();
+            //}
         }
         /// <summary>
         /// 将decimal转换成日期格式
@@ -792,7 +799,7 @@ namespace Business.ResourceExamineManagement
         /// <param name="DeliverDate">交付日期</param>
         /// <param name="seorderentry_id">销售订单子表ID</param>
         /// <returns></returns>
-        public async Task<List<mes_morder>> CheckMorder(string bomNumber, decimal? Quantity, DateTime DeliverDate, long seorderentry_id)
+        public async Task<bool> CheckMorder(string bomNumber, decimal? Quantity, DateTime DeliverDate, long seorderentry_id)
         {
             if (string.IsNullOrEmpty(bomNumber) || Quantity != null)
             {
@@ -832,7 +839,8 @@ namespace Business.ResourceExamineManagement
                 if (morderListData.Count == 0)
                 {
                     //TODO：后期处理无在制工单返回内容
-                    throw new NotImplementedException("无可用在制工单!");
+                    //throw new NotImplementedException("无可用在制工单!");
+                    return false;
                 }
                 List<mes_mooccupy> mes_Mooccupies = new List<mes_mooccupy>();
                 decimal? number = Quantity;
@@ -849,7 +857,7 @@ namespace Business.ResourceExamineManagement
                     }
                 }
             }
-            return morderList;
+            return true;
         }
         /// <summary>
         /// 拼接工单占用表
@@ -880,13 +888,15 @@ namespace Business.ResourceExamineManagement
             mes_Mooccupy.moo_mo = item.morder_no;
             //占用量=生产计划数量-入库数量-已被占用数量
             mes_Mooccupy.moo_qty = item.morder_production_number - item.inventory_number - Sumqty;
-            mes_Mooccupy.moo_stime = DateTime.Now;
+            mes_Mooccupy.moo_stime = DateTime.Now.Date;
             mes_Mooccupy.moo_etime = DateTime.Now;//日期来源需确定
             mes_Mooccupy.moo_state = 1;
             mes_Mooccupy.moo_cbr = string.Empty;
             //mes_Mooccupy.moo_ctime = ;
             mes_Mooccupy.moo_creason = string.Empty;
             mes_Mooccupy.tenant_id = seorderentry.tenant_id;//取销售子表企业ID
+            mes_Mooccupy.factory_id = seorderentry.factory_id;
+            mes_Mooccupy.factory_id = seorderentry.factory_id;
             return mes_Mooccupy;
         }
         /// <summary>