zhaoyaxiong 2 роки тому
батько
коміт
fb0f133dcc

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

@@ -861,11 +861,6 @@
             质检合格数量 
             </summary>
         </member>
-        <member name="P:ZR.Model.Models.InStore.InInstoreRecord.SumInstoreQty">
-            <summary>
-            入库数量
-            </summary>
-        </member>
         <member name="T:ZR.Model.Models.InStore.InRetreatRecord">
              <summary>
              入库管理/退料记录表,数据实体对象
@@ -1012,11 +1007,6 @@
             BN/SN码 
             </summary>
         </member>
-        <member name="P:ZR.Model.Models.OutStore.OutAssembleRecord.SumAssQty">
-            <summary>
-            装配数量
-            </summary>
-        </member>
         <member name="T:ZR.Model.Models.OutStore.OutOutstoreRecord">
              <summary>
              出库管理/出库记录表,数据实体对象
@@ -1080,11 +1070,6 @@
             BN/SN码 
             </summary>
         </member>
-        <member name="P:ZR.Model.Models.OutStore.OutOutstoreRecord.SumOutstoreQty">
-            <summary>
-            出库数量
-            </summary>
-        </member>
         <member name="T:ZR.Model.Models.OutStore.SapBomRecord">
              <summary>
              接口管理/SAP关键件清单记录表,数据实体对象

+ 0 - 8
ZrAdminNetCore-net7.0/ZR.Model/Models/InStore/InInstoreRecord.cs

@@ -94,14 +94,6 @@ namespace ZR.Model.Models.InStore
         /// </summary>
         public int CheckQty { get; set; }
 
-        #region 表外字段
        
-        /// <summary>
-        /// 入库数量
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public int? SumInstoreQty { get; set; }
-      
-        #endregion
     }
 }

+ 1 - 7
ZrAdminNetCore-net7.0/ZR.Model/Models/OutStore/OutAssembleRecord.cs

@@ -69,12 +69,6 @@ namespace ZR.Model.Models.OutStore
         /// </summary>
         public string BnSnCode { get; set; }
 
-        #region 表外字段
-        /// <summary>
-        /// 装配数量
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public int? SumAssQty { get; set; }
-        #endregion
+       
     }
 }

+ 0 - 7
ZrAdminNetCore-net7.0/ZR.Model/Models/OutStore/OutOutstoreRecord.cs

@@ -69,13 +69,6 @@ namespace ZR.Model.Models.OutStore
         /// </summary>
         public string BnSnCode { get; set; }
 
-        #region 表外字段
       
-        /// <summary>
-        /// 出库数量
-        /// </summary>
-        [SugarColumn(IsIgnore = true)]
-        public int? SumOutstoreQty { get; set; }
-        #endregion
     }
 }

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

@@ -89,7 +89,7 @@ namespace ZR.Service.Business.Inspect
                 {
                     MaterialCode = instore.MaterialCode,
                     BnSnCode = instore.BnSnCode,
-                    SumInstoreQty = SqlFunc.AggregateSumNoNull(instore.InStoreQty)
+                    InStoreQty = SqlFunc.AggregateSumNoNull(instore.InStoreQty)
                 });
             var queryOut = Context.Queryable<OutOutstoreRecord>()
                 .GroupBy(outstore => new { outstore.MaterialCode, outstore.BnSnCode })
@@ -97,7 +97,7 @@ namespace ZR.Service.Business.Inspect
                 {
                     MaterialCode = outstore.MaterialCode,
                     BnSnCode = outstore.BnSnCode,
-                    SumOutstoreQty = SqlFunc.AggregateSumNoNull(outstore.OutStoreQty)
+                    OutStoreQty = SqlFunc.AggregateSumNoNull(outstore.OutStoreQty)
                 });
             var queryAss = Context.Queryable<OutAssembleRecord>()
                 .GroupBy(ass => new { ass.MaterialCode, ass.BnSnCode })
@@ -105,7 +105,7 @@ namespace ZR.Service.Business.Inspect
                 {
                     MaterialCode = ass.MaterialCode,
                     BnSnCode = ass.BnSnCode,
-                    SumAssQty = SqlFunc.AggregateSumNoNull(ass.AssembleQty)
+                    AssembleQty = SqlFunc.AggregateSumNoNull(ass.AssembleQty)
                 });
             var response = Queryable()
                 .GroupBy(d => new { d.MaterialCode, d.BnSnCode })
@@ -122,9 +122,9 @@ namespace ZR.Service.Business.Inspect
                     MaterialSpec = d.MaterialSpec,
                     KeyFlag = d.KeyFlag,
                     SumQaQty = SqlFunc.AggregateSumNoNull(d.CheckQty),
-                    SumInstoreQty = instore.SumInstoreQty,
-                    SumOutstoreQty = outstore.SumOutstoreQty,
-                    SumAssQty = assemble.SumAssQty
+                    SumInstoreQty = instore.InStoreQty,
+                    SumOutstoreQty = outstore.OutStoreQty,
+                    SumAssQty = assemble.AssembleQty
 
                 })
                 .ToPage<QaInspectRecord, QaInspectRecordDto>(parm);