Pārlūkot izejas kodu

完成库存统计界面

zhaoyaxiong 2 gadi atpakaļ
vecāks
revīzija
a8f507ed82
30 mainītis faili ar 1691 papildinājumiem un 12 dzēšanām
  1. 125 0
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/QaInspectRecordController.cs
  2. 125 0
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/SapBomRecordController.cs
  3. 125 0
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/SapDeliverRecordController.cs
  4. 12 1
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/StkBalanceDtlController.cs
  5. 317 0
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/ZRModel.xml
  6. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/64A3C733C7328DAF.png
  7. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/6D501CC051C039A5.png
  8. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/7516F4C92026514C.png
  9. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/762840DC715445BE.png
  10. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/B60A185D3B6B177A.png
  11. BIN
      ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/F78ABA63F3992DA0.png
  12. 2 0
      ZrAdminNetCore-net7.0/ZR.Model/Dto/BasBinDto.cs
  13. 81 0
      ZrAdminNetCore-net7.0/ZR.Model/Dto/QaInspectRecordDto.cs
  14. 70 0
      ZrAdminNetCore-net7.0/ZR.Model/Dto/SapBomRecordDto.cs
  15. 80 0
      ZrAdminNetCore-net7.0/ZR.Model/Dto/SapDeliverRecordDto.cs
  16. 28 8
      ZrAdminNetCore-net7.0/ZR.Model/Dto/StkBalanceDtlDto.cs
  17. 2 0
      ZrAdminNetCore-net7.0/ZR.Model/Models/BasBin.cs
  18. 100 0
      ZrAdminNetCore-net7.0/ZR.Model/Models/QaInspectRecord.cs
  19. 87 0
      ZrAdminNetCore-net7.0/ZR.Model/Models/SapBomRecord.cs
  20. 104 0
      ZrAdminNetCore-net7.0/ZR.Model/Models/SapDeliverRecord.cs
  21. 8 1
      ZrAdminNetCore-net7.0/ZR.Model/Models/StkBalanceDtl.cs
  22. 1 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/BasBinService.cs
  23. 25 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/IQaInspectRecordService.cs
  24. 25 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/ISapBomRecordService.cs
  25. 25 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/ISapDeliverRecordService.cs
  26. 1 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/IStkBalanceDtlService.cs
  27. 95 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/QaInspectRecordService.cs
  28. 92 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/SapBomRecordService.cs
  29. 95 0
      ZrAdminNetCore-net7.0/ZR.Service/Business/SapDeliverRecordService.cs
  30. 66 2
      ZrAdminNetCore-net7.0/ZR.Service/Business/StkBalanceDtlService.cs

+ 125 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/QaInspectRecordController.cs

@@ -0,0 +1,125 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Business.IBusinessService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 质检管理/质检记录表Controller
+    /// 
+    /// @tableName qa_inspect_record
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [Verify]
+    [Route("business/QaInspectRecord")]
+    public class QaInspectRecordController : BaseController
+    {
+        /// <summary>
+        /// 质检管理/质检记录表接口
+        /// </summary>
+        private readonly IQaInspectRecordService _QaInspectRecordService;
+
+        public QaInspectRecordController(IQaInspectRecordService QaInspectRecordService)
+        {
+            _QaInspectRecordService = QaInspectRecordService;
+        }
+
+        /// <summary>
+        /// 查询质检管理/质检记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:list")]
+        public IActionResult QueryQaInspectRecord([FromQuery] QaInspectRecordQueryDto parm)
+        {
+            var response = _QaInspectRecordService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询质检管理/质检记录表详情
+        /// </summary>
+        /// <param name="InspectId"></param>
+        /// <returns></returns>
+        [HttpGet("{InspectId}")]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:query")]
+        public IActionResult GetQaInspectRecord(int InspectId)
+        {
+            var response = _QaInspectRecordService.GetFirst(x => x.InspectId == InspectId);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 添加质检管理/质检记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:add")]
+        [Log(Title = "质检管理/质检记录表", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddQaInspectRecord([FromBody] QaInspectRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            var modal = parm.Adapt<QaInspectRecord>().ToCreate(HttpContext);
+
+            var response = _QaInspectRecordService.AddQaInspectRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 更新质检管理/质检记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:edit")]
+        [Log(Title = "质检管理/质检记录表", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateQaInspectRecord([FromBody] QaInspectRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
+            var modal = parm.Adapt<QaInspectRecord>().ToUpdate(HttpContext);
+
+            var response = _QaInspectRecordService.UpdateQaInspectRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除质检管理/质检记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:qainspectrecord:delete")]
+        [Log(Title = "质检管理/质检记录表", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteQaInspectRecord(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _QaInspectRecordService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+
+
+    }
+}

+ 125 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/SapBomRecordController.cs

@@ -0,0 +1,125 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Business.IBusinessService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表Controller
+    /// 
+    /// @tableName sap_bom_record
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [Verify]
+    [Route("business/SapBomRecord")]
+    public class SapBomRecordController : BaseController
+    {
+        /// <summary>
+        /// 接口管理/SAP关键件清单记录表接口
+        /// </summary>
+        private readonly ISapBomRecordService _SapBomRecordService;
+
+        public SapBomRecordController(ISapBomRecordService SapBomRecordService)
+        {
+            _SapBomRecordService = SapBomRecordService;
+        }
+
+        /// <summary>
+        /// 查询接口管理/SAP关键件清单记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:sapbomrecord:list")]
+        public IActionResult QuerySapBomRecord([FromQuery] SapBomRecordQueryDto parm)
+        {
+            var response = _SapBomRecordService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询接口管理/SAP关键件清单记录表详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "business:sapbomrecord:query")]
+        public IActionResult GetSapBomRecord(int Id)
+        {
+            var response = _SapBomRecordService.GetFirst(x => x.Id == Id);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 添加接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:sapbomrecord:add")]
+        [Log(Title = "接口管理/SAP关键件清单记录表", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddSapBomRecord([FromBody] SapBomRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            var modal = parm.Adapt<SapBomRecord>().ToCreate(HttpContext);
+
+            var response = _SapBomRecordService.AddSapBomRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 更新接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:sapbomrecord:edit")]
+        [Log(Title = "接口管理/SAP关键件清单记录表", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateSapBomRecord([FromBody] SapBomRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
+            var modal = parm.Adapt<SapBomRecord>().ToUpdate(HttpContext);
+
+            var response = _SapBomRecordService.UpdateSapBomRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:sapbomrecord:delete")]
+        [Log(Title = "接口管理/SAP关键件清单记录表", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteSapBomRecord(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _SapBomRecordService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+
+
+    }
+}

+ 125 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/SapDeliverRecordController.cs

@@ -0,0 +1,125 @@
+using Infrastructure;
+using Infrastructure.Attribute;
+using Infrastructure.Enums;
+using Infrastructure.Model;
+using Mapster;
+using Microsoft.AspNetCore.Mvc;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Service.Business.IBusinessService;
+using ZR.Admin.WebApi.Extensions;
+using ZR.Admin.WebApi.Filters;
+using ZR.Common;
+
+namespace ZR.Admin.WebApi.Controllers
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表Controller
+    /// 
+    /// @tableName sap_deliver_record
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [Verify]
+    [Route("business/SapDeliverRecord")]
+    public class SapDeliverRecordController : BaseController
+    {
+        /// <summary>
+        /// 接口管理/SAP交验单记录表接口
+        /// </summary>
+        private readonly ISapDeliverRecordService _SapDeliverRecordService;
+
+        public SapDeliverRecordController(ISapDeliverRecordService SapDeliverRecordService)
+        {
+            _SapDeliverRecordService = SapDeliverRecordService;
+        }
+
+        /// <summary>
+        /// 查询接口管理/SAP交验单记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("list")]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:list")]
+        public IActionResult QuerySapDeliverRecord([FromQuery] SapDeliverRecordQueryDto parm)
+        {
+            var response = _SapDeliverRecordService.GetList(parm);
+            return SUCCESS(response);
+        }
+
+
+        /// <summary>
+        /// 查询接口管理/SAP交验单记录表详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("{Id}")]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:query")]
+        public IActionResult GetSapDeliverRecord(int Id)
+        {
+            var response = _SapDeliverRecordService.GetFirst(x => x.Id == Id);
+
+            return SUCCESS(response);
+        }
+
+        /// <summary>
+        /// 添加接口管理/SAP交验单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:add")]
+        [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.INSERT)]
+        public IActionResult AddSapDeliverRecord([FromBody] SapDeliverRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求参数错误");
+            }
+            var modal = parm.Adapt<SapDeliverRecord>().ToCreate(HttpContext);
+
+            var response = _SapDeliverRecordService.AddSapDeliverRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 更新接口管理/SAP交验单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPut]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:edit")]
+        [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.UPDATE)]
+        public IActionResult UpdateSapDeliverRecord([FromBody] SapDeliverRecordDto parm)
+        {
+            if (parm == null)
+            {
+                throw new CustomException("请求实体不能为空");
+            }
+            var modal = parm.Adapt<SapDeliverRecord>().ToUpdate(HttpContext);
+
+            var response = _SapDeliverRecordService.UpdateSapDeliverRecord(modal);
+
+            return ToResponse(response);
+        }
+
+        /// <summary>
+        /// 删除接口管理/SAP交验单记录表
+        /// </summary>
+        /// <returns></returns>
+        [HttpDelete("{ids}")]
+        [ActionPermissionFilter(Permission = "business:sapdeliverrecord:delete")]
+        [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.DELETE)]
+        public IActionResult DeleteSapDeliverRecord(string ids)
+        {
+            int[] idsArr = Tools.SpitIntArrary(ids);
+            if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
+
+            var response = _SapDeliverRecordService.Delete(idsArr);
+
+            return ToResponse(response);
+        }
+
+
+
+    }
+}

+ 12 - 1
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/StkBalanceDtlController.cs

@@ -46,7 +46,18 @@ namespace ZR.Admin.WebApi.Controllers
             var response = _StkBalanceDtlService.GetList(parm);
             return SUCCESS(response);
         }
-
+        /// <summary>
+        /// 查询库存管理/库存统计列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        [HttpGet("statlist")]
+        [ActionPermissionFilter(Permission = "business:stkbalancedtl:statlist")]
+        public IActionResult StatStkBalanceDtl([FromQuery] StkBalanceDtlQueryDto parm)
+        {
+            var response = _StkBalanceDtlService.StatList(parm);
+            return SUCCESS(response);
+        }
 
         /// <summary>
         /// 查询库存管理/库存明细表详情

+ 317 - 0
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/ZRModel.xml

@@ -64,11 +64,74 @@
             出库管理/出库记录表输入输出对象
             </summary>
         </member>
+        <member name="T:ZR.Model.Dto.QaInspectRecordQueryDto">
+            <summary>
+            质检管理/质检记录表查询对象
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Dto.QaInspectRecordDto">
+            <summary>
+            质检管理/质检记录表输入输出对象
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Dto.SapBomRecordQueryDto">
+            <summary>
+            接口管理/SAP关键件清单记录表查询对象
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Dto.SapBomRecordDto">
+            <summary>
+            接口管理/SAP关键件清单记录表输入输出对象
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Dto.SapDeliverRecordQueryDto">
+            <summary>
+            接口管理/SAP交验单记录表查询对象
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Dto.SapDeliverRecordDto">
+            <summary>
+            接口管理/SAP交验单记录表输入输出对象
+            </summary>
+        </member>
         <member name="T:ZR.Model.Dto.StkBalanceDtlQueryDto">
             <summary>
             库存管理/库存明细表查询对象
             </summary>
         </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.RegionId">
+            库区Id
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.BinId">
+            库位Id
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.BomNo">
+            生产令号
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.DeliverNo">
+            交验单号
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.MaterialCode">
+            物料编码
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.MaterialName">
+            物料名称
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.MaterialSpec">
+            规格型号/图号
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.Status">
+            库存状态
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.KeyFlag">
+            关键件标识
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.BnSnCode">
+            BN/SN码
+        </member>
+        <member name="P:ZR.Model.Dto.StkBalanceDtlQueryDto.BeginTime">
+            创建时间
+        </member>
         <member name="T:ZR.Model.Dto.StkBalanceDtlDto">
             <summary>
             库存管理/库存明细表输入输出对象
@@ -567,6 +630,255 @@
             BN/SN码 
             </summary>
         </member>
+        <member name="T:ZR.Model.Models.QaInspectRecord">
+             <summary>
+             质检管理/质检记录表,数据实体对象
+            
+             @author admin
+             @date 2023-05-05
+             </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.InspectId">
+            <summary>
+            质检记录ID 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.InspectNo">
+            <summary>
+            质检记录单号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.DeliverNo">
+            <summary>
+            交验单号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.BomNo">
+            <summary>
+            生产令号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.RowNo">
+            <summary>
+            交验单行项目 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.Category">
+            <summary>
+            物料类型(外协件,外购件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.MaterialCode">
+            <summary>
+            物料编码 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.MaterialName">
+            <summary>
+            物料名称 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.MaterialSpec">
+            <summary>
+            规格型号/图号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.KeyFlag">
+            <summary>
+            关键件标识(0非关键件,1关键件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.BnSnCode">
+            <summary>
+            BN/SN码 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.Qty">
+            <summary>
+            交验单数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.CheckQty">
+            <summary>
+            质检合格数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.InspectedBy">
+            <summary>
+            质检人 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.InspectTime">
+            <summary>
+            质检时间 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.QaInspectRecord.Result">
+            <summary>
+            质检结果(Wait未质检,OK质检合格,NG质检不合格) 
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Models.SapBomRecord">
+             <summary>
+             接口管理/SAP关键件清单记录表,数据实体对象
+            
+             @author admin
+             @date 2023-05-05
+             </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.Id">
+            <summary>
+            主键ID 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.BomNo">
+            <summary>
+            生产令号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.EquipmentName">
+            <summary>
+            设备名称 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.MakeBy">
+            <summary>
+            编制人员 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.MakeTime">
+            <summary>
+            编制时间 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.Category">
+            <summary>
+            物料类型(外协件,外购件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.MaterialCode">
+            <summary>
+            物料编码 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.MaterialName">
+            <summary>
+            物料名称 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.MaterialSpec">
+            <summary>
+            规格型号/图号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.KeyFlag">
+            <summary>
+            关键件标识(0非关键件,1关键件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.Qty">
+            <summary>
+            需求数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.AssembleQty">
+            <summary>
+            装配数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapBomRecord.Result">
+            <summary>
+            装配结果(0未装配,99装配完成) 
+            </summary>
+        </member>
+        <member name="T:ZR.Model.Models.SapDeliverRecord">
+             <summary>
+             接口管理/SAP交验单记录表,数据实体对象
+            
+             @author admin
+             @date 2023-05-05
+             </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.Id">
+            <summary>
+            主键ID 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.DeliverNo">
+            <summary>
+            交验单号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.CheckName">
+            <summary>
+            送检人员 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.BomNo">
+            <summary>
+            生产令号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.RowNo">
+            <summary>
+            行项目 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.Category">
+            <summary>
+            物料类型(外协件,外购件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.MaterialCode">
+            <summary>
+            物料编码 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.MaterialName">
+            <summary>
+            物料名称 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.MaterialSpec">
+            <summary>
+            规格型号/图号 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.KeyFlag">
+            <summary>
+            关键件标识(0非关键件,1关键件) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.Qty">
+            <summary>
+            交验单数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.SpotCheckQty">
+            <summary>
+            抽检数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.CheckQty">
+            <summary>
+            质量合格数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.CheckResult">
+            <summary>
+            质检结果(Wait未质检,OK质检合格,NG质检不合格,PartOK部分质检通过) 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.InstoreQty">
+            <summary>
+            入库数量 
+            </summary>
+        </member>
+        <member name="P:ZR.Model.Models.SapDeliverRecord.InstoreResult">
+            <summary>
+            入库结果(0未入库,99入库完成) 
+            </summary>
+        </member>
         <member name="T:ZR.Model.Models.StkBalanceDtl">
              <summary>
              库存管理/库存明细表,数据实体对象
@@ -640,6 +952,11 @@
             库存状态(0初始创建,33盘点入库占用,55在库,77盘点出库占用,99出库完成) 
             </summary>
         </member>
+        <member name="P:ZR.Model.Models.StkBalanceDtl.SumQty">
+            <summary>
+            Sum库存数量
+            </summary>
+        </member>
         <member name="T:ZR.Model.Models.CommonLang">
              <summary>
              多语言配置,数据实体对象

BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/64A3C733C7328DAF.png


BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/6D501CC051C039A5.png


BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/7516F4C92026514C.png


BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/762840DC715445BE.png


BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/B60A185D3B6B177A.png


BIN
ZrAdminNetCore-net7.0/ZR.Admin.WebApi/wwwroot/avatar/20230505/F78ABA63F3992DA0.png


+ 2 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/BasBinDto.cs

@@ -80,6 +80,8 @@ namespace ZR.Model.Dto
         #region 表外字段
         [SugarColumn(IsIgnore = true)]
         public string RegionName { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string RegionCode { get; set; }
         #endregion
     }
 }

+ 81 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/QaInspectRecordDto.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 质检管理/质检记录表查询对象
+    /// </summary>
+    public class QaInspectRecordQueryDto : PagerInfo
+    {
+    }
+
+    /// <summary>
+    /// 质检管理/质检记录表输入输出对象
+    /// </summary>
+    public class QaInspectRecordDto
+    {
+        [Required(ErrorMessage = "质检记录ID不能为空")]
+        public int InspectId { get; set; }
+
+        [Required(ErrorMessage = "质检记录单号不能为空")]
+        public string InspectNo { get; set; }
+
+        [Required(ErrorMessage = "交验单号不能为空")]
+        public string DeliverNo { get; set; }
+
+        [Required(ErrorMessage = "生产令号不能为空")]
+        public string BomNo { get; set; }
+
+        [Required(ErrorMessage = "交验单行项目不能为空")]
+        public int RowNo { get; set; }
+
+        [Required(ErrorMessage = "物料类型(外协件,外购件)不能为空")]
+        public string Category { get; set; }
+
+        [Required(ErrorMessage = "物料编码不能为空")]
+        public string MaterialCode { get; set; }
+
+        [Required(ErrorMessage = "物料名称不能为空")]
+        public string MaterialName { get; set; }
+
+        [Required(ErrorMessage = "规格型号/图号不能为空")]
+        public string MaterialSpec { get; set; }
+
+        [Required(ErrorMessage = "关键件标识(0非关键件,1关键件)不能为空")]
+        public bool KeyFlag { get; set; }
+
+        [Required(ErrorMessage = "BN/SN码不能为空")]
+        public string BnSnCode { get; set; }
+
+        [Required(ErrorMessage = "交验单数量不能为空")]
+        public int Qty { get; set; }
+
+        [Required(ErrorMessage = "质检合格数量不能为空")]
+        public int CheckQty { get; set; }
+
+        public string InspectedBy { get; set; }
+
+        public DateTime? InspectTime { get; set; }
+
+        [Required(ErrorMessage = "质检结果(Wait未质检,OK质检合格,NG质检不合格)不能为空")]
+        public string Result { get; set; }
+
+        public string CreateBy { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string UpdateBy { get; set; }
+
+        public DateTime? UpdateTime { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

+ 70 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/SapBomRecordDto.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表查询对象
+    /// </summary>
+    public class SapBomRecordQueryDto : PagerInfo
+    {
+    }
+
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表输入输出对象
+    /// </summary>
+    public class SapBomRecordDto
+    {
+        [Required(ErrorMessage = "主键ID不能为空")]
+        public int Id { get; set; }
+
+        [Required(ErrorMessage = "生产令号不能为空")]
+        public string BomNo { get; set; }
+
+        public string EquipmentName { get; set; }
+
+        public string MakeBy { get; set; }
+
+        public DateTime? MakeTime { get; set; }
+
+        [Required(ErrorMessage = "物料类型(外协件,外购件)不能为空")]
+        public string Category { get; set; }
+
+        [Required(ErrorMessage = "物料编码不能为空")]
+        public string MaterialCode { get; set; }
+
+        [Required(ErrorMessage = "物料名称不能为空")]
+        public string MaterialName { get; set; }
+
+        [Required(ErrorMessage = "规格型号/图号不能为空")]
+        public string MaterialSpec { get; set; }
+
+        [Required(ErrorMessage = "关键件标识(0非关键件,1关键件)不能为空")]
+        public bool KeyFlag { get; set; }
+
+        [Required(ErrorMessage = "需求数量不能为空")]
+        public int Qty { get; set; }
+
+        public int? AssembleQty { get; set; }
+
+        [Required(ErrorMessage = "装配结果(0未装配,99装配完成)不能为空")]
+        public int Result { get; set; }
+
+        public string CreateBy { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string UpdateBy { get; set; }
+
+        public DateTime? UpdateTime { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

+ 80 - 0
ZrAdminNetCore-net7.0/ZR.Model/Dto/SapDeliverRecordDto.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using Newtonsoft.Json;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+
+namespace ZR.Model.Dto
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表查询对象
+    /// </summary>
+    public class SapDeliverRecordQueryDto : PagerInfo
+    {
+    }
+
+    /// <summary>
+    /// 接口管理/SAP交验单记录表输入输出对象
+    /// </summary>
+    public class SapDeliverRecordDto
+    {
+        [Required(ErrorMessage = "主键ID不能为空")]
+        public int Id { get; set; }
+
+        [Required(ErrorMessage = "交验单号不能为空")]
+        public string DeliverNo { get; set; }
+
+        public string CheckName { get; set; }
+
+        [Required(ErrorMessage = "生产令号不能为空")]
+        public string BomNo { get; set; }
+
+        [Required(ErrorMessage = "行项目不能为空")]
+        public int RowNo { get; set; }
+
+        [Required(ErrorMessage = "物料类型(外协件,外购件)不能为空")]
+        public string Category { get; set; }
+
+        [Required(ErrorMessage = "物料编码不能为空")]
+        public string MaterialCode { get; set; }
+
+        [Required(ErrorMessage = "物料名称不能为空")]
+        public string MaterialName { get; set; }
+
+        [Required(ErrorMessage = "规格型号/图号不能为空")]
+        public string MaterialSpec { get; set; }
+
+        [Required(ErrorMessage = "关键件标识(0非关键件,1关键件)不能为空")]
+        public bool KeyFlag { get; set; }
+
+        [Required(ErrorMessage = "交验单数量不能为空")]
+        public int Qty { get; set; }
+
+        [Required(ErrorMessage = "抽检数量不能为空")]
+        public int SpotCheckQty { get; set; }
+
+        public int? CheckQty { get; set; }
+
+        [Required(ErrorMessage = "质检结果(Wait未质检,OK质检合格,NG质检不合格,PartOK部分质检通过)不能为空")]
+        public string CheckResult { get; set; }
+
+        public int? InstoreQty { get; set; }
+
+        [Required(ErrorMessage = "入库结果(0未入库,99入库完成)不能为空")]
+        public int InstoreResult { get; set; }
+
+        public string CreateBy { get; set; }
+
+        public DateTime? CreateTime { get; set; }
+
+        public string UpdateBy { get; set; }
+
+        public DateTime? UpdateTime { get; set; }
+
+        public string Remark { get; set; }
+
+
+
+    }
+}

+ 28 - 8
ZrAdminNetCore-net7.0/ZR.Model/Dto/StkBalanceDtlDto.cs

@@ -13,6 +13,30 @@ namespace ZR.Model.Dto
     /// </summary>
     public class StkBalanceDtlQueryDto : PagerInfo
     {
+        /// 库区Id
+        public int RegionId { get; set; }
+        /// 库位Id
+        public int BinId { get; set; }
+        public string BinCode { get; set; }
+        ///生产令号
+        public string BomNo { get; set; }
+        ///交验单号
+        public string DeliverNo { get; set; }
+        ///物料编码
+        public string MaterialCode { get; set; }
+        ///物料名称
+        public string MaterialName { get; set; }
+        ///规格型号/图号
+        public string MaterialSpec { get; set; }
+        ///库存状态
+        public int? Status { get; set; }
+        ///关键件标识
+        public bool? KeyFlag { get; set; }
+        ///BN/SN码
+        public string BnSnCode { get; set; }
+        ///创建时间
+        public DateTime? BeginTime { get; set; }
+        public DateTime? EndTime { get; set; }
     }
 
     /// <summary>
@@ -25,9 +49,12 @@ namespace ZR.Model.Dto
 
         [Required(ErrorMessage = "库区ID不能为空")]
         public int RegionId { get; set; }
+        public string RegionCode { get; set; }
+        public string RegionName { get; set; }
 
         [Required(ErrorMessage = "库位ID不能为空")]
         public int BinId { get; set; }
+        public string BinCode { get; set; }
 
         public string DeliverNo { get; set; }
 
@@ -53,6 +80,7 @@ namespace ZR.Model.Dto
 
         [Required(ErrorMessage = "库存数量不能为空")]
         public int BalanceQty { get; set; }
+        public int SumQty { get; set; }
 
         [Required(ErrorMessage = "库存状态(0初始创建,33盘点入库占用,55在库,77盘点出库占用,99出库完成)不能为空")]
         public int Status { get; set; }
@@ -67,13 +95,5 @@ namespace ZR.Model.Dto
 
         public string Remark { get; set; }
 
-
-        #region 表外字段
-        [SugarColumn(IsIgnore = true)]
-        public string RegionName { get; set; }
-        [SugarColumn(IsIgnore = true)]
-        public string BinName { get; set; }
-        #endregion
-
     }
 }

+ 2 - 0
ZrAdminNetCore-net7.0/ZR.Model/Models/BasBin.cs

@@ -72,6 +72,8 @@ namespace ZR.Model.Models
         #region 表外字段
         [SugarColumn(IsIgnore = true)]
         public string RegionName { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string RegionCode { get; set; }
         #endregion
     }
 

+ 100 - 0
ZrAdminNetCore-net7.0/ZR.Model/Models/QaInspectRecord.cs

@@ -0,0 +1,100 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+    /// <summary>
+    /// 质检管理/质检记录表,数据实体对象
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [SugarTable("qa_inspect_record")]
+    public class QaInspectRecord:BusinessBase
+    {
+        /// <summary>
+        /// 质检记录ID 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public int InspectId { get; set; }
+
+        /// <summary>
+        /// 质检记录单号 
+        /// </summary>
+        public string InspectNo { get; set; }
+
+        /// <summary>
+        /// 交验单号 
+        /// </summary>
+        public string DeliverNo { get; set; }
+
+        /// <summary>
+        /// 生产令号 
+        /// </summary>
+        public string BomNo { get; set; }
+
+        /// <summary>
+        /// 交验单行项目 
+        /// </summary>
+        public int RowNo { get; set; }
+
+        /// <summary>
+        /// 物料类型(外协件,外购件) 
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 规格型号/图号 
+        /// </summary>
+        public string MaterialSpec { get; set; }
+
+        /// <summary>
+        /// 关键件标识(0非关键件,1关键件) 
+        /// </summary>
+        public bool KeyFlag { get; set; }
+
+        /// <summary>
+        /// BN/SN码 
+        /// </summary>
+        public string BnSnCode { get; set; }
+
+        /// <summary>
+        /// 交验单数量 
+        /// </summary>
+        public int Qty { get; set; }
+
+        /// <summary>
+        /// 质检合格数量 
+        /// </summary>
+        public int CheckQty { get; set; }
+
+        /// <summary>
+        /// 质检人 
+        /// </summary>
+        [SugarColumn(ColumnName = "inspected_by")]
+        public string InspectedBy { get; set; }
+
+        /// <summary>
+        /// 质检时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "inspect_time")]
+        public DateTime? InspectTime { get; set; }
+
+        /// <summary>
+        /// 质检结果(Wait未质检,OK质检合格,NG质检不合格) 
+        /// </summary>
+        public string Result { get; set; }
+
+    }
+}

+ 87 - 0
ZrAdminNetCore-net7.0/ZR.Model/Models/SapBomRecord.cs

@@ -0,0 +1,87 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表,数据实体对象
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [SugarTable("sap_bom_record")]
+    public class SapBomRecord:BusinessBase
+    {
+        /// <summary>
+        /// 主键ID 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 生产令号 
+        /// </summary>
+        public string BomNo { get; set; }
+
+        /// <summary>
+        /// 设备名称 
+        /// </summary>
+        public string EquipmentName { get; set; }
+
+        /// <summary>
+        /// 编制人员 
+        /// </summary>
+        [SugarColumn(ColumnName = "make_by")]
+        public string MakeBy { get; set; }
+
+        /// <summary>
+        /// 编制时间 
+        /// </summary>
+        [SugarColumn(ColumnName = "make_time")]
+        public DateTime? MakeTime { get; set; }
+
+        /// <summary>
+        /// 物料类型(外协件,外购件) 
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 规格型号/图号 
+        /// </summary>
+        public string MaterialSpec { get; set; }
+
+        /// <summary>
+        /// 关键件标识(0非关键件,1关键件) 
+        /// </summary>
+        public bool KeyFlag { get; set; }
+
+        /// <summary>
+        /// 需求数量 
+        /// </summary>
+        public int Qty { get; set; }
+
+        /// <summary>
+        /// 装配数量 
+        /// </summary>
+        public int? AssembleQty { get; set; }
+
+        /// <summary>
+        /// 装配结果(0未装配,99装配完成) 
+        /// </summary>
+        public int Result { get; set; }
+
+
+
+    }
+}

+ 104 - 0
ZrAdminNetCore-net7.0/ZR.Model/Models/SapDeliverRecord.cs

@@ -0,0 +1,104 @@
+using System;
+using SqlSugar;
+using System.Collections.Generic;
+
+namespace ZR.Model.Models
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表,数据实体对象
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [SugarTable("sap_deliver_record")]
+    public class SapDeliverRecord:BusinessBase
+    {
+        /// <summary>
+        /// 主键ID 
+        /// </summary>
+        [SugarColumn(IsPrimaryKey = true, IsIdentity = false)]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 交验单号 
+        /// </summary>
+        public string DeliverNo { get; set; }
+
+        /// <summary>
+        /// 送检人员 
+        /// </summary>
+        public string CheckName { get; set; }
+
+        /// <summary>
+        /// 生产令号 
+        /// </summary>
+        public string BomNo { get; set; }
+
+        /// <summary>
+        /// 行项目 
+        /// </summary>
+        public int RowNo { get; set; }
+
+        /// <summary>
+        /// 物料类型(外协件,外购件) 
+        /// </summary>
+        public string Category { get; set; }
+
+        /// <summary>
+        /// 物料编码 
+        /// </summary>
+        public string MaterialCode { get; set; }
+
+        /// <summary>
+        /// 物料名称 
+        /// </summary>
+        public string MaterialName { get; set; }
+
+        /// <summary>
+        /// 规格型号/图号 
+        /// </summary>
+        public string MaterialSpec { get; set; }
+
+        /// <summary>
+        /// 关键件标识(0非关键件,1关键件) 
+        /// </summary>
+        public bool KeyFlag { get; set; }
+
+        /// <summary>
+        /// 交验单数量 
+        /// </summary>
+        public int Qty { get; set; }
+
+        /// <summary>
+        /// 抽检数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "spot_check_qty")]
+        public int SpotCheckQty { get; set; }
+
+        /// <summary>
+        /// 质量合格数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "check_qty")]
+        public int? CheckQty { get; set; }
+
+        /// <summary>
+        /// 质检结果(Wait未质检,OK质检合格,NG质检不合格,PartOK部分质检通过) 
+        /// </summary>
+        [SugarColumn(ColumnName = "check_result")]
+        public string CheckResult { get; set; }
+
+        /// <summary>
+        /// 入库数量 
+        /// </summary>
+        [SugarColumn(ColumnName = "instore_qty")]
+        public int? InstoreQty { get; set; }
+
+        /// <summary>
+        /// 入库结果(0未入库,99入库完成) 
+        /// </summary>
+        [SugarColumn(ColumnName = "instore_result")]
+        public int InstoreResult { get; set; }
+
+
+    }
+}

+ 8 - 1
ZrAdminNetCore-net7.0/ZR.Model/Models/StkBalanceDtl.cs

@@ -83,7 +83,14 @@ namespace ZR.Model.Models
         [SugarColumn(IsIgnore = true)]
         public string RegionName { get; set; }
         [SugarColumn(IsIgnore = true)]
-        public string BinName { get; set; }
+        public string RegionCode { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string BinCode { get; set; }
+        /// <summary>
+        /// Sum库存数量
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public int SumQty { get; set; }
         #endregion
     }
 }

+ 1 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/BasBinService.cs

@@ -51,6 +51,7 @@ namespace ZR.Service.Business
                 {
                     RegionId = b.RegionId.SelectAll(),
                     RegionName=region.RegionName,
+                    RegionCode=region.RegionCode,
                 })
                 .ToPage<BasBin, BasBinDto>(parm);
 

+ 25 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/IQaInspectRecordService.cs

@@ -0,0 +1,25 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using System.Collections.Generic;
+
+namespace ZR.Service.Business.IBusinessService
+{
+    /// <summary>
+    /// 质检管理/质检记录表service接口
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    public interface IQaInspectRecordService : IBaseService<QaInspectRecord>
+    {
+        PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm);
+
+        int AddQaInspectRecord(QaInspectRecord parm);
+
+        int UpdateQaInspectRecord(QaInspectRecord parm);
+
+        void TruncateQaInspectRecord();
+    }
+}

+ 25 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/ISapBomRecordService.cs

@@ -0,0 +1,25 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using System.Collections.Generic;
+
+namespace ZR.Service.Business.IBusinessService
+{
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表service接口
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    public interface ISapBomRecordService : IBaseService<SapBomRecord>
+    {
+        PagedInfo<SapBomRecordDto> GetList(SapBomRecordQueryDto parm);
+
+        int AddSapBomRecord(SapBomRecord parm);
+
+        int UpdateSapBomRecord(SapBomRecord parm);
+
+        void TruncateSapBomRecord();
+    }
+}

+ 25 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/ISapDeliverRecordService.cs

@@ -0,0 +1,25 @@
+using System;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using System.Collections.Generic;
+
+namespace ZR.Service.Business.IBusinessService
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表service接口
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    public interface ISapDeliverRecordService : IBaseService<SapDeliverRecord>
+    {
+        PagedInfo<SapDeliverRecordDto> GetList(SapDeliverRecordQueryDto parm);
+
+        int AddSapDeliverRecord(SapDeliverRecord parm);
+
+        int UpdateSapDeliverRecord(SapDeliverRecord parm);
+
+        void TruncateSapDeliverRecord();
+    }
+}

+ 1 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/IBusinessService/IStkBalanceDtlService.cs

@@ -15,6 +15,7 @@ namespace ZR.Service.Business.IBusinessService
     public interface IStkBalanceDtlService : IBaseService<StkBalanceDtl>
     {
         PagedInfo<StkBalanceDtlDto> GetList(StkBalanceDtlQueryDto parm);
+        PagedInfo<StkBalanceDtlDto> StatList(StkBalanceDtlQueryDto parm);
 
         int AddStkBalanceDtl(StkBalanceDtl parm);
 

+ 95 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/QaInspectRecordService.cs

@@ -0,0 +1,95 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Repository;
+using ZR.Service.Business.IBusinessService;
+using System.Linq;
+
+namespace ZR.Service.Business
+{
+    /// <summary>
+    /// 质检管理/质检记录表Service业务层处理
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [AppService(ServiceType = typeof(IQaInspectRecordService), ServiceLifetime = LifeTime.Transient)]
+    public class QaInspectRecordService : BaseService<QaInspectRecord>, IQaInspectRecordService
+    {
+        #region 业务逻辑代码
+
+        /// <summary>
+        /// 查询质检管理/质检记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<QaInspectRecordDto> GetList(QaInspectRecordQueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<QaInspectRecord>();
+
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<QaInspectRecord, QaInspectRecordDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 添加质检管理/质检记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int AddQaInspectRecord(QaInspectRecord model)
+        {
+            return Add(model, true);
+        }
+
+        /// <summary>
+        /// 修改质检管理/质检记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateQaInspectRecord(QaInspectRecord model)
+        {
+            //var response = Update(w => w.InspectId == model.InspectId, it => new QaInspectRecord()
+            //{
+            //    InspectNo = model.InspectNo,
+            //    DeliverNo = model.DeliverNo,
+            //    BomNo = model.BomNo,
+            //    RowNo = model.RowNo,
+            //    Category = model.Category,
+            //    MaterialCode = model.MaterialCode,
+            //    MaterialName = model.MaterialName,
+            //    MaterialSpec = model.MaterialSpec,
+            //    KeyFlag = model.KeyFlag,
+            //    BnSnCode = model.BnSnCode,
+            //    Qty = model.Qty,
+            //    CheckQty = model.CheckQty,
+            //    InspectedBy = model.InspectedBy,
+            //    InspectTime = model.InspectTime,
+            //    Result = model.Result,
+            //    UpdateBy = model.UpdateBy,
+            //    UpdateTime = model.UpdateTime,
+            //    Remark = model.Remark,
+            //});
+            //return response;
+            return Update(model, true);
+        }
+
+        /// <summary>
+        /// 清空质检管理/质检记录表
+        /// </summary>
+        /// <returns></returns>
+        public void TruncateQaInspectRecord()
+        {
+            Truncate();
+        }
+        #endregion
+    }
+}

+ 92 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/SapBomRecordService.cs

@@ -0,0 +1,92 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Repository;
+using ZR.Service.Business.IBusinessService;
+using System.Linq;
+
+namespace ZR.Service.Business
+{
+    /// <summary>
+    /// 接口管理/SAP关键件清单记录表Service业务层处理
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [AppService(ServiceType = typeof(ISapBomRecordService), ServiceLifetime = LifeTime.Transient)]
+    public class SapBomRecordService : BaseService<SapBomRecord>, ISapBomRecordService
+    {
+        #region 业务逻辑代码
+
+        /// <summary>
+        /// 查询接口管理/SAP关键件清单记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<SapBomRecordDto> GetList(SapBomRecordQueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<SapBomRecord>();
+
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<SapBomRecord, SapBomRecordDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 添加接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int AddSapBomRecord(SapBomRecord model)
+        {
+            return Add(model, true);
+        }
+
+        /// <summary>
+        /// 修改接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateSapBomRecord(SapBomRecord model)
+        {
+            //var response = Update(w => w.Id == model.Id, it => new SapBomRecord()
+            //{
+            //    BomNo = model.BomNo,
+            //    EquipmentName = model.EquipmentName,
+            //    MakeBy = model.MakeBy,
+            //    MakeTime = model.MakeTime,
+            //    Category = model.Category,
+            //    MaterialCode = model.MaterialCode,
+            //    MaterialName = model.MaterialName,
+            //    MaterialSpec = model.MaterialSpec,
+            //    KeyFlag = model.KeyFlag,
+            //    Qty = model.Qty,
+            //    AssembleQty = model.AssembleQty,
+            //    Result = model.Result,
+            //    UpdateBy = model.UpdateBy,
+            //    UpdateTime = model.UpdateTime,
+            //    Remark = model.Remark,
+            //});
+            //return response;
+            return Update(model, true);
+        }
+
+        /// <summary>
+        /// 清空接口管理/SAP关键件清单记录表
+        /// </summary>
+        /// <returns></returns>
+        public void TruncateSapBomRecord()
+        {
+            Truncate();
+        }
+        #endregion
+    }
+}

+ 95 - 0
ZrAdminNetCore-net7.0/ZR.Service/Business/SapDeliverRecordService.cs

@@ -0,0 +1,95 @@
+using System;
+using SqlSugar;
+using Infrastructure.Attribute;
+using ZR.Model;
+using ZR.Model.Dto;
+using ZR.Model.Models;
+using ZR.Repository;
+using ZR.Service.Business.IBusinessService;
+using System.Linq;
+
+namespace ZR.Service.Business
+{
+    /// <summary>
+    /// 接口管理/SAP交验单记录表Service业务层处理
+    ///
+    /// @author admin
+    /// @date 2023-05-05
+    /// </summary>
+    [AppService(ServiceType = typeof(ISapDeliverRecordService), ServiceLifetime = LifeTime.Transient)]
+    public class SapDeliverRecordService : BaseService<SapDeliverRecord>, ISapDeliverRecordService
+    {
+        #region 业务逻辑代码
+
+        /// <summary>
+        /// 查询接口管理/SAP交验单记录表列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<SapDeliverRecordDto> GetList(SapDeliverRecordQueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<SapDeliverRecord>();
+
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .Where(predicate.ToExpression())
+                .ToPage<SapDeliverRecord, SapDeliverRecordDto>(parm);
+
+            return response;
+        }
+
+
+        /// <summary>
+        /// 添加接口管理/SAP交验单记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int AddSapDeliverRecord(SapDeliverRecord model)
+        {
+            return Add(model, true);
+        }
+
+        /// <summary>
+        /// 修改接口管理/SAP交验单记录表
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public int UpdateSapDeliverRecord(SapDeliverRecord model)
+        {
+            //var response = Update(w => w.Id == model.Id, it => new SapDeliverRecord()
+            //{
+            //    DeliverNo = model.DeliverNo,
+            //    CheckName = model.CheckName,
+            //    BomNo = model.BomNo,
+            //    RowNo = model.RowNo,
+            //    Category = model.Category,
+            //    MaterialCode = model.MaterialCode,
+            //    MaterialName = model.MaterialName,
+            //    MaterialSpec = model.MaterialSpec,
+            //    KeyFlag = model.KeyFlag,
+            //    Qty = model.Qty,
+            //    SpotCheckQty = model.SpotCheckQty,
+            //    CheckQty = model.CheckQty,
+            //    CheckResult = model.CheckResult,
+            //    InstoreQty = model.InstoreQty,
+            //    InstoreResult = model.InstoreResult,
+            //    UpdateBy = model.UpdateBy,
+            //    UpdateTime = model.UpdateTime,
+            //    Remark = model.Remark,
+            //});
+            //return response;
+            return Update(model, true);
+        }
+
+        /// <summary>
+        /// 清空接口管理/SAP交验单记录表
+        /// </summary>
+        /// <returns></returns>
+        public void TruncateSapDeliverRecord()
+        {
+            Truncate();
+        }
+        #endregion
+    }
+}

+ 66 - 2
ZrAdminNetCore-net7.0/ZR.Service/Business/StkBalanceDtlService.cs

@@ -7,6 +7,10 @@ using ZR.Model.Models;
 using ZR.Repository;
 using ZR.Service.Business.IBusinessService;
 using System.Linq;
+using Infrastructure;
+using System.Collections.Generic;
+using ZR.Model.System;
+using Org.BouncyCastle.Math.EC.Rfc7748;
 
 namespace ZR.Service.Business
 {
@@ -31,6 +35,35 @@ namespace ZR.Service.Business
             //开始拼装查询条件
             var predicate = Expressionable.Create<StkBalanceDtl>();
 
+            if (parm.BeginTime != null && parm.EndTime != null)
+            {
+                parm.BeginTime = DateTimeHelper.GetBeginTime(parm.BeginTime, -1);
+                parm.EndTime = DateTimeHelper.GetBeginTime(parm.EndTime, 1);
+                predicate.And(d => d.CreateTime >= parm.BeginTime && d.CreateTime <= parm.EndTime);
+            }
+            predicate.AndIF(parm.RegionId > 0, d => d.RegionId == parm.RegionId);
+            //predicate.AndIF(parm.BinId > 0, d => d.BinId == parm.BinId);
+            //predicate.AndIF(!string.IsNullOrEmpty(parm.BinCode), d => d.BinCode.Contains(parm.BinCode));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.BomNo), d => d.BomNo.Contains(parm.BomNo));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.DeliverNo), d => d.DeliverNo.Contains(parm.DeliverNo));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            predicate.AndIF(parm.Status != null, d => d.Status == parm.Status);
+            predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.MaterialSpec.Contains(parm.BnSnCode));
+            //先判断搜索条件中有没有bincode
+            if (!string.IsNullOrEmpty(parm.BinCode))
+            {
+                //把basbin表检索到list
+                List<BasBin> bins = Context.Queryable<BasBin>().ToList();
+                //查找包含搜索条件的basbin数据
+                var newBasBins = bins.FindAll(b=>b.BinCode.Contains(parm.BinCode));
+                //提取符合条件的basbin,并返回其id
+                long[] BasBinIds = newBasBins.Select(x => x.BinId).ToArray();
+                //添加转化完成的检索条件,即符合basbinId的数据
+                predicate.And(d => BasBinIds.Contains(d.BinId));
+            }
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
                 .LeftJoin<BasRegion>((d,region)=>d.RegionId==region.RegionId)
@@ -39,16 +72,47 @@ namespace ZR.Service.Business
                 .Select((d,region,bin) => new StkBalanceDtl
                 {
                     RegionId = d.RegionId.SelectAll(),
-                    RegionName = region.RegionName,
                     BinId = d.BinId.SelectAll(),
-                    BinName = bin.BinName,
+                    RegionName = region.RegionName,
+                    RegionCode=region.RegionCode,
+                    BinCode = bin.BinCode,
                 })
                 .ToPage<StkBalanceDtl, StkBalanceDtlDto>(parm);
 
             return response;
         }
 
+        /// <summary>
+        /// 查询库存管理/库存统计列表
+        /// </summary>
+        /// <param name="parm"></param>
+        /// <returns></returns>
+        public PagedInfo<StkBalanceDtlDto> StatList(StkBalanceDtlQueryDto parm)
+        {
+            //开始拼装查询条件
+            var predicate = Expressionable.Create<StkBalanceDtl>();
+            predicate.AndIF(parm.RegionId > 0, d => d.RegionId == parm.RegionId);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialCode), d => d.MaterialCode.Contains(parm.MaterialCode));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
+            predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
+            predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.BnSnCode), d => d.MaterialSpec.Contains(parm.BnSnCode));
 
+            //搜索条件查询语法参考Sqlsugar
+            var response = Queryable()
+                .GroupBy(d => new { d.MaterialName })
+                .LeftJoin<BasRegion>((d, region) => d.RegionId == region.RegionId)
+                .Where(predicate.ToExpression())
+                .Select((d, region) => new StkBalanceDtl
+                {
+                    RegionId = d.RegionId.SelectAll(),
+                    RegionName=region.RegionName,
+                    SumQty = SqlFunc.AggregateSum(d.BalanceQty),
+                })
+                .ToPage<StkBalanceDtl, StkBalanceDtlDto>(parm);
+
+            return response;
+        }
         /// <summary>
         /// 添加库存管理/库存明细表
         /// </summary>