Browse Source

增加扩展类,修正因为增加AssBy,AssTime字段后引发的装配提交问题。

SunYaLong 10 months ago
parent
commit
13cabc681d

+ 9 - 3
ZrAdminNetCore-net7.0/ZR.Model/Dto/OutStore/SapBomRecordDto.cs

@@ -80,9 +80,6 @@ namespace ZR.Model.Dto.OutStore
 
         [Required(ErrorMessage = "装配结果(0未装配,99装配完成)不能为空")]
         public int Result { get; set; }
-        public string AssBy { get; set; }
-
-        public DateTime? AssTime { get; set; }
 
         public string CreateBy { get; set; }
 
@@ -97,4 +94,13 @@ namespace ZR.Model.Dto.OutStore
 
 
     }
+
+
+    public class SapBomRecordAssTimeDto : SapBomRecordDto
+    {
+
+        public string AssBy { get; set; }
+
+        public DateTime? AssTime { get; set; }
+    }
 }

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

@@ -14,7 +14,7 @@ namespace ZR.Service.Business.IBusinessService.OutStore
     /// </summary>
     public interface ISapBomRecordService : IBaseService<SapBomRecord>
     {
-        PagedInfo<SapBomRecordDto> GetList(SapBomRecordQueryDto parm);
+        PagedInfo<SapBomRecordAssTimeDto> GetList(SapBomRecordQueryDto parm);
         PagedInfo<SapBomRecordDto> GetStat(SapBomRecordQueryDto parm);
 
 

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

@@ -29,7 +29,7 @@ namespace ZR.Service.Business.OutStore
         /// </summary>
         /// <param name="parm"></param>
         /// <returns></returns>
-        public PagedInfo<SapBomRecordDto> GetList(SapBomRecordQueryDto parm)
+        public PagedInfo<SapBomRecordAssTimeDto> GetList(SapBomRecordQueryDto parm)
         {
             //开始拼装查询条件
             var predicate = Expressionable.Create<SapBomRecord>();
@@ -49,12 +49,12 @@ namespace ZR.Service.Business.OutStore
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()
                 .Where(predicate.ToExpression())
-                .Select(d => new SapBomRecordDto
+                .Select(d => new SapBomRecordAssTimeDto
                 {
                     AssBy = SqlFunc.Subqueryable<OutAssembleRecord>().Where(a => a.BomNo == d.BomNo && a.MaterialCode == d.MaterialCode).Select(a => a.CreateBy),
                     AssTime = SqlFunc.Subqueryable<OutAssembleRecord>().Where(a => a.BomNo == d.BomNo && a.MaterialCode == d.MaterialCode).Select(a => a.CreateTime)
                 },true)
-                .ToPage<SapBomRecordDto, SapBomRecordDto>(parm);
+                .ToPage<SapBomRecordAssTimeDto, SapBomRecordAssTimeDto>(parm);
 
             return response;
         }