代码提交。

MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/ISerialNumberAppService.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
-
-namespace Business.ResourceExamineManagement
-{
-    /// <summary>
-    /// 流水号生成
-    /// </summary>
-    public interface ISerialNumberAppService : IApplicationService
-    {
-        /// <summary>
-        /// 生成流水号
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        string GetSerialNumber(long id);
-    }
-}

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

@@ -2423,7 +2423,7 @@ namespace Business.ResourceExamineManagement
                 return "当前任务工厂编号为空，请检查。";
             }
             List<string> tsWork = new List<string> { "test", "tcn", "rw" };
-            var ordlist = _workOrdMaster.Select(x => x.Domain == domain && x.WorkOrd == "M523101200000351" && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && x.Status.ToLower() == "p").ToList();
+            var ordlist = _workOrdMaster.Select(x => x.Domain == domain && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && x.Status.ToLower() == "p").ToList();
             List<mes_morder> Mes_Morders = _mysql_mes_morder.GetListAsync(x => ordlist.Select(c=>c.WorkOrd).Contains(x.morder_no) && x.factory_id.ToString() == domain).Result;
 
             /*//先排除锁定期内的工单 //优先级排序
@@ -2804,7 +2804,10 @@ namespace Business.ResourceExamineManagement
             var periodSd = _periodSequenceDet.Select(s => s.Domain == domain && string.IsNullOrEmpty(s.Status) == true && stime <= s.PlanDate && s.PlanDate <= etime).ToList();
             if (periodSd.Any())
             {
-                List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && periodSd.Select(s => s.WorkOrds).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
+                List<string> tsWork = new List<string> { "试制工单", "TCN工单", "返工工单" };
+                var ordlist = _workOrdMaster.Select(x => x.Domain == domain && periodSd.Select(s => s.WorkOrds).Contains(x.WorkOrd) && (string.IsNullOrEmpty(x.Typed) == true || tsWork.Contains(x.Typed)) && (x.Status.ToLower() == "p" || x.Status.ToLower() == "r")).ToList();
+
+                List<mes_morder> morders = _mysql_mes_morder.GetListAsync(x => domain == x.factory_id.ToString() && ordlist.Select(s => s.WorkOrd).Contains(x.morder_no) && (x.morder_state == MorderEnum.Initial_state || x.morder_state == MorderEnum.Xd_state) && !x.IsDeleted).Result;
                 if (!morders.Any())
                 {
                     return "没有需要下达的工单";

MicroServices/Business/Business.Application/ResourceExamineManagement/SerialNumberAppService.cs

@@ -10,7 +10,7 @@ using Volo.Abp.Application.Services;
 
 namespace Business.ResourceExamineManagement
 {
-    public class SerialNumberAppService : ApplicationService, ISerialNumberAppService
+    public class SerialNumberAppService : ApplicationService
     {
         private readonly BusinessDbContext _businessDbContext;
 

MicroServices/Business/Business.HttpApi/Controllers/SerialNumberController.cs

@@ -1,33 +0,0 @@
-using Business.ResourceExamineManagement;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp;
-using Volo.Abp.AspNetCore.Mvc;
-
-namespace Business.Controllers
-{
-    /// <summary>
-    /// 流水号生成接口
-    /// </summary>
-    [RemoteService]
-    [Area("Business")]
-    [Route("api/business/serialnumber")]
-    public class SerialNumberController : AbpController
-    {
-        private readonly ISerialNumberAppService _SerialNumberAppService;
-
-        public SerialNumberController(ISerialNumberAppService SerialNumberAppService)
-        {
-            _SerialNumberAppService = SerialNumberAppService;
-        }
-
-        /// <summary>
-        /// 自动生成流水号
-        /// </summary>
-        /// <returns></returns>
-        [HttpGet]
-        public string GetSerialNumber(long id)
-        {
-            return _SerialNumberAppService.GetSerialNumber(id);
-        }
-    }
-}