Forráskód Böngészése

资源检查初步调整。

tangdi 3 éve
szülő
commit
e5a535a62a

+ 102 - 0
MicroServices/Business/Business.Application.Contracts/BookManagement/Dto/BomDto.cs

@@ -0,0 +1,102 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Business.BookManagement.Dto
+{
+    /// <summary>
+    /// BomDto
+    /// </summary>
+    public class BomDto
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public long bom_id { get; set; }
+        /// <summary>
+        /// bom单编号
+        /// </summary>
+        public string? bom_number { get; set; }
+        /// <summary>
+        /// 物料id
+        /// </summary>
+        public long icitem_id { get; set; }
+        /// <summary>
+        /// 物料代码
+        /// </summary>
+        public string? item_number { get; set; }
+        /// <summary>
+        /// 物料名称
+        /// </summary>
+        public string? item_name { get; set; }
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public int bom_num { get; set; }
+        /// <summary>
+        /// 使用状态
+        /// </summary>
+        public int fse_status { get; set; }
+        /// <summary>
+        /// 生效日期
+        /// </summary>
+        public DateTime? begin_day { get; set; }
+        /// <summary>
+        /// 失效日期
+        /// </summary>
+        public DateTime? end_day { get; set; }
+        /// <summary>
+        /// 工艺主键
+        /// </summary>
+        public long tech_id { get; set; }
+        /// <summary>
+        /// 工艺名称
+        /// </summary>
+        public string? tech_name { get; set; }
+
+        /// <summary>
+        /// 生产负责人
+        /// </summary>
+        public string? product_principal { get; set; }
+        /// <summary>
+        /// 产品设计员
+        /// </summary>
+        public string? product_designer { get; set; }
+        /// <summary>
+        /// 版本
+        /// </summary>
+        public string? version { get; set; }
+        /// <summary>
+        /// 图表编号
+        /// </summary>
+        public string? chartnumber { get; set; }
+        /// <summary>
+        /// 图片
+        /// </summary>
+        public string? biller { get; set; }
+        /// <summary>
+        /// 检验人
+        /// </summary>
+        public string? checker { get; set; }
+        /// <summary>
+        /// 检验时间
+        /// </summary>
+        public DateTime? check_date { get; set; }
+        /// <summary>
+        /// bom创建人
+        /// </summary>
+        public string? user { get; set; }
+        /// <summary>
+        /// bom创建时间
+        /// </summary>
+        public DateTime? use_date { get; set; }
+        /// <summary>
+        /// 单位
+        /// </summary>
+        public string? unit { get; set; }
+    }
+}

+ 3 - 1
MicroServices/Business/Business.Application.Contracts/ResourceExamineManagement/Dto/PschedDto.cs

@@ -12,7 +12,9 @@ namespace Business.ResourceExamineManagement.Dto
         /// <summary>
         /// 建议交期
         /// </summary>
-        private DateTime suggestdate;
+        public DateTime suggestdate;
+
+
 
     }
 }

+ 1 - 0
MicroServices/Business/Business.Application/Business.Application.csproj

@@ -24,6 +24,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Business.Application.Contracts\Business.Application.Contracts.csproj" />
     <ProjectReference Include="..\Business.Domain\Business.Domain.csproj" />
+    <ProjectReference Include="..\Bussiness.Model\Bussiness.Model.csproj" />
   </ItemGroup>
 
 </Project>

+ 3 - 0
MicroServices/Business/Business.Application/BusinessApplicationAutoMapperProfile.cs

@@ -1,4 +1,6 @@
 using AutoMapper;
+using Business.BookManagement.Dto;
+using Bussiness.Model.MES.IC;
 
 namespace Business
 {
@@ -6,6 +8,7 @@ namespace Business
     {
         public BusinessApplicationAutoMapperProfile()
         {
+            CreateMap<ic_bom, BomDto>();
         }
     }
 }

+ 33 - 3
MicroServices/Business/Business.Application/ResourceExamineManagement/ResourceExamineAppService.cs

@@ -10,14 +10,27 @@ using Business.Models;
 using Microsoft.AspNetCore.Authorization;
 using Business.Permissions;
 using XCZ;
-using Business.ResourceExamineManagement;
 using Business.ResourceExamineManagement.Dto;
+using Bussiness.Model.MES.IC;
+using AutoMapper.Internal.Mappers;
 
-namespace Business.BookManagement
+namespace Business.ResourceExamineManagement
 {
-    [Authorize(BusinessPermissions.Book.Default)]
     public class ResourceExamineAppService : IResourceExamineAppService
     {
+
+        private IRepository<ic_item,long> _ic_item;
+        private IRepository<ic_bom, long> _ic_bom;
+
+        public ResourceExamineAppService(
+            IRepository<ic_item, long> icitem,
+            IRepository<ic_bom, long> icbom
+            )
+        {
+            _ic_item = icitem;
+            _ic_bom = icbom;
+        }
+
         /// <summary>
         /// 资源检查
         /// </summary>
@@ -27,6 +40,23 @@ namespace Business.BookManagement
         public Task<PschedDto> ReceiveResult(SeorderentryDto input)
         {
             throw new NotImplementedException();
+
+        }
+
+
+        /// <summary>
+        /// BOM预处理
+        /// </summary>
+        /// <param name="BomId">Bom主键</param>
+        /// <param name="Quantity">需要数量</param>
+        public async Task BomPretreatmentAsync(long? BomId, int Quantity)
+        {
+            if (BomId == null)
+            {
+                //throw new bu
+            }
+
+            var query = (await _ic_bom.GetQueryableAsync()).WhereIf(true, a => a.bom_id == BomId).ToList();
         }
     }
 }

+ 2 - 1
MicroServices/Business/Bussiness.Model/Base/BaseEntity.cs

@@ -7,10 +7,11 @@ using Volo.Abp.MultiTenancy;
 using Volo.Abp;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel;
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Business.Model
 {
-    public abstract class BaseEntity: ISoftDelete
+    public abstract class BaseEntity: AuditedAggregateRoot<long>, ISoftDelete
     {
         /// <summary>
         /// 创建人