diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs
index 67b7ec9..f3d7691 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/mm/MmRequirePlanController.cs
+++ b/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);
}
-
-
}
}
\ No newline at end of file
diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/MmWorkshopStagnantProductController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/MmWorkshopStagnantProductController.cs
new file mode 100644
index 0000000..4a7bebf
--- /dev/null
+++ b/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
+{
+ ///
+ /// 车间呆滞品管理 (废弃)
+ ///
+ [Verify]
+ [Route("mes/materialManagement/MmRequirePlan")]
+ public class MmWorkshopStagnantProductController : BaseController
+ {
+ private readonly IMmWorkshopStagnantProductService _immWorkshopStagnantProductService;
+
+ public MmWorkshopStagnantProductController(IMmWorkshopStagnantProductService mmWorkshopStagnantProductService)
+ {
+ _immWorkshopStagnantProductService= mmWorkshopStagnantProductService;
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json
index bf18d0d..64f9760 100644
--- a/DOAN.Admin.WebApi/appsettings.Development.json
+++ b/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库是实例的名称
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-145955.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-145955.xlsx
deleted file mode 100644
index 8af0cd3..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-145955.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-150008.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-150008.xlsx
deleted file mode 100644
index c96d62f..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-150008.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151655.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151655.xlsx
deleted file mode 100644
index 5e21a1f..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151655.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151751.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151751.xlsx
deleted file mode 100644
index a6042c3..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151751.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151854.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151854.xlsx
deleted file mode 100644
index 7b31546..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-151854.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152318.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152318.xlsx
deleted file mode 100644
index bbb3d54..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152318.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152325.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152325.xlsx
deleted file mode 100644
index 2fbaf12..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152325.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152401.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152401.xlsx
deleted file mode 100644
index 81d49b9..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-17-152401.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-22-142245.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表07-22-142245.xlsx
deleted file mode 100644
index ed48f6b..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表07-22-142245.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/工单列表09-14-102420.xlsx b/DOAN.Admin.WebApi/wwwroot/export/工单列表09-14-102420.xlsx
deleted file mode 100644
index 08d7642..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/工单列表09-14-102420.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135036.xlsx b/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135036.xlsx
deleted file mode 100644
index bc21582..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135036.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135117.xlsx b/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135117.xlsx
deleted file mode 100644
index 7ff3777..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-135117.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140138.xlsx b/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140138.xlsx
deleted file mode 100644
index bed4de2..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140138.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140234.xlsx b/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140234.xlsx
deleted file mode 100644
index 527d454..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-04-140234.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-08-100419.xlsx b/DOAN.Admin.WebApi/wwwroot/export/报工列表11-08-100419.xlsx
deleted file mode 100644
index d464bce..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/报工列表11-08-100419.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172512.xlsx b/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172512.xlsx
deleted file mode 100644
index af2bc39..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172512.xlsx and /dev/null differ
diff --git a/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172822.xlsx b/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172822.xlsx
deleted file mode 100644
index 308305e..0000000
Binary files a/DOAN.Admin.WebApi/wwwroot/export/索赔单11-06-172822.xlsx and /dev/null differ
diff --git a/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
new file mode 100644
index 0000000..c6ef563
--- /dev/null
+++ b/DOAN.Model/MES/mm/MmSlowMoveMaterial.cs
@@ -0,0 +1,86 @@
+
+namespace DOAN.Model.MES.mm
+{
+ ///
+ /// 车间呆滞品盘点
+ ///
+ [SugarTable("mm_slow_move_material")]
+ public class MmSlowMoveMaterial
+ {
+ ///
+ /// 雪花
+ ///
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+ public string Id { get; set; }
+
+ ///
+ /// 产线code
+ ///
+ [SugarColumn(ColumnName = "line_code")]
+ public string LineCode { get; set; }
+
+ ///
+ /// 检查日期
+ ///
+ [SugarColumn(ColumnName = "check_date")]
+ public DateTime? CheckDate { get; set; }
+
+ ///
+ /// 物料code
+ ///
+ [SugarColumn(ColumnName = "material_code")]
+ public string MaterialCode { get; set; }
+
+ ///
+ /// 物料名称
+ ///
+ [SugarColumn(ColumnName = "material_name")]
+ public string MaterialName { get; set; }
+
+ ///
+ /// 规格
+ ///
+ public string Specification { get; set; }
+
+ ///
+ /// 理论呆滞数量
+ ///
+ [SugarColumn(ColumnName = "logic_quantity")]
+ public decimal LogicQuantity { get; set; }
+
+ ///
+ /// 实际盘点数量
+ ///
+ [SugarColumn(ColumnName = "actual_quantity")]
+ public decimal ActualQuantity { get; set; }
+
+ ///
+ /// 单位
+ ///
+ public string Unit { get; set; }
+
+ ///
+ /// 创建人
+ ///
+ [SugarColumn(ColumnName = "cREATED_BY")]
+ public string CreatedBy { get; set; }
+
+ ///
+ /// 创建时间
+ ///
+ [SugarColumn(ColumnName = "cREATED_TIME")]
+ public DateTime? CreatedTime { get; set; }
+
+ ///
+ /// 修改人
+ ///
+ [SugarColumn(ColumnName = "uPDATED_BY")]
+ public string UpdatedBy { get; set; }
+
+ ///
+ /// 修改时间
+ ///
+ [SugarColumn(ColumnName = "uPDATED_TIME")]
+ public DateTime? UpdatedTime { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/DOAN.Service/MES/ERP/InteractERPService.cs b/DOAN.Service/MES/ERP/InteractERPService.cs
index 6d41fda..4609cfd 100644
--- a/DOAN.Service/MES/ERP/InteractERPService.cs
+++ b/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, IInteractERPService
{
-
///
/// 同步ERP中的客户信息
///
@@ -107,6 +107,7 @@ namespace DOAN.Service.MES.ERP
}
+
///
/// 同步供应商 custDev_mes_Vendor SELECT * from t_custDev_mes_Vendor
///
diff --git a/DOAN.Service/MES/bigScreen/ProductBigScreenService.cs b/DOAN.Service/MES/bigScreen/ProductBigScreenService.cs
index 095c279..37e3dd1 100644
--- a/DOAN.Service/MES/bigScreen/ProductBigScreenService.cs
+++ b/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;
diff --git a/DOAN.Service/MES/bigScreen/QualityBigScreenService.cs b/DOAN.Service/MES/bigScreen/QualityBigScreenService.cs
index e302266..cb00336 100644
--- a/DOAN.Service/MES/bigScreen/QualityBigScreenService.cs
+++ b/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;
diff --git a/DOAN.Service/MES/mm/IService/IMmRequirePlanService.cs b/DOAN.Service/MES/mm/IService/IMmRequirePlanService.cs
index 294e382..0ff2838 100644
--- a/DOAN.Service/MES/mm/IService/IMmRequirePlanService.cs
+++ b/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
{
///
/// 物料需求计划service接口
///
public interface IMmRequirePlanService : IBaseService
{
-
int GenerateMmRequirePlan(DateTime plan_date, string name);
PagedInfo 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 GetMaterialRequirePlanByline(MmRequirePlanQueryDto2 parm);
}
diff --git a/DOAN.Service/MES/mm/IService/IMmWorkshopStagnantProductService.cs b/DOAN.Service/MES/mm/IService/IMmWorkshopStagnantProductService.cs
new file mode 100644
index 0000000..9aea26e
--- /dev/null
+++ b/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
+{
+ ///
+ /// 物料需求计划service接口
+ ///
+ public interface IMmWorkshopStagnantProductService : IBaseService
+ {}
+}
+
diff --git a/DOAN.Service/MES/mm/MmRequirePlanService.cs b/DOAN.Service/MES/mm/MmRequirePlanService.cs
index 8210ac8..60d58c8 100644
--- a/DOAN.Service/MES/mm/MmRequirePlanService.cs
+++ b/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
{
///
/// 物料需求计划Service业务层处理
@@ -27,8 +29,8 @@ namespace DOAN.Service.group
[AppService(ServiceType = typeof(IMmRequirePlanService), ServiceLifetime = LifeTime.Transient)]
public class MmRequirePlanService : BaseService, IMmRequirePlanService
{
-
private readonly NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
+
///
/// 生成物料需求计划
///
@@ -162,7 +164,6 @@ namespace DOAN.Service.group
}
-
///
/// 查询物料需求计划列表
///
@@ -248,6 +249,7 @@ namespace DOAN.Service.group
//return response;
return Update(model, true);
}
+
///
/// 更新物料状态
///
@@ -446,6 +448,5 @@ namespace DOAN.Service.group
return response;
}
-
}
}
\ No newline at end of file
diff --git a/DOAN.Service/MES/mm/MmWorkshopStagnantProductService.cs b/DOAN.Service/MES/mm/MmWorkshopStagnantProductService.cs
new file mode 100644
index 0000000..c308b91
--- /dev/null
+++ b/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
+{
+ ///
+ /// 车间呆滞品 Service业务层处理
+ ///
+ [AppService(ServiceType = typeof(IMmWorkshopStagnantProductService), ServiceLifetime = LifeTime.Transient)]
+ public class MmWorkshopStagnantProductService : BaseService, IMmWorkshopStagnantProductService
+ {}
+}
+
+
diff --git a/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs b/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs
index 6df01b0..0448fa0 100644
--- a/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs
+++ b/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;
}
-
}
}
\ No newline at end of file