Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

毛坯，抛光，一次合格仓库添加总零件计数，工单排程修改编号为字符串，仓库看板统计优化，产线数量除3计算

Browse Source
This commit is contained in:
赵正易
2024-08-22 10:43:05 +08:00
parent 9084aca672
commit 0801e5e9ef
12 changed files with 91 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ZR.Admin.WebApi/Controllers/mes/wms/WmBlankInventoryController.cs
View File

@@ -136,6 +136,17 @@ namespace ZR.Admin.WebApi.Controllers
}
/// <summary>
/// 查询毛坯库存零件数
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("getPartNumber")]
public IActionResult GetPartNumber()
{
var response = _WmBlankInventoryService.GetPartNumber();
return SUCCESS(response);
}
}

12
ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
View File

@@ -163,5 +163,17 @@ namespace ZR.Admin.WebApi.Controllers
return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message));
}
}
/// <summary>
/// 查询毛坯库存零件数
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("getPartNumber")]
public IActionResult GetPartNumber()
{
var response = _WmOneTimeInventoryService.GetPartNumber();
return SUCCESS(response);
}
}
}

13
ZR.Admin.WebApi/Controllers/mes/wms/WmPolishInventoryController.cs
View File

@@ -3,6 +3,7 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms;
using ZR.Service.mes.wms.IService;
//创建时间：2024-07-25
@@ -184,5 +185,17 @@ namespace ZR.Admin.WebApi.Controllers
return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message));
}
}
/// <summary>
/// 查询毛坯库存零件数
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("getPartNumber")]
public IActionResult GetPartNumber()
{
var response = _WmPolishInventoryService.GetPartNumber();
return SUCCESS(response);
}
}
}

2
ZR.Model/MES/pro/DTO/ProWorkOrder.cs
View File

@@ -35,7 +35,7 @@
/// <summary>
/// 编码号
/// </summary>
public int CodeNumber { get; set; }
public string CodeNumber { get; set; }
/// <summary>
/// 车数

2
ZR.Model/MES/pro/ProWorkorder_v2.cs
View File

@@ -55,7 +55,7 @@ namespace ZR.Model.MES.pro
/// </summary>
[SugarColumn(ColumnName = "code_number")]
[ExcelColumn(Name = "编码号", IndexName = "F")]
public int CodeNumber { get; set; }
public string CodeNumber { get; set; }
/// <summary>
/// 车数

8
ZR.Service/mes/qc/CommonFQCService.cs
View File

@@ -614,6 +614,14 @@ namespace ZR.Service.mes.qc
.Queryable<QcQualityStatisticsTotal>()
.Where(predicate1)
.Sum(it => it.BaofeiTotal) ?? 0;
// 除三优化
boardData.ProductRequireTotal = boardData.ProductRequireTotal / 3;
boardData.ProductQualifiedTotal = boardData.ProductQualifiedTotal / 3;
boardData.ProductQualifiedNotDoorknobTotal = boardData.ProductQualifiedNotDoorknobTotal / 3;
boardData.ProductPolishTotal = boardData.ProductPolishTotal / 3;
boardData.ProductSandingTotal = boardData.ProductSandingTotal / 3;
boardData.ProductDiscardTotal = boardData.ProductDiscardTotal / 3;
return boardData;
}

6
ZR.Service/mes/wms/IService/IWmBlankInventoryService.cs
View File

@@ -23,5 +23,11 @@ namespace ZR.Service.mes.wms.IService
/// <param name="parm"></param>
/// <returns></returns>
int SynchronousMaterial(WmBlankInventory parm);
/// <summary>
/// 获取仓库零件数
/// </summary>
/// <returns></returns>
public int GetPartNumber();
}
}

6
ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs
View File

@@ -38,5 +38,11 @@ namespace ZR.Service.mes.wms.IService
/// <returns></returns>
int DoWmOneTimeStocktaking(WmOneTimeInventory parm);
/// <summary>
/// 获取仓库零件数
/// </summary>
/// <returns></returns>
public int GetPartNumber();
}
}

6
ZR.Service/mes/wms/IService/IWmPolishInventoryService.cs
View File

@@ -43,5 +43,11 @@ namespace ZR.Service.mes.wms.IService
/// <param name="parm"></param>
/// <returns></returns>
int DoWmPolishStocktaking(WmPolishInventory parm);
/// <summary>
/// 获取仓库零件数
/// </summary>
/// <returns></returns>
public int GetPartNumber();
}
}

9
ZR.Service/mes/wms/WmBlankInventoryService.cs
View File

@@ -242,5 +242,14 @@ namespace ZR.Service.mes.wms
return Context.Insertable(wmBlank).ExecuteCommand();
}
// 获取毛坯仓库零件数量
public int GetPartNumber()
{
return Context
.Queryable<WmBlankInventory>()
.Where(it => it.Status == 1)
.Sum(it => it.Quantity) ?? 0;
}
}
}

9
ZR.Service/mes/wms/WmOneTimeInventoryService.cs
View File

@@ -397,5 +397,14 @@ namespace ZR.Service.mes.wms
throw new Exception(e.Message);
}
}
// 获取仓库零件数量
public int GetPartNumber()
{
return Context
.Queryable<WmOneTimeInventory>()
.Where(it => it.Status == 1)
.Sum(it => it.Quantity) ?? 0;
}
}
}

9
ZR.Service/mes/wms/WmPolishInventoryService.cs
View File

@@ -463,5 +463,14 @@ namespace ZR.Service.mes.wms
throw new Exception(e.Message);
}
}
// 获取仓库零件数量
public int GetPartNumber()
{
return Context
.Queryable<WmPolishInventory>()
.Where(it => it.Status == 1)
.Sum(it => it.Quantity) ?? 0;
}
}
}