车间呆滞品

DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 
 using DOAN.Service.group.IService;
 using Aliyun.OSS;
+using DOAN.Service.MES.mm.IService;
 using JinianNet.JNTemplate;
 using Infrastructure.Converter;
 //创建时间：2024-08-30
@@ -161,7 +162,6 @@ namespace DOAN.Admin.WebApi.Controllers
         }
 
 
-
         //TODO  根据产线和日期查询物料需求计划 线别请求配料单）
         [HttpPost("get_material_require_plan_byline")]
         public IActionResult GetMaterialRequirePlanByline([FromBody] MmRequirePlanQueryDto2 parm)
@@ -176,7 +176,5 @@ namespace DOAN.Admin.WebApi.Controllers
             return SUCCESS(response);
 
         }
-
-
     }
 }

DOAN.Admin.WebApi/Controllers/MES/mm/MmWorkshopStagnantProductController.cs

@@ -0,0 +1,30 @@
+using Microsoft.AspNetCore.Mvc;
+
+using DOAN.Admin.WebApi.Filters;
+using DOAN.Model;
+using DOAN.Model.MES.mm.Dto;
+using DOAN.Model.MES.mm;
+using System.Collections.Generic;
+
+using DOAN.Service.group.IService;
+using Aliyun.OSS;
+using JinianNet.JNTemplate;
+using Infrastructure.Converter;
+namespace DOAN.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 车间呆滞品管理 （废弃）
+    /// </summary>
+    [Verify]
+    [Route("mes/materialManagement/MmRequirePlan")]
+    public class MmWorkshopStagnantProductController : BaseController
+    {
+        private readonly IMmWorkshopStagnantProductService _immWorkshopStagnantProductService;
+
+        public MmWorkshopStagnantProductController(IMmWorkshopStagnantProductService mmWorkshopStagnantProductService)
+        {
+            _immWorkshopStagnantProductService= mmWorkshopStagnantProductService;
+            
+        }
+    }
+}

DOAN.Admin.WebApi/appsettings.Development.json

@@ -29,7 +29,7 @@
   //代码生成数据库配置
   "CodeGenDbConfig": {
     //代码生成连接字符串，注意{dbName}为固定格式，不要填写数据库名
-    "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog={dbName};",
+    "Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog={dbName};Port=3308",
     "DbType": 0,
     "IsAutoCloseConnection": true,
     "DbName": "GXAssembly" //代码生成默认连接数据库,Oracle库是实例的名称

DOAN.Model/MES/mm/MmSlowMoveMaterial.cs

@@ -0,0 +1,86 @@
+
+namespace DOAN.Model.MES.mm
+{
+    /// <summary>
+    /// 车间呆滞品盘点
+    /// </summary>
+    [SugarTable("mm_slow_move_material")]
+    public class MmSlowMoveMaterial
+    {
+        /// <summary>
+        /// 雪花 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public string Id { get; set; }
+
+        /// <summary>
+        /// 产线code 
+        /// </summary>
+        [SugarColumn(ColumnName = "line_code")]
+        public string LineCode { get; set; }
+
+        /// <summary>
+        /// 检查日期 
+        /// </summary>
+        [SugarColumn(ColumnName = "check_date")]
+        public DateTime? CheckDate { get; set; }
+
+        /// <summary>
+        /// 物料code 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_code")]
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        [SugarColumn(ColumnName = "material_name")]
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 规格 
+        /// </summary>
+        public string Specification { get; set; }
+
+        /// <summary>
+        /// 理论呆滞数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "logic_quantity")]
+        public decimal LogicQuantity { get; set; }
+
+        /// <summary>
+        /// 实际盘点数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "actual_quantity")]
+        public decimal ActualQuantity { get; set; }
+
+        /// <summary>
+        /// 单位 
+        /// </summary>
+        public string Unit { get; set; }
+
+        /// <summary>
+        /// 创建人 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_BY")]
+        public string CreatedBy { get; set; }
+
+        /// <summary>
+        /// 创建时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "cREATED_TIME")]
+        public DateTime? CreatedTime { get; set; }
+
+        /// <summary>
+        /// 修改人 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_BY")]
+        public string UpdatedBy { get; set; }
+
+        /// <summary>
+        /// 修改时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "uPDATED_TIME")]
+        public DateTime? UpdatedTime { get; set; }
+    }
+}

DOAN.Service/MES/ERP/InteractERPService.cs

@@ -8,6 +8,7 @@ using DOAN.Model.MES.base_;
 using DOAN.Repository;
 using DOAN.Service.MES.base_.IService;
 using System.Linq;
+using System.Threading.Tasks;
 using Mapster;
 using DOAN.Service.MES.ERP.IService;
 using DOAN.Model.MES.ERP;
@@ -23,7 +24,6 @@ namespace DOAN.Service.MES.ERP
     [AppService(ServiceType = typeof(IInteractERPService), ServiceLifetime = LifeTime.Transient)]
     public class InteractERPService : BaseService<CustDevMesCustomer>, IInteractERPService
     {
-
         /// <summary>
         /// 同步ERP中的客户信息
         /// </summary>
@@ -107,6 +107,7 @@ namespace DOAN.Service.MES.ERP
 
 
         }
+
         /// <summary>
         /// 同步供应商 custDev_mes_Vendor   SELECT * from t_custDev_mes_Vendor
         /// </summary>

DOAN.Service/MES/bigScreen/ProductBigScreenService.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using DOAN.Model.MES.bigscreen.Dto;
 using DOAN.Model.MES.dev;
 using DOAN.Model.mes.echarts;

DOAN.Service/MES/bigScreen/QualityBigScreenService.cs

@@ -1,3 +1,4 @@
+using System.Linq;
 using Infrastructure.Attribute;
 using DOAN.Model.MES.base_;
 using DOAN.Model.MES.bigscreen.Dto;

DOAN.Service/MES/mm/IService/IMmRequirePlanService.cs

@@ -5,14 +5,13 @@ using DOAN.Model.MES.mm;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Mvc;
 
-namespace DOAN.Service.group.IService
+namespace DOAN.Service.MES.mm.IService
 {
     /// <summary>
     /// 物料需求计划service接口
     /// </summary>
     public interface IMmRequirePlanService : IBaseService<MmRequirePlan>
     {
-
         int GenerateMmRequirePlan(DateTime plan_date, string name);
         PagedInfo<MmRequirePlanDto> GetList(MmRequirePlanQueryDto parm);
 
@@ -29,7 +28,7 @@ namespace DOAN.Service.group.IService
         bool CheckCommunicationERPInventory();
 
 
-       int GenerateMaterialRequirePlanByline(MmRequirePlanQueryDto2 parm, string CreatedBy);
+        int GenerateMaterialRequirePlanByline(MmRequirePlanQueryDto2 parm, string CreatedBy);
 
         PagedInfo<MmRequirePlanByline> GetMaterialRequirePlanByline(MmRequirePlanQueryDto2 parm);
     }

DOAN.Service/MES/mm/IService/IMmWorkshopStagnantProductService.cs

@@ -0,0 +1,16 @@
+using System;
+using DOAN.Model;
+using DOAN.Model.MES.mm.Dto;
+using DOAN.Model.MES.mm;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DOAN.Service.group.IService
+{
+    /// <summary>
+    /// 物料需求计划service接口
+    /// </summary>
+    public interface IMmWorkshopStagnantProductService : IBaseService<MmRequirePlan>
+    {}
+}
+

DOAN.Service/MES/mm/MmRequirePlanService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using SqlSugar;
 using Infrastructure.Attribute;
 using Infrastructure.Extensions;
@@ -15,11 +16,12 @@ using DOAN.Model.MES.base_;
 using Microsoft.Extensions.Logging;
 using NPOI;
 using DOAN.Model.MES.ERP;
+using DOAN.Service.MES.mm.IService;
 using Mapster;
 using Microsoft.AspNetCore.Http.HttpResults;
 using Infrastructure.Converter;
 
-namespace DOAN.Service.group
+namespace DOAN.Service.MES.mm
 {
     /// <summary>
     /// 物料需求计划Service业务层处理
@@ -27,8 +29,8 @@ namespace DOAN.Service.group
     [AppService(ServiceType = typeof(IMmRequirePlanService), ServiceLifetime = LifeTime.Transient)]
     public class MmRequirePlanService : BaseService<MmRequirePlan>, IMmRequirePlanService
     {
-
         private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
         /// <summary>
         /// 生成物料需求计划
         /// </summary>
@@ -162,7 +164,6 @@ namespace DOAN.Service.group
         }
 
 
-
         /// <summary>
         /// 查询物料需求计划列表
         /// </summary>
@@ -248,6 +249,7 @@ namespace DOAN.Service.group
             //return response;
             return Update(model, true);
         }
+
         /// <summary>
         /// 更新物料状态
         /// </summary>
@@ -446,6 +448,5 @@ namespace DOAN.Service.group
 
             return response;
         }
-
     }
 }

DOAN.Service/MES/mm/MmWorkshopStagnantProductService.cs

@@ -0,0 +1,32 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using Infrastructure.Extensions;
+using DOAN.Model;
+using DOAN.Model.Dto;
+
+using DOAN.Repository;
+using DOAN.Model.MES.mm.Dto;
+using DOAN.Model.MES.mm;
+using DOAN.Service.group.IService;
+using SqlSugar.Extensions;
+using DOAN.Model.MES.product;
+using DOAN.Model.MES.base_;
+using Microsoft.Extensions.Logging;
+using NPOI;
+using DOAN.Model.MES.ERP;
+using Mapster;
+using Microsoft.AspNetCore.Http.HttpResults;
+using Infrastructure.Converter;
+
+namespace DOAN.Service.group
+{
+    /// <summary>
+    /// 车间呆滞品   Service业务层处理
+    /// </summary>
+    [AppService(ServiceType = typeof(IMmWorkshopStagnantProductService), ServiceLifetime = LifeTime.Transient)]
+    public class MmWorkshopStagnantProductService : BaseService<MmRequirePlan>, IMmWorkshopStagnantProductService
+    {}
+}
+
+

DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs

@@ -1,4 +1,5 @@
 
+using System.Linq;
 using DOAN.Model.MES.andon.Dto;
 using DOAN.Model.MES.product;
 using DOAN.Model.MES.quality.Analysis.Dto;
@@ -52,6 +53,5 @@ namespace DOAN.Service.MES.quality.Analysis
             return pieDataDto;
 
         }
-
     }
 }