diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmGp12QualityStatisticsController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmGp12QualityStatisticsController.cs new file mode 100644 index 00000000..34491f74 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmGp12QualityStatisticsController.cs @@ -0,0 +1,113 @@ +using Microsoft.AspNetCore.Mvc; +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.IService; + +//创建时间：2024-08-08 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// GP12质检记录表 + /// + [Verify] + [Route("business/WmGp12QualityStatistics")] + public class WmGp12QualityStatisticsController : BaseController + { + /// + /// GP12质检记录表接口 + /// + private readonly IWmGp12QualityStatisticsService _WmGp12QualityStatisticsService; + + public WmGp12QualityStatisticsController( + IWmGp12QualityStatisticsService WmGp12QualityStatisticsService + ) + { + _WmGp12QualityStatisticsService = WmGp12QualityStatisticsService; + } + + /// + /// 查询GP12质检记录表列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:wmgp12qualitystatistics:list")] + public IActionResult QueryWmGp12QualityStatistics( + [FromQuery] WmGp12QualityStatisticsQueryDto parm + ) + { + var response = _WmGp12QualityStatisticsService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 查询GP12质检记录表详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:wmgp12qualitystatistics:query")] + public IActionResult GetWmGp12QualityStatistics(string Id) + { + var response = _WmGp12QualityStatisticsService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加GP12质检记录表 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:wmgp12qualitystatistics:add")] + [Log(Title = "GP12质检记录表", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmGp12QualityStatistics([FromBody] WmGp12QualityStatisticsDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmGp12QualityStatisticsService.AddWmGp12QualityStatistics(modal); + + return SUCCESS(response); + } + + /// + /// 更新GP12质检记录表 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:wmgp12qualitystatistics:edit")] + [Log(Title = "GP12质检记录表", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmGp12QualityStatistics( + [FromBody] WmGp12QualityStatisticsDto parm + ) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmGp12QualityStatisticsService.UpdateWmGp12QualityStatistics(modal); + + return ToResponse(response); + } + + /// + /// 删除GP12质检记录表 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:wmgp12qualitystatistics:delete")] + [Log(Title = "GP12质检记录表", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmGp12QualityStatistics(string ids) + { + string[] idsArr = ids.Split(","); + if (idsArr.Length <= 0) + { + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); + } + + var response = _WmGp12QualityStatisticsService.Delete(idsArr); + + return ToResponse(response); + } + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs new file mode 100644 index 00000000..00802339 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs @@ -0,0 +1,167 @@ +using Microsoft.AspNetCore.Mvc; +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-08-08 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 一次合格品仓库 + /// + [Route("/mes/wm/WmOneTimeInventory")] + public class WmOneTimeInventoryController : BaseController + { + /// + /// 一次合格品仓库接口 + /// + private readonly IWmOneTimeInventoryService _WmOneTimeInventoryService; + + public WmOneTimeInventoryController(IWmOneTimeInventoryService WmOneTimeInventoryService) + { + _WmOneTimeInventoryService = WmOneTimeInventoryService; + } + + /// + /// 查询一次合格品仓库列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")] + public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm) + { + var response = _WmOneTimeInventoryService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 查询一次合格品仓库详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:wmonetimeinventory:query")] + public IActionResult GetWmOneTimeInventory(string Id) + { + var response = _WmOneTimeInventoryService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加一次合格品仓库 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:wmonetimeinventory:add")] + [Log(Title = "一次合格品仓库", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmOneTimeInventoryService.AddWmOneTimeInventory(modal); + + return SUCCESS(response); + } + + /// + /// 更新一次合格品仓库 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:wmonetimeinventory:edit")] + [Log(Title = "一次合格品仓库", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmOneTimeInventory([FromBody] WmOneTimeInventoryDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmOneTimeInventoryService.UpdateWmOneTimeInventory(modal); + + return ToResponse(response); + } + + /// + /// 删除一次合格品仓库 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:wmonetimeinventory:delete")] + [Log(Title = "一次合格品仓库", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmOneTimeInventory(string ids) + { + string[] idsArr = ids.Split(','); + if (idsArr.Length <= 0) + { + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); + } + + var response = _WmOneTimeInventoryService.Delete(idsArr); + + return ToResponse(response); + } + + /// + /// 一次合格品手动入库 + /// + /// + [HttpPost("doWmOneTimeWarehousing")] + [Log(Title = "一次合格品手动入库", BusinessType = BusinessType.UPDATE)] + public IActionResult DoWmOneTimeWarehousing([FromBody] WmOneTimeInventoryDto parm) + { + try + { + var modal = parm.Adapt().ToCreate(HttpContext); + var response = _WmOneTimeInventoryService.DoWmOneTimeWarehousing(modal); + return ToResponse(new ApiResult(200, "手动入库成功", response)); + } + catch (Exception e) + { + return ToResponse(new ApiResult(500, "手动入库异常:" + e.Message, e.Message)); + } + } + + /// + /// 一次合格品手动出库 + /// + /// + [HttpPost("doWmOneTimeRetrieval")] + [Log(Title = "一次合格品手动出库", BusinessType = BusinessType.UPDATE)] + public IActionResult DoWmOneTimeRetrieval([FromBody] WmOneTimeInventoryDto parm) + { + try + { + var modal = parm.Adapt().ToCreate(HttpContext); + var response = _WmOneTimeInventoryService.DoWmOneTimeRetrieval(modal); + return ToResponse(new ApiResult(200, "手动出库成功", response)); + } + catch (Exception e) + { + return ToResponse(new ApiResult(500, "手动出库异常:" + e.Message, e.Message)); + } + } + + /// + /// 一次合格品仓库盘点 + /// + /// + [HttpPost("doWmOneTimeStocktaking")] + [Log(Title = "一次合格品仓库盘点", BusinessType = BusinessType.INSERT)] + public IActionResult DoWmOneTimeStocktaking([FromBody] WmOneTimeInventoryDto parm) + { + try + { + var modal = parm.Adapt().ToCreate(HttpContext); + var response = _WmOneTimeInventoryService.DoWmOneTimeStocktaking(modal); + return ToResponse(new ApiResult(200, "盘点成功", response)); + } + catch (Exception e) + { + return ToResponse(new ApiResult(500, "盘点异常:" + e.Message, e.Message)); + } + } + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs new file mode 100644 index 00000000..c19a0d08 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeRecordController.cs @@ -0,0 +1,106 @@ +using Microsoft.AspNetCore.Mvc; +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.IService; + +//创建时间：2024-08-08 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 一次合格品仓库记录表 + /// + [Route("/mes/wm/WmOneTimeRecord")] + public class WmOneTimeRecordController : BaseController + { + /// + /// 一次合格品仓库记录表接口 + /// + private readonly IWmOneTimeRecordService _WmOneTimeRecordService; + + public WmOneTimeRecordController(IWmOneTimeRecordService WmOneTimeRecordService) + { + _WmOneTimeRecordService = WmOneTimeRecordService; + } + + /// + /// 查询一次合格品仓库记录表列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:wmonetimerecord:list")] + public IActionResult QueryWmOneTimeRecord([FromQuery] WmOneTimeRecordQueryDto parm) + { + var response = _WmOneTimeRecordService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 查询一次合格品仓库记录表详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:wmonetimerecord:query")] + public IActionResult GetWmOneTimeRecord(string Id) + { + var response = _WmOneTimeRecordService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加一次合格品仓库记录表 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:wmonetimerecord:add")] + [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmOneTimeRecord([FromBody] WmOneTimeRecordDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmOneTimeRecordService.AddWmOneTimeRecord(modal); + + return SUCCESS(response); + } + + /// + /// 更新一次合格品仓库记录表 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:wmonetimerecord:edit")] + [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmOneTimeRecord([FromBody] WmOneTimeRecordDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmOneTimeRecordService.UpdateWmOneTimeRecord(modal); + + return ToResponse(response); + } + + /// + /// 删除一次合格品仓库记录表 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:wmonetimerecord:delete")] + [Log(Title = "一次合格品仓库记录表", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmOneTimeRecord(string ids) + { + string[] idsArr = ids.Split(','); + if (idsArr.Length <= 0) + { + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); + } + + var response = _WmOneTimeRecordService.Delete(idsArr); + + return ToResponse(response); + } + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs new file mode 100644 index 00000000..81abbc08 --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishQualityStatisticsController.cs @@ -0,0 +1,132 @@ +using Microsoft.AspNetCore.Mvc; +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.IService; + +//创建时间：2024-08-07 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 抛光管理-质量统计 + /// + // [Verify] + [Route("/mes/wm/WmPolishQualityStatistics")] + public class WmPolishQualityStatisticsController : BaseController + { + /// + /// 抛光管理-质量统计接口 + /// + private readonly IWmPolishQualityStatisticsService _WmPolishQualityStatisticsService; + + public WmPolishQualityStatisticsController( + IWmPolishQualityStatisticsService WmPolishQualityStatisticsService + ) + { + _WmPolishQualityStatisticsService = WmPolishQualityStatisticsService; + } + + /// + /// 查询抛光管理-质量统计列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:list")] + public IActionResult QueryWmPolishQualityStatistics( + [FromQuery] WmPolishQualityStatisticsQueryDto parm + ) + { + var response = _WmPolishQualityStatisticsService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 查询抛光管理-质量统计详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:query")] + public IActionResult GetWmPolishQualityStatistics(string Id) + { + var response = _WmPolishQualityStatisticsService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加抛光管理-质量统计 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:add")] + [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmPolishQualityStatistics( + [FromBody] WmPolishQualityStatisticsDto parm + ) + { + try + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmPolishQualityStatisticsService.AddWmPolishQualityStatistics( + modal + ); + + return SUCCESS(response); + } + catch (Exception e) + { + return ToResponse(ApiResult.Error("添加记录失败:" + e.Message)); + } + } + + /// + /// 更新抛光管理-质量统计 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:edit")] + [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmPolishQualityStatistics( + [FromBody] WmPolishQualityStatisticsDto parm + ) + { + try + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmPolishQualityStatisticsService.UpdateWmPolishQualityStatistics(modal); + + return ToResponse(response); + } + catch (Exception e) + { + return ToResponse(ApiResult.Error("修改记录失败:" + e.Message)); + } + + } + + /// + /// 删除抛光管理-质量统计 + /// + /// + [HttpDelete("{ids}")] + [ActionPermissionFilter(Permission = "business:wmpolishqualitystatistics:delete")] + [Log(Title = "抛光管理-质量统计", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmPolishQualityStatistics(string ids) + { + string[] idsArr = ids.Split(","); + if (idsArr.Length <= 0) + { + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); + } + + var response = _WmPolishQualityStatisticsService.Delete(idsArr); + + return ToResponse(response); + } + } +} diff --git a/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishWorkQualityStatisticsController.cs b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishWorkQualityStatisticsController.cs new file mode 100644 index 00000000..177a52cf --- /dev/null +++ b/ZR.Admin.WebApi/Controllers/mes/wms/WmPolishWorkQualityStatisticsController.cs @@ -0,0 +1,127 @@ +using Microsoft.AspNetCore.Mvc; +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.IService; + +//创建时间：2024-08-08 +namespace ZR.Admin.WebApi.Controllers +{ + /// + /// 抛光管理-抛光操作 + /// + // [Verify] + [Route("/mes/wm/WmPolishWorkQualityStatistics")] + public class WmPolishWorkQualityStatisticsController : BaseController + { + /// + /// 抛光管理-抛光操作接口 + /// + private readonly IWmPolishWorkQualityStatisticsService _WmPolishWorkQualityStatisticsService; + + public WmPolishWorkQualityStatisticsController( + IWmPolishWorkQualityStatisticsService WmPolishWorkQualityStatisticsService + ) + { + _WmPolishWorkQualityStatisticsService = WmPolishWorkQualityStatisticsService; + } + + /// + /// 查询抛光管理-抛光操作列表 + /// + /// + /// + [HttpGet("list")] + public IActionResult QueryWmPolishWorkQualityStatistics( + [FromQuery] WmPolishWorkQualityStatisticsQueryDto parm + ) + { + var response = _WmPolishWorkQualityStatisticsService.GetList(parm); + return SUCCESS(response); + } + + /// + /// 查询抛光管理-抛光操作详情 + /// + /// + /// + [HttpGet("{Id}")] + public IActionResult GetWmPolishWorkQualityStatistics(string Id) + { + var response = _WmPolishWorkQualityStatisticsService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加抛光管理-抛光操作 + /// + /// + [HttpPost] + [Log(Title = "抛光管理-抛光操作", BusinessType = BusinessType.INSERT)] + public IActionResult AddWmPolishWorkQualityStatistics( + [FromBody] WmPolishQualityStatisticsDto parm + ) + { + try + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _WmPolishWorkQualityStatisticsService.AddWmPolishWorkQualityStatistics( + modal + ); + + return SUCCESS(response); + } + catch (Exception e) + { + return ToResponse(ApiResult.Error("添加记录失败:" + e.Message)); + } + } + + /// + /// 更新抛光管理-抛光操作 + /// + /// + [HttpPut] + [Log(Title = "抛光管理-抛光操作", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateWmPolishQualityStatistics( + [FromBody] WmPolishQualityStatisticsDto parm + ) + { + try + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _WmPolishWorkQualityStatisticsService.UpdateWmPolishWorkQualityStatistics(modal); + + return ToResponse(response); + } + catch (Exception e) + { + return ToResponse(ApiResult.Error("修改记录失败:" + e.Message)); + } + + } + + /// + /// 删除抛光管理-抛光操作 + /// + /// + [HttpDelete("{ids}")] + [Log(Title = "抛光管理-抛光操作", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteWmPolishWorkQualityStatistics(string ids) + { + string[] idsArr = ids.Split(","); + if (idsArr.Length <= 0) + { + return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); + } + + var response = _WmPolishWorkQualityStatisticsService.Delete(idsArr); + + return ToResponse(response); + } + } +} diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip new file mode 100644 index 00000000..dc6b842a Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-GP12质检记录表-0808154939.zip differ diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip deleted file mode 100644 index f09df83d..00000000 Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-agv任务-0605181937.zip and /dev/null differ diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip new file mode 100644 index 00000000..f1ba3379 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库-0808154936.zip differ diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip new file mode 100644 index 00000000..e3d6e7b3 Binary files /dev/null and b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-一次合格品仓库记录表-0808154933.zip differ diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip deleted file mode 100644 index a1f8b64c..00000000 Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-包装记录-0520091356.zip and /dev/null differ diff --git a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip b/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip deleted file mode 100644 index d345dc2c..00000000 Binary files a/ZR.Admin.WebApi/wwwroot/Generatecode/ZrAdmin.NET-配料任务清单-0605182515.zip and /dev/null differ diff --git a/ZR.Model/MES/wms/Dto/WmGp12QualityStatisticsDto.cs b/ZR.Model/MES/wms/Dto/WmGp12QualityStatisticsDto.cs new file mode 100644 index 00000000..5f6b81df --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmGp12QualityStatisticsDto.cs @@ -0,0 +1,127 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.wms.Dto +{ + /// + /// GP12质检记录表查询对象 + /// + public class WmGp12QualityStatisticsQueryDto : PagerInfo + { + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public string Team { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + } + + /// + /// GP12质检记录表输入输出对象 + /// + public class WmGp12QualityStatisticsDto + { + [Required(ErrorMessage = "id不能为空")] + public string Id { get; set; } + + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public int? RequireNumber { get; set; } + + public string Team { get; set; } + + public int? QualifiedNumber { get; set; } + + public decimal QualifiedRate { get; set; } + + public int? PaoguangTotal { get; set; } + + public int? DamoTotal { get; set; } + + public int? BaofeiTotal { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + + public bool IsReturnWorkpiece { get; set; } + + public int? Type { get; set; } + + public string Remark { get; set; } + + public int? PaintSuokong { get; set; } + + public int? PaintZhengkong { get; set; } + + public int? PaintShiguang { get; set; } + + public int? PaintSecha { get; set; } + + public int? PaintDianzi { get; set; } + + public int? PaintOther { get; set; } + + public int? DeviceShuiban { get; set; } + + public int? DeviceZandian { get; set; } + + public int? DeviceBianxing { get; set; } + + public int? DeviceYouzhu { get; set; } + + public int? DeviceTuoluo { get; set; } + + public int? DeviceZhuangshang { get; set; } + + public int? DeviceOther { get; set; } + + public int? BlankMaoci { get; set; } + + public int? BlankSuoyin { get; set; } + + public int? BlankCanshuang { get; set; } + + public int? BlankShaying { get; set; } + + public int? BlankZangdian { get; set; } + + public int? BlankDamo { get; set; } + + public int? ProgramLiuguang { get; set; } + + public int? ProgramSeqiqueqi { get; set; } + + public int? ProgramQingqiqueqi { get; set; } + + public int? ProgramJupi { get; set; } + + public int? ProgramOther { get; set; } + + public int? TeamTuoluocanshuang { get; set; } + + public int? TeamQingqiqikuai { get; set; } + + public int? TeamSeqiqikuai { get; set; } + + public int? TeamFahua { get; set; } + + public int? TeamLiangbang { get; set; } + + public int? TeamPenglou { get; set; } + + public DateTime? UpdatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string CreatedBy { get; set; } + } +} diff --git a/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs b/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs new file mode 100644 index 00000000..26ce6970 --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs @@ -0,0 +1,59 @@ +namespace ZR.Model.MES.wms.Dto +{ + /// + /// 一次合格品仓库查询对象 + /// + public class WmOneTimeInventoryQueryDto : PagerInfo { + public string BlankNum { get; set; } + + public string Partnumber { get; set; } + + public string Description { get; set; } + + public int? Type { get; set; } + + public int? Status { get; set; } + } + + /// + /// 一次合格品仓库输入输出对象 + /// + public class WmOneTimeInventoryDto + { + public string Id { get; set; } + + public string BlankNum { get; set; } + + public string Partnumber { get; set; } + + public string WorkOrder { get; set; } + + public string Color { get; set; } + + public string Specification { get; set; } + + public string Description { get; set; } + + public int? Quantity { get; set; } + + public int? MaxNum { get; set; } + + public int? MinNum { get; set; } + + public int? WarnNum { get; set; } + + public int? Type { get; set; } + + public int? Status { get; set; } + + public string Remark { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs b/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs new file mode 100644 index 00000000..852ffdac --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs @@ -0,0 +1,51 @@ +namespace ZR.Model.MES.wms.Dto +{ + /// + /// 一次合格品仓库记录表查询对象 + /// + public class WmOneTimeRecordQueryDto : PagerInfo { + public string Id { get; set; } + public string FkInventoryId { get; set; } + public string Code { get; set; } + public string BlankNum { get; set; } + public string Partnumber { get; set; } + public string Remark { get; set; } + public int? ChangeType { get; set; } + public DateTime? StartActionTime { get; set; } + public DateTime? EndActionTime { get; set; } + } + + /// + /// 一次合格品仓库记录表输入输出对象 + /// + public class WmOneTimeRecordDto + { + public string Id { get; set; } + + public string FkInventoryId { get; set; } + + public string Code { get; set; } + + public string Partnumber { get; set; } + + public string BlankNum { get; set; } + + public int? ChangeType { get; set; } + + public int? ChangeQuantity { get; set; } + + public DateTime? ActionTime { get; set; } + + public int? Status { get; set; } + + public string Remark { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + } +} diff --git a/ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs b/ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs index 1c952dee..efdc811b 100644 --- a/ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs +++ b/ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs @@ -1,11 +1,9 @@ -using System.ComponentModel.DataAnnotations; - namespace ZR.Model.MES.wms.Dto { /// /// 工艺路线-抛光 库存表查询对象 /// - public class WmPolishInventoryQueryDto : PagerInfo + public class WmPolishInventoryQueryDto : PagerInfo { public string BlankNum { get; set; } @@ -16,7 +14,6 @@ namespace ZR.Model.MES.wms.Dto public int? Type { get; set; } public int? Status { get; set; } - } /// @@ -59,8 +56,5 @@ namespace ZR.Model.MES.wms.Dto public string UpdatedBy { get; set; } public DateTime? UpdatedTime { get; set; } - - - } -} \ No newline at end of file +} diff --git a/ZR.Model/MES/wms/Dto/WmPolishQualityStatisticsDto.cs b/ZR.Model/MES/wms/Dto/WmPolishQualityStatisticsDto.cs new file mode 100644 index 00000000..dfc1dcb3 --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmPolishQualityStatisticsDto.cs @@ -0,0 +1,136 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.wms.Dto +{ + /// + /// 抛光管理-质量统计查询对象 + /// + public class WmPolishQualityStatisticsQueryDto : PagerInfo + { + + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public string Team { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + } + + /// + /// 抛光管理-质量统计输入输出对象 + /// + public class WmPolishQualityStatisticsDto + { + public string Id { get; set; } + + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public string Color { get; set; } + + public string Specification { get; set; } + + public string Description { get; set; } + + public int? RequireNumber { get; set; } + + public string Team { get; set; } + + public int? QualifiedNumber { get; set; } + + public string QualifiedRateStr { get; set; } + public decimal QualifiedRate { get; set; } + + public int? PaoguangTotal { get; set; } + + public int? DamoTotal { get; set; } + + public int? BaofeiTotal { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + + public int? Type { get; set; } + + public string Remark { get; set; } + + public int? PaintSuokong { get; set; } + + public int? PaintZhengkong { get; set; } + + public int? PaintShiguang { get; set; } + + public int? PaintSecha { get; set; } + + public int? PaintDianzi { get; set; } + + public int? PaintOther { get; set; } + + public int? DeviceShuiban { get; set; } + + public int? DeviceZandian { get; set; } + + public int? DeviceBianxing { get; set; } + + public int? DeviceYouzhu { get; set; } + + public int? DeviceTuoluo { get; set; } + + public int? DeviceZhuangshang { get; set; } + + public int? DeviceOther { get; set; } + + public int? BlankMaoci { get; set; } + + public int? BlankSuoyin { get; set; } + + public int? BlankCanshuang { get; set; } + + public int? BlankShaying { get; set; } + + public int? BlankZangdian { get; set; } + + public int? BlankDamo { get; set; } + + public int? ProgramLiuguang { get; set; } + + public int? ProgramSeqiqueqi { get; set; } + + public int? ProgramQingqiqueqi { get; set; } + + public int? ProgramJupi { get; set; } + + public int? ProgramOther { get; set; } + + public int? TeamTuoluocanshuang { get; set; } + + public int? TeamQingqiqikuai { get; set; } + + public int? TeamSeqiqikuai { get; set; } + + public int? TeamFahua { get; set; } + + public int? TeamLiangbang { get; set; } + + public int? TeamPenglou { get; set; } + + public DateTime? UpdatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string CreatedBy { get; set; } + + // 是否是返工件 + public bool IsReturnWorkpiece { get; set; } = false; + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/Dto/WmPolishWorkQualityStatisticsDto.cs b/ZR.Model/MES/wms/Dto/WmPolishWorkQualityStatisticsDto.cs new file mode 100644 index 00000000..ae17b9a4 --- /dev/null +++ b/ZR.Model/MES/wms/Dto/WmPolishWorkQualityStatisticsDto.cs @@ -0,0 +1,134 @@ +using System.ComponentModel.DataAnnotations; + +namespace ZR.Model.MES.wms.Dto +{ + /// + /// 抛光管理-抛光操作记录 + /// + public class WmPolishWorkQualityStatisticsQueryDto : PagerInfo + { + + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public string Team { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + } + + /// + /// 抛光管理-质量统计输入输出对象 + /// + public class WmPolishWorkQualityStatisticsDto + { + public string Id { get; set; } + + public string WorkorderId { get; set; } + + public string Partnumber { get; set; } + + public string Color { get; set; } + + public string Specification { get; set; } + + public string Description { get; set; } + + public int? RequireNumber { get; set; } + + public string Team { get; set; } + + public int? QualifiedNumber { get; set; } + + public string QualifiedRateStr { get; set; } + public decimal QualifiedRate { get; set; } + + public int? DamoTotal { get; set; } + + public int? BaofeiTotal { get; set; } + + public DateTime? StartTime { get; set; } + + public DateTime? EndTime { get; set; } + + public int? Type { get; set; } + + public string Remark { get; set; } + + public int? PaintSuokong { get; set; } + + public int? PaintZhengkong { get; set; } + + public int? PaintShiguang { get; set; } + + public int? PaintSecha { get; set; } + + public int? PaintDianzi { get; set; } + + public int? PaintOther { get; set; } + + public int? DeviceShuiban { get; set; } + + public int? DeviceZandian { get; set; } + + public int? DeviceBianxing { get; set; } + + public int? DeviceYouzhu { get; set; } + + public int? DeviceTuoluo { get; set; } + + public int? DeviceZhuangshang { get; set; } + + public int? DeviceOther { get; set; } + + public int? BlankMaoci { get; set; } + + public int? BlankSuoyin { get; set; } + + public int? BlankCanshuang { get; set; } + + public int? BlankShaying { get; set; } + + public int? BlankZangdian { get; set; } + + public int? BlankDamo { get; set; } + + public int? ProgramLiuguang { get; set; } + + public int? ProgramSeqiqueqi { get; set; } + + public int? ProgramQingqiqueqi { get; set; } + + public int? ProgramJupi { get; set; } + + public int? ProgramOther { get; set; } + + public int? TeamTuoluocanshuang { get; set; } + + public int? TeamQingqiqikuai { get; set; } + + public int? TeamSeqiqikuai { get; set; } + + public int? TeamFahua { get; set; } + + public int? TeamLiangbang { get; set; } + + public int? TeamPenglou { get; set; } + + public DateTime? UpdatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string CreatedBy { get; set; } + + // 是否是返工件 + public bool IsReturnWorkpiece { get; set; } = false; + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/WmGp12QualityStatistics.cs b/ZR.Model/MES/wms/WmGp12QualityStatistics.cs new file mode 100644 index 00000000..f4b3cba3 --- /dev/null +++ b/ZR.Model/MES/wms/WmGp12QualityStatistics.cs @@ -0,0 +1,301 @@ + +namespace ZR.Model.MES.wms +{ + /// + /// GP12质检记录表 + /// + [SugarTable("wm_gp12_quality_statistics")] + public class WmGp12QualityStatistics + { + /// + /// id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "workorder_id")] + public string WorkorderId { get; set; } + + /// + /// 零件号 + /// + public string Partnumber { get; set; } + + /// + /// 投入数 + /// + [SugarColumn(ColumnName = "require_number")] + public int? RequireNumber { get; set; } + + /// + /// 班组 + /// + public string Team { get; set; } + + /// + /// 合格数 + /// + [SugarColumn(ColumnName = "qualified_number")] + public int? QualifiedNumber { get; set; } + + /// + /// 合格率 + /// + [SugarColumn(ColumnName = "qualified_rate")] + public decimal QualifiedRate { get; set; } + + /// + /// 抛光总数 + /// + [SugarColumn(ColumnName = "paoguang_total")] + public int? PaoguangTotal { get; set; } + + /// + /// 打磨总数 + /// + [SugarColumn(ColumnName = "damo_total")] + public int? DamoTotal { get; set; } + + /// + /// 报废总数 + /// + [SugarColumn(ColumnName = "baofei_total")] + public int? BaofeiTotal { get; set; } + + /// + /// 开始时间 + /// + [SugarColumn(ColumnName = "start_time")] + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + [SugarColumn(ColumnName = "end_time")] + public DateTime? EndTime { get; set; } + + /// + /// 是否是返工件 + /// + [SugarColumn(ColumnName = "is_return_workpiece")] + public bool IsReturnWorkpiece { get; set; } + + /// + /// 类别（0-默认 1-抛光 2-打磨 3-报废 4-合计） + /// + public int? Type { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 油漆-缩孔 + /// + [SugarColumn(ColumnName = "paint_suokong")] + public int? PaintSuokong { get; set; } + + /// + /// 油漆-针孔 + /// + [SugarColumn(ColumnName = "paint_zhengkong")] + public int? PaintZhengkong { get; set; } + + /// + /// 油漆-失光 + /// + [SugarColumn(ColumnName = "paint_shiguang")] + public int? PaintShiguang { get; set; } + + /// + /// 油漆-色差 + /// + [SugarColumn(ColumnName = "paint_secha")] + public int? PaintSecha { get; set; } + + /// + /// 油漆-点子 + /// + [SugarColumn(ColumnName = "paint_dianzi")] + public int? PaintDianzi { get; set; } + + /// + /// 油漆-其他 + /// + [SugarColumn(ColumnName = "paint_other")] + public int? PaintOther { get; set; } + + /// + /// 设备-水斑 + /// + [SugarColumn(ColumnName = "device_shuiban")] + public int? DeviceShuiban { get; set; } + + /// + /// 设备-脏点 + /// + [SugarColumn(ColumnName = "device_zandian")] + public int? DeviceZandian { get; set; } + + /// + /// 设备-变形 + /// + [SugarColumn(ColumnName = "device_bianxing")] + public int? DeviceBianxing { get; set; } + + /// + /// 设备-油珠 + /// + [SugarColumn(ColumnName = "device_youzhu")] + public int? DeviceYouzhu { get; set; } + + /// + /// 设备-脱落 + /// + [SugarColumn(ColumnName = "device_tuoluo")] + public int? DeviceTuoluo { get; set; } + + /// + /// 设备-撞伤 + /// + [SugarColumn(ColumnName = "device_zhuangshang")] + public int? DeviceZhuangshang { get; set; } + + /// + /// 设备-其他 + /// + [SugarColumn(ColumnName = "device_other")] + public int? DeviceOther { get; set; } + + /// + /// 毛坯-毛刺 + /// + [SugarColumn(ColumnName = "blank_maoci")] + public int? BlankMaoci { get; set; } + + /// + /// 毛坯-缩印 + /// + [SugarColumn(ColumnName = "blank_suoyin")] + public int? BlankSuoyin { get; set; } + + /// + /// 毛坯-擦伤 + /// + [SugarColumn(ColumnName = "blank_canshuang")] + public int? BlankCanshuang { get; set; } + + /// + /// 毛坯-砂印 + /// + [SugarColumn(ColumnName = "blank_shaying")] + public int? BlankShaying { get; set; } + + /// + /// 毛坯-脏点 + /// + [SugarColumn(ColumnName = "blank_zangdian")] + public int? BlankZangdian { get; set; } + + /// + /// 毛坯-打磨 + /// + [SugarColumn(ColumnName = "blank_damo")] + public int? BlankDamo { get; set; } + + /// + /// 程序-流挂 + /// + [SugarColumn(ColumnName = "program_liuguang")] + public int? ProgramLiuguang { get; set; } + + /// + /// 程序-色漆缺漆 + /// + [SugarColumn(ColumnName = "program_seqiqueqi")] + public int? ProgramSeqiqueqi { get; set; } + + /// + /// 程序-清漆缺漆 + /// + [SugarColumn(ColumnName = "program_qingqiqueqi")] + public int? ProgramQingqiqueqi { get; set; } + + /// + /// 程序-桔皮 + /// + [SugarColumn(ColumnName = "program_jupi")] + public int? ProgramJupi { get; set; } + + /// + /// 程序-其他 + /// + [SugarColumn(ColumnName = "program_other")] + public int? ProgramOther { get; set; } + + /// + /// 班组操作-脱落擦伤 + /// + [SugarColumn(ColumnName = "team_tuoluocanshuang")] + public int? TeamTuoluocanshuang { get; set; } + + /// + /// 班组操作-清漆漆块 + /// + [SugarColumn(ColumnName = "team_qingqiqikuai")] + public int? TeamQingqiqikuai { get; set; } + + /// + /// 班组操作-色漆漆块 + /// + [SugarColumn(ColumnName = "team_seqiqikuai")] + public int? TeamSeqiqikuai { get; set; } + + /// + /// 班组操作-发花 + /// + [SugarColumn(ColumnName = "team_fahua")] + public int? TeamFahua { get; set; } + + /// + /// 班组操作-亮斑 + /// + [SugarColumn(ColumnName = "team_liangbang")] + public int? TeamLiangbang { get; set; } + + /// + /// 班组操作-喷漏 + /// + [SugarColumn(ColumnName = "team_penglou")] + public int? TeamPenglou { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/WmOneTimeInventory.cs b/ZR.Model/MES/wms/WmOneTimeInventory.cs new file mode 100644 index 00000000..30908a20 --- /dev/null +++ b/ZR.Model/MES/wms/WmOneTimeInventory.cs @@ -0,0 +1,100 @@ +namespace ZR.Model.MES.wms +{ + /// + /// 一次合格品仓库 + /// + [SugarTable("wm_one_time_inventory")] + public class WmOneTimeInventory + { + /// + /// 主键 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 毛坯号 + /// + [SugarColumn(ColumnName = "blank_num")] + public string BlankNum { get; set; } + + /// + /// 零件号 + /// + public string Partnumber { get; set; } + + /// + /// 库存数量 + /// + public int? Quantity { get; set; } + + /// + /// 最大库存 + /// + [SugarColumn(ColumnName = "max_num")] + public int? MaxNum { get; set; } + + /// + /// 最小库存 + /// + [SugarColumn(ColumnName = "min_num")] + public int? MinNum { get; set; } + + /// + /// 预警库存 + /// + [SugarColumn(ColumnName = "warn_num")] + public int? WarnNum { get; set; } + + /// + /// 类别(1-正常 2-返工件) + /// + public int? Type { get; set; } + + /// + /// 状态（0-停用1-启用） + /// + public int? Status { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 操作时间 + /// + [SugarColumn(IsIgnore = true)] + public DateTime? ActionTime { get; set; } + + /// + /// 工单号 + /// + [SugarColumn(IsIgnore = true)] + public string WorkOrder { 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; } + } +} diff --git a/ZR.Model/MES/wms/WmOneTimeRecord.cs b/ZR.Model/MES/wms/WmOneTimeRecord.cs new file mode 100644 index 00000000..b62e2e80 --- /dev/null +++ b/ZR.Model/MES/wms/WmOneTimeRecord.cs @@ -0,0 +1,91 @@ + +namespace ZR.Model.MES.wms +{ + /// + /// 一次合格品仓库记录表 + /// + [SugarTable("wm_one_time_record")] + public class WmOneTimeRecord + { + /// + /// 主键 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 库存主键 + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false, ColumnName = "fk_inventory_id")] + public string FkInventoryId { get; set; } + + /// + /// 关联记录字段(4-检验时使用 group by字段) + /// + public string Code { get; set; } + + /// + /// 零件号 + /// + public string Partnumber { get; set; } + + /// + /// 毛坯号 + /// + [SugarColumn(ColumnName = "blank_num")] + public string BlankNum { get; set; } + + /// + /// 变动类别 1-入库 2-出库 3-盘点 + /// + [SugarColumn(ColumnName = "change_type")] + public int? ChangeType { get; set; } + + /// + /// 变动数量 + /// + [SugarColumn(ColumnName = "change_quantity")] + public int? ChangeQuantity { get; set; } + + /// + /// 时间（操作时间） + /// + [SugarColumn(ColumnName = "action_time")] + public DateTime? ActionTime { get; set; } + + /// + /// 状态（暂定） + /// + public int? Status { get; set; } + + /// + /// 备注 + /// + public string Remark { 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/ZR.Model/MES/wms/WmPolishQualityStatistics.cs b/ZR.Model/MES/wms/WmPolishQualityStatistics.cs new file mode 100644 index 00000000..7156afca --- /dev/null +++ b/ZR.Model/MES/wms/WmPolishQualityStatistics.cs @@ -0,0 +1,301 @@ + +namespace ZR.Model.MES.wms +{ + /// + /// 抛光管理-质量统计 + /// + [SugarTable("wm_polish_quality_statistics")] + public class WmPolishQualityStatistics + { + /// + /// id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "workorder_id")] + public string WorkorderId { get; set; } + + /// + /// 零件号 + /// + public string Partnumber { get; set; } + + /// + /// 抛光投入数 + /// + [SugarColumn(ColumnName = "require_number")] + public int? RequireNumber { get; set; } + + /// + /// 班组 + /// + public string Team { get; set; } + + /// + /// 合格数 + /// + [SugarColumn(ColumnName = "qualified_number")] + public int? QualifiedNumber { get; set; } + + /// + /// 合格率 + /// + [SugarColumn(ColumnName = "qualified_rate")] + public decimal QualifiedRate { get; set; } + + /// + /// 抛光总数 + /// + [SugarColumn(ColumnName = "paoguang_total")] + public int? PaoguangTotal { get; set; } + + /// + /// 打磨总数 + /// + [SugarColumn(ColumnName = "damo_total")] + public int? DamoTotal { get; set; } + + /// + /// 报废总数 + /// + [SugarColumn(ColumnName = "baofei_total")] + public int? BaofeiTotal { get; set; } + + /// + /// 开始时间 + /// + [SugarColumn(ColumnName = "start_time")] + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + [SugarColumn(ColumnName = "end_time")] + public DateTime? EndTime { get; set; } + + /// + /// 类别（0-默认 1-抛光 2-打磨 3-报废 4-合计） + /// + public int? Type { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 油漆-缩孔 + /// + [SugarColumn(ColumnName = "paint_suokong")] + public int? PaintSuokong { get; set; } + + /// + /// 油漆-针孔 + /// + [SugarColumn(ColumnName = "paint_zhengkong")] + public int? PaintZhengkong { get; set; } + + /// + /// 油漆-失光 + /// + [SugarColumn(ColumnName = "paint_shiguang")] + public int? PaintShiguang { get; set; } + + /// + /// 油漆-色差 + /// + [SugarColumn(ColumnName = "paint_secha")] + public int? PaintSecha { get; set; } + + /// + /// 油漆-点子 + /// + [SugarColumn(ColumnName = "paint_dianzi")] + public int? PaintDianzi { get; set; } + + /// + /// 油漆-其他 + /// + [SugarColumn(ColumnName = "paint_other")] + public int? PaintOther { get; set; } + + /// + /// 设备-水斑 + /// + [SugarColumn(ColumnName = "device_shuiban")] + public int? DeviceShuiban { get; set; } + + /// + /// 设备-脏点 + /// + [SugarColumn(ColumnName = "device_zandian")] + public int? DeviceZandian { get; set; } + + /// + /// 设备-变形 + /// + [SugarColumn(ColumnName = "device_bianxing")] + public int? DeviceBianxing { get; set; } + + /// + /// 设备-油珠 + /// + [SugarColumn(ColumnName = "device_youzhu")] + public int? DeviceYouzhu { get; set; } + + /// + /// 设备-脱落 + /// + [SugarColumn(ColumnName = "device_tuoluo")] + public int? DeviceTuoluo { get; set; } + + /// + /// 设备-撞伤 + /// + [SugarColumn(ColumnName = "device_zhuangshang")] + public int? DeviceZhuangshang { get; set; } + + /// + /// 设备-其他 + /// + [SugarColumn(ColumnName = "device_other")] + public int? DeviceOther { get; set; } + + /// + /// 毛坯-毛刺 + /// + [SugarColumn(ColumnName = "blank_maoci")] + public int? BlankMaoci { get; set; } + + /// + /// 毛坯-缩印 + /// + [SugarColumn(ColumnName = "blank_suoyin")] + public int? BlankSuoyin { get; set; } + + /// + /// 毛坯-擦伤 + /// + [SugarColumn(ColumnName = "blank_canshuang")] + public int? BlankCanshuang { get; set; } + + /// + /// 毛坯-砂印 + /// + [SugarColumn(ColumnName = "blank_shaying")] + public int? BlankShaying { get; set; } + + /// + /// 毛坯-脏点 + /// + [SugarColumn(ColumnName = "blank_zangdian")] + public int? BlankZangdian { get; set; } + + /// + /// 毛坯-打磨 + /// + [SugarColumn(ColumnName = "blank_damo")] + public int? BlankDamo { get; set; } + + /// + /// 程序-流挂 + /// + [SugarColumn(ColumnName = "program_liuguang")] + public int? ProgramLiuguang { get; set; } + + /// + /// 程序-色漆缺漆 + /// + [SugarColumn(ColumnName = "program_seqiqueqi")] + public int? ProgramSeqiqueqi { get; set; } + + /// + /// 程序-清漆缺漆 + /// + [SugarColumn(ColumnName = "program_qingqiqueqi")] + public int? ProgramQingqiqueqi { get; set; } + + /// + /// 程序-桔皮 + /// + [SugarColumn(ColumnName = "program_jupi")] + public int? ProgramJupi { get; set; } + + /// + /// 程序-其他 + /// + [SugarColumn(ColumnName = "program_other")] + public int? ProgramOther { get; set; } + + /// + /// 班组操作-脱落擦伤 + /// + [SugarColumn(ColumnName = "team_tuoluocanshuang")] + public int? TeamTuoluocanshuang { get; set; } + + /// + /// 班组操作-清漆漆块 + /// + [SugarColumn(ColumnName = "team_qingqiqikuai")] + public int? TeamQingqiqikuai { get; set; } + + /// + /// 班组操作-色漆漆块 + /// + [SugarColumn(ColumnName = "team_seqiqikuai")] + public int? TeamSeqiqikuai { get; set; } + + /// + /// 班组操作-发花 + /// + [SugarColumn(ColumnName = "team_fahua")] + public int? TeamFahua { get; set; } + + /// + /// 班组操作-亮斑 + /// + [SugarColumn(ColumnName = "team_liangbang")] + public int? TeamLiangbang { get; set; } + + /// + /// 班组操作-喷漏 + /// + [SugarColumn(ColumnName = "team_penglou")] + public int? TeamPenglou { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 是否是返工件 + /// + [SugarColumn(ColumnName = "is_return_workpiece")] + public bool IsReturnWorkpiece { get; set; } = false; + + } +} \ No newline at end of file diff --git a/ZR.Model/MES/wms/WmPolishWorkQualityStatistics.cs b/ZR.Model/MES/wms/WmPolishWorkQualityStatistics.cs new file mode 100644 index 00000000..aec1ccbc --- /dev/null +++ b/ZR.Model/MES/wms/WmPolishWorkQualityStatistics.cs @@ -0,0 +1,295 @@ + +namespace ZR.Model.MES.wms +{ + /// + /// 抛光管理-抛光操作记录 + /// + [SugarTable("wm_polish_work_quality_statistics")] + public class WmPolishWorkQualityStatistics + { + /// + /// id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public string Id { get; set; } + + /// + /// 工单号 + /// + [SugarColumn(ColumnName = "workorder_id")] + public string WorkorderId { get; set; } + + /// + /// 零件号 + /// + public string Partnumber { get; set; } + + /// + /// 投入数 + /// + [SugarColumn(ColumnName = "require_number")] + public int? RequireNumber { get; set; } + + /// + /// 班组 + /// + public string Team { get; set; } + + /// + /// 合格数 + /// + [SugarColumn(ColumnName = "qualified_number")] + public int? QualifiedNumber { get; set; } + + /// + /// 合格率 + /// + [SugarColumn(ColumnName = "qualified_rate")] + public decimal QualifiedRate { get; set; } + + /// + /// 打磨总数 + /// + [SugarColumn(ColumnName = "damo_total")] + public int? DamoTotal { get; set; } + + /// + /// 报废总数 + /// + [SugarColumn(ColumnName = "baofei_total")] + public int? BaofeiTotal { get; set; } + + /// + /// 开始时间 + /// + [SugarColumn(ColumnName = "start_time")] + public DateTime? StartTime { get; set; } + + /// + /// 结束时间 + /// + [SugarColumn(ColumnName = "end_time")] + public DateTime? EndTime { get; set; } + + /// + /// 类别（0-默认 1-抛光 2-打磨 3-报废 4-合计） + /// + public int? Type { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 油漆-缩孔 + /// + [SugarColumn(ColumnName = "paint_suokong")] + public int? PaintSuokong { get; set; } + + /// + /// 油漆-针孔 + /// + [SugarColumn(ColumnName = "paint_zhengkong")] + public int? PaintZhengkong { get; set; } + + /// + /// 油漆-失光 + /// + [SugarColumn(ColumnName = "paint_shiguang")] + public int? PaintShiguang { get; set; } + + /// + /// 油漆-色差 + /// + [SugarColumn(ColumnName = "paint_secha")] + public int? PaintSecha { get; set; } + + /// + /// 油漆-点子 + /// + [SugarColumn(ColumnName = "paint_dianzi")] + public int? PaintDianzi { get; set; } + + /// + /// 油漆-其他 + /// + [SugarColumn(ColumnName = "paint_other")] + public int? PaintOther { get; set; } + + /// + /// 设备-水斑 + /// + [SugarColumn(ColumnName = "device_shuiban")] + public int? DeviceShuiban { get; set; } + + /// + /// 设备-脏点 + /// + [SugarColumn(ColumnName = "device_zandian")] + public int? DeviceZandian { get; set; } + + /// + /// 设备-变形 + /// + [SugarColumn(ColumnName = "device_bianxing")] + public int? DeviceBianxing { get; set; } + + /// + /// 设备-油珠 + /// + [SugarColumn(ColumnName = "device_youzhu")] + public int? DeviceYouzhu { get; set; } + + /// + /// 设备-脱落 + /// + [SugarColumn(ColumnName = "device_tuoluo")] + public int? DeviceTuoluo { get; set; } + + /// + /// 设备-撞伤 + /// + [SugarColumn(ColumnName = "device_zhuangshang")] + public int? DeviceZhuangshang { get; set; } + + /// + /// 设备-其他 + /// + [SugarColumn(ColumnName = "device_other")] + public int? DeviceOther { get; set; } + + /// + /// 毛坯-毛刺 + /// + [SugarColumn(ColumnName = "blank_maoci")] + public int? BlankMaoci { get; set; } + + /// + /// 毛坯-缩印 + /// + [SugarColumn(ColumnName = "blank_suoyin")] + public int? BlankSuoyin { get; set; } + + /// + /// 毛坯-擦伤 + /// + [SugarColumn(ColumnName = "blank_canshuang")] + public int? BlankCanshuang { get; set; } + + /// + /// 毛坯-砂印 + /// + [SugarColumn(ColumnName = "blank_shaying")] + public int? BlankShaying { get; set; } + + /// + /// 毛坯-脏点 + /// + [SugarColumn(ColumnName = "blank_zangdian")] + public int? BlankZangdian { get; set; } + + /// + /// 毛坯-打磨 + /// + [SugarColumn(ColumnName = "blank_damo")] + public int? BlankDamo { get; set; } + + /// + /// 程序-流挂 + /// + [SugarColumn(ColumnName = "program_liuguang")] + public int? ProgramLiuguang { get; set; } + + /// + /// 程序-色漆缺漆 + /// + [SugarColumn(ColumnName = "program_seqiqueqi")] + public int? ProgramSeqiqueqi { get; set; } + + /// + /// 程序-清漆缺漆 + /// + [SugarColumn(ColumnName = "program_qingqiqueqi")] + public int? ProgramQingqiqueqi { get; set; } + + /// + /// 程序-桔皮 + /// + [SugarColumn(ColumnName = "program_jupi")] + public int? ProgramJupi { get; set; } + + /// + /// 程序-其他 + /// + [SugarColumn(ColumnName = "program_other")] + public int? ProgramOther { get; set; } + + /// + /// 班组操作-脱落擦伤 + /// + [SugarColumn(ColumnName = "team_tuoluocanshuang")] + public int? TeamTuoluocanshuang { get; set; } + + /// + /// 班组操作-清漆漆块 + /// + [SugarColumn(ColumnName = "team_qingqiqikuai")] + public int? TeamQingqiqikuai { get; set; } + + /// + /// 班组操作-色漆漆块 + /// + [SugarColumn(ColumnName = "team_seqiqikuai")] + public int? TeamSeqiqikuai { get; set; } + + /// + /// 班组操作-发花 + /// + [SugarColumn(ColumnName = "team_fahua")] + public int? TeamFahua { get; set; } + + /// + /// 班组操作-亮斑 + /// + [SugarColumn(ColumnName = "team_liangbang")] + public int? TeamLiangbang { get; set; } + + /// + /// 班组操作-喷漏 + /// + [SugarColumn(ColumnName = "team_penglou")] + public int? TeamPenglou { get; set; } + + /// + /// 更新时间 + /// + [SugarColumn(ColumnName = "uPDATED_TIME")] + public DateTime? UpdatedTime { get; set; } + + /// + /// 更新人 + /// + [SugarColumn(ColumnName = "uPDATED_BY")] + public string UpdatedBy { get; set; } + + /// + /// 创建时间 + /// + [SugarColumn(ColumnName = "cREATED_TIME")] + public DateTime? CreatedTime { get; set; } + + /// + /// 创建人 + /// + [SugarColumn(ColumnName = "cREATED_BY")] + public string CreatedBy { get; set; } + + /// + /// 是否是返工件 + /// + [SugarColumn(ColumnName = "is_return_workpiece")] + public bool IsReturnWorkpiece { get; set; } = false; + + } +} \ No newline at end of file diff --git a/ZR.Service/mes/wms/IService/IWmGp12QualityStatisticsService.cs b/ZR.Service/mes/wms/IService/IWmGp12QualityStatisticsService.cs new file mode 100644 index 00000000..49c15050 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmGp12QualityStatisticsService.cs @@ -0,0 +1,20 @@ +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// GP12质检记录表service接口 + /// + public interface IWmGp12QualityStatisticsService : IBaseService + { + PagedInfo GetList(WmGp12QualityStatisticsQueryDto parm); + + WmGp12QualityStatistics GetInfo(string Id); + + WmGp12QualityStatistics AddWmGp12QualityStatistics(WmGp12QualityStatistics parm); + + int UpdateWmGp12QualityStatistics(WmGp12QualityStatistics parm); + } +} diff --git a/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs new file mode 100644 index 00000000..a68096d7 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmOneTimeInventoryService.cs @@ -0,0 +1,42 @@ +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// 一次合格品仓库service接口 + /// + public interface IWmOneTimeInventoryService : IBaseService + { + PagedInfo GetList(WmOneTimeInventoryQueryDto parm); + + WmOneTimeInventory GetInfo(string Id); + + WmOneTimeInventory AddWmOneTimeInventory(WmOneTimeInventory parm); + + int UpdateWmOneTimeInventory(WmOneTimeInventory parm); + + /// + /// 零件入库 + /// + /// + /// + int DoWmOneTimeWarehousing(WmOneTimeInventory parm); + + /// + /// 零件出库 + /// + /// + /// + int DoWmOneTimeRetrieval(WmOneTimeInventory parm); + + /// + /// 零件盘点 + /// + /// + /// + int DoWmOneTimeStocktaking(WmOneTimeInventory parm); + + } +} diff --git a/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs b/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs new file mode 100644 index 00000000..0ed9a8d8 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmOneTimeRecordService.cs @@ -0,0 +1,21 @@ +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// 一次合格品仓库记录表service接口 + /// + public interface IWmOneTimeRecordService : IBaseService + { + PagedInfo GetList(WmOneTimeRecordQueryDto parm); + + WmOneTimeRecord GetInfo(string Id); + + WmOneTimeRecord AddWmOneTimeRecord(WmOneTimeRecord parm); + + int UpdateWmOneTimeRecord(WmOneTimeRecord parm); + + } +} diff --git a/ZR.Service/mes/wms/IService/IWmPolishQualityStatisticsService.cs b/ZR.Service/mes/wms/IService/IWmPolishQualityStatisticsService.cs new file mode 100644 index 00000000..ec1ba09b --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmPolishQualityStatisticsService.cs @@ -0,0 +1,21 @@ +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// 抛光管理-质量统计service接口 + /// + public interface IWmPolishQualityStatisticsService : IBaseService + { + PagedInfo GetList(WmPolishQualityStatisticsQueryDto parm); + + WmPolishQualityStatistics GetInfo(string Id); + + WmPolishQualityStatistics AddWmPolishQualityStatistics(WmPolishQualityStatistics parm); + + int UpdateWmPolishQualityStatistics(WmPolishQualityStatistics parm); + + } +} diff --git a/ZR.Service/mes/wms/IService/IWmPolishWorkQualityStatisticsService.cs b/ZR.Service/mes/wms/IService/IWmPolishWorkQualityStatisticsService.cs new file mode 100644 index 00000000..482586a0 --- /dev/null +++ b/ZR.Service/mes/wms/IService/IWmPolishWorkQualityStatisticsService.cs @@ -0,0 +1,21 @@ +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; + +namespace ZR.Service.mes.wms.IService +{ + /// + /// 抛光管理-抛光操作service接口 + /// + public interface IWmPolishWorkQualityStatisticsService : IBaseService + { + PagedInfo GetList(WmPolishWorkQualityStatisticsQueryDto parm); + + WmPolishWorkQualityStatistics GetInfo(string Id); + + WmPolishWorkQualityStatistics AddWmPolishWorkQualityStatistics(WmPolishWorkQualityStatistics parm); + + int UpdateWmPolishWorkQualityStatistics(WmPolishWorkQualityStatistics parm); + + } +} diff --git a/ZR.Service/mes/wms/WmGp12QualityStatisticsService.cs b/ZR.Service/mes/wms/WmGp12QualityStatisticsService.cs new file mode 100644 index 00000000..01e54519 --- /dev/null +++ b/ZR.Service/mes/wms/WmGp12QualityStatisticsService.cs @@ -0,0 +1,71 @@ +using System; +using Infrastructure.Attribute; +using SqlSugar; +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Repository; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + /// + /// GP12质检记录表Service业务层处理 + /// + [AppService( + ServiceType = typeof(IWmGp12QualityStatisticsService), + ServiceLifetime = LifeTime.Transient + )] + public class WmGp12QualityStatisticsService + : BaseService, + IWmGp12QualityStatisticsService + { + /// + /// 查询GP12质检记录表列表 + /// + /// + /// + public PagedInfo GetList(WmGp12QualityStatisticsQueryDto parm) + { + var predicate = Expressionable.Create(); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public WmGp12QualityStatistics GetInfo(string Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加GP12质检记录表 + /// + /// + /// + public WmGp12QualityStatistics AddWmGp12QualityStatistics(WmGp12QualityStatistics model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改GP12质检记录表 + /// + /// + /// + public int UpdateWmGp12QualityStatistics(WmGp12QualityStatistics model) + { + return Update(model, true); + } + } +} diff --git a/ZR.Service/mes/wms/WmOneTimeInventoryService.cs b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs new file mode 100644 index 00000000..aa31d7cd --- /dev/null +++ b/ZR.Service/mes/wms/WmOneTimeInventoryService.cs @@ -0,0 +1,401 @@ +using System; +using Infrastructure.Attribute; +using SqlSugar; +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Repository; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + /// + /// 一次合格品仓库Service业务层处理 + /// + [AppService( + ServiceType = typeof(IWmOneTimeInventoryService), + ServiceLifetime = LifeTime.Transient + )] + public class WmOneTimeInventoryService + : BaseService, + IWmOneTimeInventoryService + { + /// + /// 查询一次合格品仓库列表 + /// + /// + /// + public PagedInfo GetList(WmOneTimeInventoryQueryDto parm) + { + List partnumberByDescription = new(); + if (parm != null && !string.IsNullOrEmpty(parm.Description)) + { + partnumberByDescription = Context + .Queryable() + .Where(it => it.Description.Contains(parm.Description)) + .Select(it => it.Partnumber) + .ToList(); + } + var predicate = Expressionable + .Create() + .AndIF( + !string.IsNullOrEmpty(parm.Description), + it => partnumberByDescription.Contains(it.Partnumber) + ) + .AndIF( + !string.IsNullOrEmpty(parm.Partnumber), + it => it.Partnumber.Contains(parm.Partnumber) + ) + .AndIF(parm.Status > -1, it => it.Status == parm.Status) + .AndIF(parm.Type > 0, it => it.Type == parm.Type); + + var response = Queryable() + .Where(predicate.ToExpression()) + .OrderByDescending(it => it.UpdatedTime) + .ToPage(parm); + if (response.Result.Count > 0) + { + foreach (WmOneTimeInventoryDto item in response.Result) + { + WmMaterial material = Context + .Queryable() + .Where(it => it.Partnumber == item.Partnumber) + .Where(it => it.Type == 1) + .Where(it => it.Status == 1) + .First(); + if (material == null) + { + item.Description = "此零件号不在物料清单内！"; + continue; + } + item.Color = material.Color; + item.Specification = material.Specification; + item.Description = !string.IsNullOrEmpty(material.Description) + ? material.Description + : material.ProductName; + } + } + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public WmOneTimeInventory GetInfo(string Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加一次合格品仓库 + /// + /// + /// + public WmOneTimeInventory AddWmOneTimeInventory(WmOneTimeInventory model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改一次合格品仓库 + /// + /// + /// + public int UpdateWmOneTimeInventory(WmOneTimeInventory model) + { + return Update(model, true); + } + + /// + /// 新增仓库操作记录 + /// + /// 抛光仓库主键 + /// 同批功能识别编号 + /// 零件号 + /// 类别 + /// 操作数字 + /// 备注 + /// 创建人 + /// + public int AddOneTimeRecord( + string fkInventoryId, + string code, + string partnumber, + int type, + int? changeQuantity, + DateTime? actionTime, + string remark, + string createdBy + ) + { + WmOneTimeRecord newOneTimeRecord = + new() + { + Id = SnowFlakeSingle.Instance.NextId().ToString(), + FkInventoryId = fkInventoryId, + Code = code, + Partnumber = partnumber, + BlankNum = "", + ChangeType = type, + ChangeQuantity = changeQuantity ?? 0, + ActionTime = actionTime, + Status = 1, + Remark = remark, + CreatedBy = createdBy, + CreatedTime = DateTime.Now.ToLocalTime(), + UpdatedBy = createdBy, + UpdatedTime = DateTime.Now.ToLocalTime(), + }; + + return Context.Insertable(newOneTimeRecord).ExecuteCommand(); + } + + public int DoWmOneTimeWarehousing(WmOneTimeInventory parm) + { + try + { + Context.Ado.BeginTran(); + // 零件号检查 + string partnumber = parm.Partnumber; + // 检查是否存在库中 + WmOneTimeInventory oneTimeInventory = Context + .Queryable() + .Where(it => it.Partnumber == partnumber) + .Where(it => it.Type == parm.Type) + .Where(it => it.Status == 1) + .First(); + if (oneTimeInventory == null) + { + // 为空则新增库 + WmOneTimeInventory newWmOneTimeInventory = + new() + { + Id = SnowFlakeSingle.Instance.NextId().ToString(), + BlankNum = "", + Partnumber = partnumber, + Type = parm.Type, + Quantity = parm.Quantity, + MaxNum = 0, + MinNum = 0, + WarnNum = 0, + Status = 1, + Remark = "系统自动创建库", + CreatedBy = parm.CreatedBy, + CreatedTime = DateTime.Now.ToLocalTime(), + UpdatedBy = parm.CreatedBy, + UpdatedTime = DateTime.Now.ToLocalTime(), + }; + WmOneTimeInventory addWmOneTimeInventory = Context + .Insertable(newWmOneTimeInventory) + .ExecuteReturnEntity(); + string code = !string.IsNullOrEmpty(parm.WorkOrder) + ? parm.WorkOrder + : SnowFlakeSingle.Instance.NextId().ToString(); + string remark = "初次创建仓库，新增入库数据 " + parm.Remark; + int successNum = AddOneTimeRecord( + addWmOneTimeInventory.Id, + code, + partnumber, + 1, + parm.Quantity, + parm.ActionTime, + remark, + parm.CreatedBy + ); + if (successNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("入库日志添加失败"); + } + } + else + { + oneTimeInventory.Quantity += parm.Quantity; + int updateNum = Context.Updateable(oneTimeInventory).ExecuteCommand(); + if (updateNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("修改一次合格仓库数据失败"); + } + // 已有则新增记录 + string code = !string.IsNullOrEmpty(parm.WorkOrder) + ? parm.WorkOrder + : SnowFlakeSingle.Instance.NextId().ToString(); + int successNum = AddOneTimeRecord( + oneTimeInventory.Id, + code, + partnumber, + 1, + parm.Quantity, + parm.ActionTime, + parm.Remark, + parm.CreatedBy + ); + if (successNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("入库日志添加失败"); + } + } + Context.Ado.CommitTran(); + return 1; + } + catch (Exception e) + { + Context.Ado.RollbackTran(); + throw new Exception(e.Message); + } + } + + public int DoWmOneTimeRetrieval(WmOneTimeInventory parm) + { + try + { + Context.Ado.BeginTran(); + // 零件号检查 + string partnumber = parm.Partnumber; + // 检查是否存在库中 + WmOneTimeInventory oneTimeInventory = Context + .Queryable() + .Where(it => it.Partnumber == partnumber) + .Where(it => it.Type == parm.Type) + .Where(it => it.Status == 1) + .First(); + if (oneTimeInventory == null) + { + // 为空则新增库 + WmOneTimeInventory newWmOneTimeInventory = + new() + { + Id = SnowFlakeSingle.Instance.NextId().ToString(), + BlankNum = "", + Partnumber = partnumber, + Type = parm.Type, + Quantity = parm.Quantity * -1, + MaxNum = 0, + MinNum = 0, + WarnNum = 0, + Status = 1, + Remark = "系统自动创建库", + CreatedBy = parm.CreatedBy, + CreatedTime = DateTime.Now.ToLocalTime(), + UpdatedBy = parm.CreatedBy, + UpdatedTime = DateTime.Now.ToLocalTime(), + }; + WmOneTimeInventory addWmOneTimeInventory = Context + .Insertable(newWmOneTimeInventory) + .ExecuteReturnEntity(); + string code = !string.IsNullOrEmpty(parm.WorkOrder) + ? parm.WorkOrder + : SnowFlakeSingle.Instance.NextId().ToString(); + string remark = "初次创建仓库，新增手动出库数据" + parm.Remark; + int successNum = AddOneTimeRecord( + addWmOneTimeInventory.Id, + code, + partnumber, + 2, + parm.Quantity, + parm.ActionTime, + remark, + parm.CreatedBy + ); + if (successNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("出库日志添加失败"); + } + } + else + { + oneTimeInventory.Quantity -= parm.Quantity; + int updateNum = Context.Updateable(oneTimeInventory).ExecuteCommand(); + if (updateNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("修改一次合格仓库零件数失败"); + } + // 已有则新增记录 + string code = !string.IsNullOrEmpty(parm.WorkOrder) + ? parm.WorkOrder + : SnowFlakeSingle.Instance.NextId().ToString(); + int successNum = AddOneTimeRecord( + oneTimeInventory.Id, + code, + partnumber, + 2, + parm.Quantity, + parm.ActionTime, + parm.Remark, + parm.CreatedBy + ); + if (successNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("出库日志添加失败"); + } + } + Context.Ado.CommitTran(); + return 1; + } + catch (Exception e) + { + Context.Ado.RollbackTran(); + throw new Exception(e.Message); + } + } + + public int DoWmOneTimeStocktaking(WmOneTimeInventory parm) + { + if (parm.Quantity < 0) + { + throw new Exception("修改的零件数小于0"); + } + try + { + Context.Ado.BeginTran(); + // 检查是否存在库中 + WmOneTimeInventory oneTImeInventory = Context + .Queryable() + .Where(it => it.Id == parm.Id) + .Where(it => it.Status == 1) + .First(); + if (oneTImeInventory == null) + { + Context.Ado.RollbackTran(); + throw new Exception("盘点记录不存在" + parm.Id); + } + Context.Updateable(parm).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); + // 已有则新增记录 + string code = !string.IsNullOrEmpty(parm.WorkOrder) + ? parm.WorkOrder + : SnowFlakeSingle.Instance.NextId().ToString(); + int successNum = AddOneTimeRecord( + parm.Id, + code, + parm.Partnumber, + 3, + parm.Quantity, + parm.ActionTime, + parm.Remark, + parm.CreatedBy + ); + if (successNum == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("盘点日志添加失败"); + } + Context.Ado.CommitTran(); + return successNum; + } + catch (Exception e) + { + Context.Ado.RollbackTran(); + throw new Exception(e.Message); + } + } + } +} diff --git a/ZR.Service/mes/wms/WmOneTimeRecordService.cs b/ZR.Service/mes/wms/WmOneTimeRecordService.cs new file mode 100644 index 00000000..6ee9566d --- /dev/null +++ b/ZR.Service/mes/wms/WmOneTimeRecordService.cs @@ -0,0 +1,109 @@ +using Infrastructure.Attribute; +using SqlSugar; +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Repository; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + /// + /// 一次合格品仓库记录表Service业务层处理 + /// + [AppService( + ServiceType = typeof(IWmOneTimeRecordService), + ServiceLifetime = LifeTime.Transient + )] + public class WmOneTimeRecordService : BaseService, IWmOneTimeRecordService + { + /// + /// 查询一次合格品仓库记录表列表 + /// + /// + /// + public PagedInfo GetList(WmOneTimeRecordQueryDto parm) + { + var predicate = Expressionable + .Create() + .AndIF( + !string.IsNullOrEmpty(parm.Partnumber), + it => it.Partnumber.Contains(parm.Partnumber) + ) + .AndIF( + !string.IsNullOrEmpty(parm.BlankNum), + it => it.BlankNum.Contains(parm.BlankNum) + ) + .AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark)) + .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) + .AndIF( + !string.IsNullOrEmpty(parm.FkInventoryId), + it => it.FkInventoryId == parm.FkInventoryId + ) + .AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id) + .AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType) + .AndIF( + parm.StartActionTime != null, + it => parm.StartActionTime.Value.ToLocalTime() <= it.ActionTime + ) + .AndIF( + parm.EndActionTime != null, + it => parm.EndActionTime.Value.ToLocalTime() >= it.ActionTime + ); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public WmOneTimeRecord GetInfo(string Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加一次合格品仓库记录表 + /// + /// + /// + public WmOneTimeRecord AddWmOneTimeRecord(WmOneTimeRecord model) + { + return Context.Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改一次合格品仓库记录表 + /// + /// + /// + public int UpdateWmOneTimeRecord(WmOneTimeRecord model) + { + //var response = Update(w => w.Id == model.Id, it => new WmOneTimeRecord() + //{ + // Code = model.Code, + // Partnumber = model.Partnumber, + // BlankNum = model.BlankNum, + // ChangeType = model.ChangeType, + // ChangeQuantity = model.ChangeQuantity, + // ActionTime = model.ActionTime, + // Status = model.Status, + // Remark = model.Remark, + // CreatedBy = model.CreatedBy, + // CreatedTime = model.CreatedTime, + // UpdatedBy = model.UpdatedBy, + // UpdatedTime = model.UpdatedTime, + //}); + //return response; + return Update(model, true); + } + } +} diff --git a/ZR.Service/mes/wms/WmPolishInventoryService.cs b/ZR.Service/mes/wms/WmPolishInventoryService.cs index 2bf09fb8..c388dcc9 100644 --- a/ZR.Service/mes/wms/WmPolishInventoryService.cs +++ b/ZR.Service/mes/wms/WmPolishInventoryService.cs @@ -425,7 +425,11 @@ namespace ZR.Service.mes.wms .Where(it => it.Id == parm.Id) .Where(it => it.Status == 1) .First(); - polishInventory.Quantity = parm.Quantity; + if (polishInventory == null) + { + Context.Ado.RollbackTran(); + throw new Exception("盘点记录不存在" + parm.Id); + } Context.Updateable(parm).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand(); // 已有则新增记录 string code = SnowFlakeSingle.Instance.NextId().ToString(); diff --git a/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs new file mode 100644 index 00000000..0d591777 --- /dev/null +++ b/ZR.Service/mes/wms/WmPolishQualityStatisticsService.cs @@ -0,0 +1,240 @@ +using System; +using Infrastructure.Attribute; +using SqlSugar; +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Repository; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + /// + /// 抛光管理-质量统计Service业务层处理 + /// + [AppService( + ServiceType = typeof(IWmPolishQualityStatisticsService), + ServiceLifetime = LifeTime.Transient + )] + public class WmPolishQualityStatisticsService + : BaseService, + IWmPolishQualityStatisticsService + { + /// + /// 查询抛光管理-质量统计列表 + /// + /// + /// + public PagedInfo GetList( + WmPolishQualityStatisticsQueryDto parm + ) + { + var predicate = Expressionable + .Create() + .AndIF( + !string.IsNullOrEmpty(parm.WorkorderId), + it => it.WorkorderId.Contains(parm.WorkorderId) + ) + .AndIF(!string.IsNullOrEmpty(parm.Team), it => it.Team.Contains(parm.Team)) + .AndIF( + !string.IsNullOrEmpty(parm.Partnumber), + it => it.Partnumber.Contains(parm.Partnumber) + ) + .AndIF( + !string.IsNullOrEmpty(parm.CreatedBy), + it => it.CreatedBy.Contains(parm.CreatedBy) + ) + .AndIF( + parm.StartTime != null, + it => it.StartTime >= parm.StartTime.Value.ToLocalTime() + ) + .AndIF( + parm.EndTime != null, + it => it.StartTime <= parm.StartTime.Value.ToLocalTime() + ); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + if (response.Result.Count > 0) + { + foreach (WmPolishQualityStatisticsDto item in response.Result) + { + WmMaterial material = Context + .Queryable() + .Where(it => it.Partnumber == item.Partnumber) + .Where(it => it.Type == 1) + .Where(it => it.Status == 1) + .First(); + if (material == null) + { + item.Description = "此零件号不在物料清单内！"; + continue; + } + item.QualifiedRateStr = Math.Ceiling(item.QualifiedRate).ToString() + "%"; + item.Color = material.Color; + item.Specification = material.Specification; + item.Description = !string.IsNullOrEmpty(material.Description) + ? material.Description + : material.ProductName; + } + } + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public WmPolishQualityStatistics GetInfo(string Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加抛光管理-质量统计 + /// + /// + /// + public WmPolishQualityStatistics AddWmPolishQualityStatistics( + WmPolishQualityStatistics model + ) + { + try + { + Context.Ado.BeginTran(); + if ( + model.RequireNumber + != ( + model.QualifiedNumber + + model.PaoguangTotal + + model.DamoTotal + + model.BaofeiTotal + ) + ) + { + throw new Exception("投入数与合格数，抛光总数，打磨数，报废数不符合，请检查"); + } + model.Id = SnowFlakeSingle.instance.NextId().ToString(); + model.Type = 0; + decimal qualifiedRate = 0.0m; + if (model.QualifiedNumber != 0) + { + qualifiedRate = + (decimal)model.QualifiedNumber / model.RequireNumber * 100 ?? 0.0m; + } + model.QualifiedRate = qualifiedRate; + WmPolishInventoryService inventoryService = new(); + //TODO 合格品检查是否是门把手，是进入成品库，不是进入一次合格品库 + + //抛光品重新进入抛光仓库 + if (model.PaoguangTotal > 0) + { + WmPolishInventory wmPolishInventory = + new() + { + Partnumber = model.Partnumber, + Type = model.IsReturnWorkpiece ? 2 : 1, + Quantity = model.PaoguangTotal, + CreatedBy = model.CreatedBy, + ActionTime = DateTime.Now, + Remark = + "抛光质检记录入库:抛光数" + + model.PaoguangTotal + + "。记录时间" + + model.CreatedTime.Value.ToLocalTime().ToString() + }; + int res1 = inventoryService.DoWmPolishWarehousing(wmPolishInventory); + if (res1 == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("抛光质检记录入库失败"); + } + } + //合格品，报废，打磨品 扣除抛光仓库库存 + if ((model.BaofeiTotal + model.DamoTotal + model.QualifiedNumber) > 0) + { + WmPolishInventory wmPolishInventory = + new() + { + Partnumber = model.Partnumber, + Type = model.IsReturnWorkpiece ? 2 : 1, + Quantity = ( + model.BaofeiTotal + model.DamoTotal + model.QualifiedNumber + ), + CreatedBy = model.CreatedBy, + ActionTime = DateTime.Now, + Remark = + "抛光质检记录出库:合格数" + + model.QualifiedNumber + + "、打磨数" + + model.DamoTotal + + "、报废数" + + model.BaofeiTotal + + "。记录时间" + + model.CreatedTime.Value.ToLocalTime().ToString() + }; + int res1 = inventoryService.DoWmPolishRetrieval(wmPolishInventory); + if (res1 == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("抛光质检记录出库失败"); + } + } + + WmPolishQualityStatistics res3 = Context.Insertable(model).ExecuteReturnEntity(); + if (res3 == null) + { + Context.Ado.RollbackTran(); + throw new Exception("插入抛光质检记录失败"); + } + Context.Ado.CommitTran(); + return res3; + } + catch (Exception e) + { + Context.Ado.RollbackTran(); + throw new Exception(e.Message); + } + } + + /// + /// 修改抛光管理-质量统计 + /// + /// + /// + public int UpdateWmPolishQualityStatistics(WmPolishQualityStatistics model) + { + try + { + if ( + model.RequireNumber + != ( + model.QualifiedNumber + + model.PaoguangTotal + + model.DamoTotal + + model.BaofeiTotal + ) + ) + { + throw new Exception("投入数与合格数，抛光总数，打磨数，报废数不符合，请检查"); + } + decimal qualifiedRate = 0.0m; + if (model.QualifiedNumber != 0) + { + qualifiedRate = + (decimal)model.QualifiedNumber / model.RequireNumber * 100 ?? 0.0m; + } + model.QualifiedRate = qualifiedRate; + return Update(model, true); + } + catch (Exception e) + { + throw new Exception(e.Message); + } + } + } +} diff --git a/ZR.Service/mes/wms/WmPolishWorkQualityStatisticsService.cs b/ZR.Service/mes/wms/WmPolishWorkQualityStatisticsService.cs new file mode 100644 index 00000000..aaca737e --- /dev/null +++ b/ZR.Service/mes/wms/WmPolishWorkQualityStatisticsService.cs @@ -0,0 +1,226 @@ +using System; +using Infrastructure.Attribute; +using SqlSugar; +using ZR.Model; +using ZR.Model.MES.wms; +using ZR.Model.MES.wms.Dto; +using ZR.Repository; +using ZR.Service.mes.wms.IService; + +namespace ZR.Service.mes.wms +{ + /// + /// 抛光管理-抛光操作Service业务层处理 + /// + [AppService( + ServiceType = typeof(IWmPolishWorkQualityStatisticsService), + ServiceLifetime = LifeTime.Transient + )] + public class WmPolishWorkQualityStatisticsService + : BaseService, + IWmPolishWorkQualityStatisticsService + { + /// + /// 查询抛光管理-质量统计列表 + /// + /// + /// + public PagedInfo GetList( + WmPolishWorkQualityStatisticsQueryDto parm + ) + { + var predicate = Expressionable + .Create() + .AndIF( + !string.IsNullOrEmpty(parm.WorkorderId), + it => it.WorkorderId.Contains(parm.WorkorderId) + ) + .AndIF(!string.IsNullOrEmpty(parm.Team), it => it.Team.Contains(parm.Team)) + .AndIF( + !string.IsNullOrEmpty(parm.Partnumber), + it => it.Partnumber.Contains(parm.Partnumber) + ) + .AndIF( + !string.IsNullOrEmpty(parm.CreatedBy), + it => it.CreatedBy.Contains(parm.CreatedBy) + ) + .AndIF( + parm.StartTime != null, + it => it.StartTime >= parm.StartTime.Value.ToLocalTime() + ) + .AndIF( + parm.EndTime != null, + it => it.StartTime <= parm.StartTime.Value.ToLocalTime() + ); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + if (response.Result.Count > 0) + { + foreach (WmPolishWorkQualityStatisticsDto item in response.Result) + { + WmMaterial material = Context + .Queryable() + .Where(it => it.Partnumber == item.Partnumber) + .Where(it => it.Type == 1) + .Where(it => it.Status == 1) + .First(); + if (material == null) + { + item.Description = "此零件号不在物料清单内！"; + continue; + } + item.QualifiedRateStr = Math.Ceiling(item.QualifiedRate).ToString() + "%"; + item.Color = material.Color; + item.Specification = material.Specification; + item.Description = !string.IsNullOrEmpty(material.Description) + ? material.Description + : material.ProductName; + } + } + return response; + } + + /// + /// 获取详情 + /// + /// + /// + public WmPolishWorkQualityStatistics GetInfo(string Id) + { + var response = Queryable().Where(x => x.Id == Id).First(); + + return response; + } + + /// + /// 添加抛光管理-质量统计 + /// + /// + /// + public WmPolishWorkQualityStatistics AddWmPolishWorkQualityStatistics( + WmPolishWorkQualityStatistics model + ) + { + try + { + Context.Ado.BeginTran(); + if ( + model.RequireNumber + != (model.QualifiedNumber + model.DamoTotal + model.BaofeiTotal) + ) + { + throw new Exception("投入数与合格数，打磨数，报废数不符合，请检查"); + } + model.Id = SnowFlakeSingle.instance.NextId().ToString(); + model.Type = 0; + decimal qualifiedRate = 0.0m; + if (model.QualifiedNumber != 0) + { + qualifiedRate = + (decimal)model.QualifiedNumber / model.RequireNumber * 100 ?? 0.0m; + } + model.QualifiedRate = qualifiedRate; + WmPolishInventoryService inventoryService = new(); + //合格品重新进入抛光仓库 + if (model.QualifiedNumber > 0) + { + WmPolishInventory wmPolishInventory = + new() + { + Partnumber = model.Partnumber, + Type = model.IsReturnWorkpiece ? 2 : 1, + Quantity = model.QualifiedNumber, + CreatedBy = model.CreatedBy, + ActionTime = DateTime.Now, + Remark = + "抛光操作记录入库:合格数" + + model.QualifiedNumber + + "。记录时间" + + model.CreatedTime.Value.ToLocalTime().ToString() + }; + int res1 = inventoryService.DoWmPolishWarehousing(wmPolishInventory); + if (res1 == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("抛光操作记录入库失败"); + } + } + //报废，打磨品 扣除抛光仓库库存 + if ((model.BaofeiTotal + model.DamoTotal) > 0) + { + WmPolishInventory wmPolishInventory = + new() + { + Partnumber = model.Partnumber, + Type = model.IsReturnWorkpiece ? 2 : 1, + Quantity = (model.BaofeiTotal + model.DamoTotal), + CreatedBy = model.CreatedBy, + ActionTime = DateTime.Now, + Remark = + "抛光操作记录出库:打磨数" + + model.DamoTotal + + "、报废数" + + model.BaofeiTotal + + "。记录时间" + + model.CreatedTime.Value.ToLocalTime().ToString() + }; + int res1 = inventoryService.DoWmPolishRetrieval(wmPolishInventory); + if (res1 == 0) + { + Context.Ado.RollbackTran(); + throw new Exception("抛光操作记录出库失败"); + } + } + + WmPolishWorkQualityStatistics res3 = Context + .Insertable(model) + .ExecuteReturnEntity(); + if (res3 == null) + { + Context.Ado.RollbackTran(); + throw new Exception("插入抛光操作记录失败"); + } + Context.Ado.CommitTran(); + return res3; + } + catch (Exception e) + { + Context.Ado.RollbackTran(); + throw new Exception(e.Message); + } + } + + /// + /// 修改抛光管理-质量统计 + /// + /// + /// + public int UpdateWmPolishWorkQualityStatistics(WmPolishWorkQualityStatistics model) + { + try + { + if ( + model.RequireNumber + != (model.QualifiedNumber + model.DamoTotal + model.BaofeiTotal) + ) + { + throw new Exception("投入数与合格数，打磨数，报废数不符合，请检查"); + } + decimal qualifiedRate = 0.0m; + if (model.QualifiedNumber != 0) + { + qualifiedRate = + (decimal)model.QualifiedNumber / model.RequireNumber * 100 ?? 0.0m; + } + model.QualifiedRate = qualifiedRate; + return Update(model, true); + } + catch (Exception e) + { + throw new Exception(e.Message); + } + } + } +}