Merge branch 'dev' of https://git.tuotong-tech.com/tnb/tnb.server into dev

BasicData/Tnb.BasicData.Entities/Consts/CodeTemplateConst.cs

@@ -0,0 +1,23 @@
+namespace Tnb.BasicData
+{
+    /// <summary>
+    /// 单据模板业务编码
+    /// </summary>
+    public class CodeTemplateConst
+    {
+        /// <summary>
+        /// 物料签收编码
+        /// </summary>
+        public const string MATERIAL_RECEIPT_CODE = "MaterialReceipt";
+        
+        /// <summary>
+        /// 生产投料编码
+        /// </summary>
+        public const string FEEDING_CODE = "Feeding";
+
+        /// <summary>
+        /// 生产任务单号单据模板编码
+        /// </summary>
+        public const string PRDMOTASK_CODE = "ProductionPlanAndSchedule";
+    }
+}

BasicData/Tnb.BasicData.Entities/Entity/BasLocation.cs

@@ -44,7 +44,7 @@ public partial class BasLocation : BaseEntity<string>
     /// 是否使用
     /// </summary>
     //[SugarColumn(ColumnDataType = "varchar(32)", SqlParameterDbType = typeof(CommonPropertyConvert))]
-    public int is_use { get; set; }
+    public int is_use { get; set; } 
 
     /// <summary>
     /// 是否最小

BasicData/Tnb.BasicData.Interfaces/IBasDefectService.cs

@@ -0,0 +1,15 @@
+namespace Tnb.BasicData.Interfaces
+{
+    /// <summary>
+    /// 次品项服务
+    /// </summary>
+    public interface IBasDefectService
+    {
+        /// <summary>
+        /// 根据工序id获取次品项列表
+        /// </summary>
+        /// <param name="dic"></param>
+        /// <returns></returns>
+        public Task<dynamic> GetDefectListByProcessId(Dictionary<string, string> dic);
+    }
+}

BasicData/Tnb.BasicData/BasDefectService.cs

@@ -0,0 +1,43 @@
+using JNPF.Common.Core.Manager;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.Systems.Interfaces.System;
+using JNPF.VisualDev;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Tnb.BasicData.Entities;
+using Tnb.BasicData.Interfaces;
+
+namespace Tnb.BasicData
+{
+    /// <summary>
+    /// 物料清单
+    /// </summary>
+    [ApiDescriptionSettings(Tag = ModuleConst.Tag, Area = ModuleConst.Area, Order = 1102)]
+    [Route("api/[area]/[controller]/[action]")]
+    public class BasDefectService: IBasDefectService,IDynamicApiController, ITransient
+    {
+        private readonly ISqlSugarRepository<BasDefect> _repository;
+        private readonly DataBaseManager _dbManager;
+        private readonly IDictionaryDataService _dictionaryDataService;
+        
+        public BasDefectService(
+            ISqlSugarRepository<BasDefect> repository,DataBaseManager dbManager,IDictionaryDataService dictionaryDataService)
+        {
+            _repository = repository;
+            _dbManager = dbManager;
+            _dictionaryDataService = dictionaryDataService;
+        }
+
+        [HttpPost]
+        public async Task<dynamic> GetDefectListByProcessId(Dictionary<string, string> dic)
+        {
+            string processId = dic["processId"];
+            return await _repository.AsSugarClient().Queryable<BasProcessDefective>()
+                .LeftJoin<BasProcess>((a, b) => a.process_id == b.id)
+                .LeftJoin<BasDefect>((a, b, c) => a.defective_id == c.id)
+                .Where((a, b, c) => a.process_id == processId)
+                .Select((a, b, c) => c).ToListAsync();
+        }
+    }
+}