Merge branch 'dev' of http://123.60.180.165:4647/ZZYDOP/DOPCore into dev

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

@@ -42,6 +42,13 @@ namespace Business.ResourceExamineManagement
         /// <returns></returns>
         Task<string> ReceiveResult(string ids, int type,string companyid);
 
+        /// <summary>
+        /// 自动任务执行资源检查
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        Task<string> receiveresultControllerApi(string companyid);
+
         /// <summary>
         /// 自动下达
         /// </summary>

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

@@ -472,7 +472,6 @@ namespace Business.ResourceExamineManagement
             IRepository<ic_substitute, long> mysql_ic_substitute,
             IRepository<ic_substitute_group, long> mysql_ic_substitute_group,
             IRepository<ic_substitute_group_detail, long> mysql_ic_substitute_group_detail,
-            IRepository<ReplenishmentROP, long> replenishmentROP,
             IRepository<DomesticTerminalFcst, long> domesticTerminalFcst,
             ISqlRepository<ASNBOLShipperDetail> ASNBOLShipperDetail,
             IRepository<StandardItemModelSet, long> standardItemModelSet,
@@ -577,6 +576,23 @@ namespace Business.ResourceExamineManagement
         }
         #endregion
 
+        /// <summary>
+        /// 自动任务执行资源检查
+        /// </summary>
+        /// <param name="companyid"></param>
+        /// <returns></returns>
+        public async Task<string> receiveresultControllerApi(string companyid)
+        {
+            var seorders = _mysql_crm_seorder.GetListAsync(s => s.company_id.ToString() == companyid).Result;
+            string ids = string.Join(',', seorders.Select(x => x.Id));
+            var rtn = await ReceiveResult(ids, 0, companyid);
+            if (rtn == "ok")
+            {
+                rtn = await ReviewExamineResult(ids, 0);
+            }
+            return rtn;
+        }
+
         /// <summary>
         /// 资源检查 -- TODO：根据客户的不同标准交货期（假如客户设定10天），如果检查交期小于标准交货期（10天），则默认把建议交期调整为10天。
         /// </summary>
@@ -1004,7 +1020,6 @@ namespace Business.ResourceExamineManagement
             }
         }
 
-
         //PR手动合并
         public async Task<string> PrMerge(string ids)
         {
@@ -2407,7 +2422,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;
 
             /*//先排除锁定期内的工单 //优先级排序
@@ -2788,7 +2803,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 "没有需要下达的工单";
@@ -3976,7 +3994,7 @@ namespace Business.ResourceExamineManagement
             if (nbrMasterList.Any())
             {
                 string seqSql = "";
-                var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.OrderNO)).Result;
+                var weekplan = _replenishmentWeekPlan.GetListAsync(s => s.factory_id.ToString() == domain && workOrdMasters.Select(x => x.WorkOrd).Contains(s.ProductionOrder)).Result;
                 var worklistDto = _serialNumberAppService.GetBillNo(domain, "WOlot", workOrdMasters.Count, userAccount, 1);
                 var rstSeqId = _serialNumberAppService.GetSeqIdList(domain, 1, 1);
                 long seqId = 0;

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.EntityFrameworkCore/EntityFrameworkCore/BusinessDbContextModelCreatingExtensions.cs

@@ -284,12 +284,12 @@ namespace Business.EntityFrameworkCore
                 b.ConfigureByConvention();
             });
 
-            builder.Entity<ReplenishmentROP>(b =>
-            {
-                b.ToTable("ReplenishmentROP");
-                b.HasIndex(b => new { b.number, b.zero_based_seqno, b.long_period, b.short_period, b.tenant_id, b.company_id, b.factory_id });
-                b.ConfigureByConvention();
-            });
+            //builder.Entity<ReplenishmentROP>(b =>
+            //{
+            //    b.ToTable("ReplenishmentROP");
+            //    b.HasIndex(b => new { b.number, b.zero_based_seqno, b.long_period, b.short_period, b.tenant_id, b.company_id, b.factory_id });
+            //    b.ConfigureByConvention();
+            //});
 
             builder.Entity<ReplenishmentROPWeekPlan>(b =>
             {

MicroServices/Business/Business.HttpApi/Controllers/ResourceExamineController.cs

@@ -80,6 +80,18 @@ namespace Business.Controllers
             return _ResourceExamineAppService.ReceiveResult(ids, type, companyid);
         }
 
+        /// <summary>
+        /// 自动任务执行资源检查
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [Route("receiveresultControllerApi")]
+        public Task<string> receiveresultControllerApi(string companyid)
+        {
+            return _ResourceExamineAppService.receiveresultControllerApi(companyid);
+        }
+
         /// <summary>
         /// 自动下达
         /// </summary>

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);
-        }
-    }
-}